Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
55b85967
K
Kernel
项目概览
openeuler
/
Kernel
接近 2 年 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
55b85967
编写于
11月 07, 2012
作者:
K
Kukjin Kim
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'next/cleanup-samsung' into next/cleanup-samsung-2
上级
3d70f8c6
55b6ef7a
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
6 addition
and
63 deletion
+6
-63
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock-exynos4.c
+0
-5
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/common.c
+6
-25
arch/arm/mach-exynos/dev-uart.c
arch/arm/mach-exynos/dev-uart.c
+0
-24
arch/arm/mach-exynos/include/mach/irqs.h
arch/arm/mach-exynos/include/mach/irqs.h
+0
-5
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/include/mach/map.h
+0
-1
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-nuri.c
+0
-1
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-exynos/mach-universal_c210.c
+0
-1
arch/arm/mach-s5pv210/mach-goni.c
arch/arm/mach-s5pv210/mach-goni.c
+0
-1
未找到文件。
arch/arm/mach-exynos/clock-exynos4.c
浏览文件 @
55b85967
...
...
@@ -611,11 +611,6 @@ static struct clk exynos4_init_clocks_off[] = {
.
devname
=
"exynos4210-spi.2"
,
.
enable
=
exynos4_clk_ip_peril_ctrl
,
.
ctrlbit
=
(
1
<<
18
),
},
{
.
name
=
"iis"
,
.
devname
=
"samsung-i2s.0"
,
.
enable
=
exynos4_clk_ip_peril_ctrl
,
.
ctrlbit
=
(
1
<<
19
),
},
{
.
name
=
"iis"
,
.
devname
=
"samsung-i2s.1"
,
...
...
arch/arm/mach-exynos/common.c
浏览文件 @
55b85967
...
...
@@ -63,7 +63,7 @@ static void exynos4_map_io(void);
static
void
exynos5_map_io
(
void
);
static
void
exynos4_init_clocks
(
int
xtal
);
static
void
exynos5_init_clocks
(
int
xtal
);
static
void
exynos_init_uarts
(
struct
s3c2410_uartcfg
*
cfg
,
int
no
);
static
void
exynos
4
_init_uarts
(
struct
s3c2410_uartcfg
*
cfg
,
int
no
);
static
int
exynos_init
(
void
);
static
struct
cpu_table
cpu_ids
[]
__initdata
=
{
...
...
@@ -72,7 +72,7 @@ static struct cpu_table cpu_ids[] __initdata = {
.
idmask
=
EXYNOS4_CPU_MASK
,
.
map_io
=
exynos4_map_io
,
.
init_clocks
=
exynos4_init_clocks
,
.
init_uarts
=
exynos_init_uarts
,
.
init_uarts
=
exynos
4
_init_uarts
,
.
init
=
exynos_init
,
.
name
=
name_exynos4210
,
},
{
...
...
@@ -80,7 +80,7 @@ static struct cpu_table cpu_ids[] __initdata = {
.
idmask
=
EXYNOS4_CPU_MASK
,
.
map_io
=
exynos4_map_io
,
.
init_clocks
=
exynos4_init_clocks
,
.
init_uarts
=
exynos_init_uarts
,
.
init_uarts
=
exynos
4
_init_uarts
,
.
init
=
exynos_init
,
.
name
=
name_exynos4212
,
},
{
...
...
@@ -88,7 +88,7 @@ static struct cpu_table cpu_ids[] __initdata = {
.
idmask
=
EXYNOS4_CPU_MASK
,
.
map_io
=
exynos4_map_io
,
.
init_clocks
=
exynos4_init_clocks
,
.
init_uarts
=
exynos_init_uarts
,
.
init_uarts
=
exynos
4
_init_uarts
,
.
init
=
exynos_init
,
.
name
=
name_exynos4412
,
},
{
...
...
@@ -96,7 +96,6 @@ static struct cpu_table cpu_ids[] __initdata = {
.
idmask
=
EXYNOS5_SOC_MASK
,
.
map_io
=
exynos5_map_io
,
.
init_clocks
=
exynos5_init_clocks
,
.
init_uarts
=
exynos_init_uarts
,
.
init
=
exynos_init
,
.
name
=
name_exynos5250
,
},
...
...
@@ -256,26 +255,11 @@ static struct map_desc exynos5_iodesc[] __initdata = {
.
pfn
=
__phys_to_pfn
(
EXYNOS5_PA_PMU
),
.
length
=
SZ_64K
,
.
type
=
MT_DEVICE
,
},
{
.
virtual
=
(
unsigned
long
)
S5P_VA_COMBINER_BASE
,
.
pfn
=
__phys_to_pfn
(
EXYNOS5_PA_COMBINER
),
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
,
},
{
.
virtual
=
(
unsigned
long
)
S3C_VA_UART
,
.
pfn
=
__phys_to_pfn
(
EXYNOS5_PA_UART
),
.
length
=
SZ_512K
,
.
type
=
MT_DEVICE
,
},
{
.
virtual
=
(
unsigned
long
)
S5P_VA_GIC_CPU
,
.
pfn
=
__phys_to_pfn
(
EXYNOS5_PA_GIC_CPU
),
.
length
=
SZ_8K
,
.
type
=
MT_DEVICE
,
},
{
.
virtual
=
(
unsigned
long
)
S5P_VA_GIC_DIST
,
.
pfn
=
__phys_to_pfn
(
EXYNOS5_PA_GIC_DIST
),
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
,
},
};
...
...
@@ -727,7 +711,7 @@ static int __init exynos_init(void)
/* uart registration process */
static
void
__init
exynos_init_uarts
(
struct
s3c2410_uartcfg
*
cfg
,
int
no
)
static
void
__init
exynos
4
_init_uarts
(
struct
s3c2410_uartcfg
*
cfg
,
int
no
)
{
struct
s3c2410_uartcfg
*
tcfg
=
cfg
;
u32
ucnt
;
...
...
@@ -735,10 +719,7 @@ static void __init exynos_init_uarts(struct s3c2410_uartcfg *cfg, int no)
for
(
ucnt
=
0
;
ucnt
<
no
;
ucnt
++
,
tcfg
++
)
tcfg
->
has_fracval
=
1
;
if
(
soc_is_exynos5250
())
s3c24xx_init_uartdevs
(
"exynos4210-uart"
,
exynos5_uart_resources
,
cfg
,
no
);
else
s3c24xx_init_uartdevs
(
"exynos4210-uart"
,
exynos4_uart_resources
,
cfg
,
no
);
s3c24xx_init_uartdevs
(
"exynos4210-uart"
,
exynos4_uart_resources
,
cfg
,
no
);
}
static
void
__iomem
*
exynos_eint_base
;
...
...
arch/arm/mach-exynos/dev-uart.c
浏览文件 @
55b85967
...
...
@@ -52,27 +52,3 @@ struct s3c24xx_uart_resources exynos4_uart_resources[] __initdata = {
.
nr_resources
=
ARRAY_SIZE
(
exynos4_uart3_resource
),
},
};
EXYNOS_UART_RESOURCE
(
5
,
0
)
EXYNOS_UART_RESOURCE
(
5
,
1
)
EXYNOS_UART_RESOURCE
(
5
,
2
)
EXYNOS_UART_RESOURCE
(
5
,
3
)
struct
s3c24xx_uart_resources
exynos5_uart_resources
[]
__initdata
=
{
[
0
]
=
{
.
resources
=
exynos5_uart0_resource
,
.
nr_resources
=
ARRAY_SIZE
(
exynos5_uart0_resource
),
},
[
1
]
=
{
.
resources
=
exynos5_uart1_resource
,
.
nr_resources
=
ARRAY_SIZE
(
exynos5_uart0_resource
),
},
[
2
]
=
{
.
resources
=
exynos5_uart2_resource
,
.
nr_resources
=
ARRAY_SIZE
(
exynos5_uart2_resource
),
},
[
3
]
=
{
.
resources
=
exynos5_uart3_resource
,
.
nr_resources
=
ARRAY_SIZE
(
exynos5_uart3_resource
),
},
};
arch/arm/mach-exynos/include/mach/irqs.h
浏览文件 @
55b85967
...
...
@@ -259,11 +259,6 @@
#define EXYNOS5_IRQ_IEM_IEC IRQ_SPI(48)
#define EXYNOS5_IRQ_IEM_APC IRQ_SPI(49)
#define EXYNOS5_IRQ_GPIO_C2C IRQ_SPI(50)
#define EXYNOS5_IRQ_UART0 IRQ_SPI(51)
#define EXYNOS5_IRQ_UART1 IRQ_SPI(52)
#define EXYNOS5_IRQ_UART2 IRQ_SPI(53)
#define EXYNOS5_IRQ_UART3 IRQ_SPI(54)
#define EXYNOS5_IRQ_UART4 IRQ_SPI(55)
#define EXYNOS5_IRQ_IIC IRQ_SPI(56)
#define EXYNOS5_IRQ_IIC1 IRQ_SPI(57)
#define EXYNOS5_IRQ_IIC2 IRQ_SPI(58)
...
...
arch/arm/mach-exynos/include/mach/map.h
浏览文件 @
55b85967
...
...
@@ -279,7 +279,6 @@
#define EXYNOS5_PA_UART1 0x12C10000
#define EXYNOS5_PA_UART2 0x12C20000
#define EXYNOS5_PA_UART3 0x12C30000
#define EXYNOS5_SZ_UART SZ_256
#define S3C_VA_UARTx(x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
...
...
arch/arm/mach-exynos/mach-nuri.c
浏览文件 @
55b85967
...
...
@@ -113,7 +113,6 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data __initdata = {
.
host_caps
=
(
MMC_CAP_8_BIT_DATA
|
MMC_CAP_4_BIT_DATA
|
MMC_CAP_MMC_HIGHSPEED
|
MMC_CAP_SD_HIGHSPEED
|
MMC_CAP_ERASE
),
.
host_caps2
=
MMC_CAP2_BROKEN_VOLTAGE
,
.
cd_type
=
S3C_SDHCI_CD_PERMANENT
,
};
...
...
arch/arm/mach-exynos/mach-universal_c210.c
浏览文件 @
55b85967
...
...
@@ -754,7 +754,6 @@ static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = {
.
max_width
=
8
,
.
host_caps
=
(
MMC_CAP_8_BIT_DATA
|
MMC_CAP_4_BIT_DATA
|
MMC_CAP_MMC_HIGHSPEED
|
MMC_CAP_SD_HIGHSPEED
),
.
host_caps2
=
MMC_CAP2_BROKEN_VOLTAGE
,
.
cd_type
=
S3C_SDHCI_CD_PERMANENT
,
};
...
...
arch/arm/mach-s5pv210/mach-goni.c
浏览文件 @
55b85967
...
...
@@ -774,7 +774,6 @@ static void __init goni_pmic_init(void)
/* MoviNAND */
static
struct
s3c_sdhci_platdata
goni_hsmmc0_data
__initdata
=
{
.
max_width
=
4
,
.
host_caps2
=
MMC_CAP2_BROKEN_VOLTAGE
,
.
cd_type
=
S3C_SDHCI_CD_PERMANENT
,
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录