Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
17a505ed
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
17a505ed
编写于
10月 01, 2012
作者:
O
Olof Johansson
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'next/fixes-non-critical' into HEAD
上级
d9a80746
b10dcdca
变更
43
隐藏空白更改
内联
并排
Showing
43 changed file
with
154 addition
and
90 deletion
+154
-90
arch/arm/Kconfig
arch/arm/Kconfig
+1
-1
arch/arm/mach-ep93xx/adssphere.c
arch/arm/mach-ep93xx/adssphere.c
+1
-0
arch/arm/mach-ep93xx/gesbc9312.c
arch/arm/mach-ep93xx/gesbc9312.c
+1
-0
arch/arm/mach-ep93xx/ts72xx.c
arch/arm/mach-ep93xx/ts72xx.c
+6
-6
arch/arm/mach-ep93xx/ts72xx.h
arch/arm/mach-ep93xx/ts72xx.h
+5
-5
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/include/mach/map.h
+1
-1
arch/arm/mach-exynos/include/mach/sysmmu.h
arch/arm/mach-exynos/include/mach/sysmmu.h
+1
-1
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-msm/board-msm8x60.c
+0
-5
arch/arm/mach-msm/include/mach/msm_iomap-8960.h
arch/arm/mach-msm/include/mach/msm_iomap-8960.h
+1
-1
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+1
-1
arch/arm/mach-msm/io.c
arch/arm/mach-msm/io.c
+13
-12
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-nomadik/board-nhk8815.c
+1
-2
arch/arm/mach-omap2/gpio.c
arch/arm/mach-omap2/gpio.c
+2
-0
arch/arm/mach-omap2/omap-wakeupgen.c
arch/arm/mach-omap2/omap-wakeupgen.c
+1
-7
arch/arm/mach-s3c24xx/mach-h1940.c
arch/arm/mach-s3c24xx/mach-h1940.c
+2
-2
arch/arm/mach-tegra/powergate.c
arch/arm/mach-tegra/powergate.c
+36
-7
arch/arm/mach-ux500/Kconfig
arch/arm/mach-ux500/Kconfig
+1
-0
arch/arm/mach-ux500/board-mop500-regulators.c
arch/arm/mach-ux500/board-mop500-regulators.c
+15
-0
arch/arm/mach-ux500/board-mop500-regulators.h
arch/arm/mach-ux500/board-mop500-regulators.h
+1
-0
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/board-mop500.c
+19
-0
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/mach-ux500/cpu-db8500.c
+1
-0
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/cpu.c
+2
-0
arch/arm/mm/cache-l2x0.c
arch/arm/mm/cache-l2x0.c
+1
-1
arch/arm/plat-samsung/devs.c
arch/arm/plat-samsung/devs.c
+2
-0
arch/powerpc/platforms/83xx/suspend.c
arch/powerpc/platforms/83xx/suspend.c
+1
-1
arch/powerpc/platforms/cell/celleb_pci.c
arch/powerpc/platforms/cell/celleb_pci.c
+1
-1
arch/powerpc/sysdev/fsl_msi.c
arch/powerpc/sysdev/fsl_msi.c
+4
-4
drivers/dma/tegra20-apb-dma.c
drivers/dma/tegra20-apb-dma.c
+4
-4
drivers/gpio/gpio-mpc8xxx.c
drivers/gpio/gpio-mpc8xxx.c
+1
-1
drivers/gpio/gpio-omap.c
drivers/gpio/gpio-omap.c
+4
-4
drivers/i2c/busses/i2c-mpc.c
drivers/i2c/busses/i2c-mpc.c
+6
-6
drivers/i2c/busses/i2c-omap.c
drivers/i2c/busses/i2c-omap.c
+2
-1
drivers/macintosh/mediabay.c
drivers/macintosh/mediabay.c
+4
-4
drivers/mfd/da9052-i2c.c
drivers/mfd/da9052-i2c.c
+2
-2
drivers/mmc/host/omap_hsmmc.c
drivers/mmc/host/omap_hsmmc.c
+1
-1
drivers/net/can/mscan/mpc5xxx_can.c
drivers/net/can/mscan/mpc5xxx_can.c
+2
-2
drivers/pcmcia/pxa2xx_base.c
drivers/pcmcia/pxa2xx_base.c
+1
-1
drivers/spi/spi-imx.c
drivers/spi/spi-imx.c
+1
-1
drivers/spi/spi-omap2-mcspi.c
drivers/spi/spi-omap2-mcspi.c
+1
-1
drivers/tty/serial/mpc52xx_uart.c
drivers/tty/serial/mpc52xx_uart.c
+1
-1
drivers/watchdog/mpc8xxx_wdt.c
drivers/watchdog/mpc8xxx_wdt.c
+1
-1
include/linux/atmel_tc.h
include/linux/atmel_tc.h
+1
-1
include/linux/mod_devicetable.h
include/linux/mod_devicetable.h
+1
-1
未找到文件。
arch/arm/Kconfig
浏览文件 @
17a505ed
...
...
@@ -2312,7 +2312,7 @@ menu "Power management options"
source "kernel/power/Kconfig"
config ARCH_SUSPEND_POSSIBLE
depends on !ARCH_S5PC100
&& !ARCH_TEGRA
depends on !ARCH_S5PC100
depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK
def_bool y
...
...
arch/arm/mach-ep93xx/adssphere.c
浏览文件 @
17a505ed
...
...
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/sizes.h>
#include <mach/hardware.h>
...
...
arch/arm/mach-ep93xx/gesbc9312.c
浏览文件 @
17a505ed
...
...
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/sizes.h>
#include <mach/hardware.h>
...
...
arch/arm/mach-ep93xx/ts72xx.c
浏览文件 @
17a505ed
...
...
@@ -21,7 +21,6 @@
#include <linux/mtd/partitions.h>
#include <mach/hardware.h>
#include <mach/ts72xx.h>
#include <asm/hardware/vic.h>
#include <asm/mach-types.h>
...
...
@@ -29,30 +28,31 @@
#include <asm/mach/arch.h>
#include "soc.h"
#include "ts72xx.h"
static
struct
map_desc
ts72xx_io_desc
[]
__initdata
=
{
{
.
virtual
=
TS72XX_MODEL_VIRT_BASE
,
.
virtual
=
(
unsigned
long
)
TS72XX_MODEL_VIRT_BASE
,
.
pfn
=
__phys_to_pfn
(
TS72XX_MODEL_PHYS_BASE
),
.
length
=
TS72XX_MODEL_SIZE
,
.
type
=
MT_DEVICE
,
},
{
.
virtual
=
TS72XX_OPTIONS_VIRT_BASE
,
.
virtual
=
(
unsigned
long
)
TS72XX_OPTIONS_VIRT_BASE
,
.
pfn
=
__phys_to_pfn
(
TS72XX_OPTIONS_PHYS_BASE
),
.
length
=
TS72XX_OPTIONS_SIZE
,
.
type
=
MT_DEVICE
,
},
{
.
virtual
=
TS72XX_OPTIONS2_VIRT_BASE
,
.
virtual
=
(
unsigned
long
)
TS72XX_OPTIONS2_VIRT_BASE
,
.
pfn
=
__phys_to_pfn
(
TS72XX_OPTIONS2_PHYS_BASE
),
.
length
=
TS72XX_OPTIONS2_SIZE
,
.
type
=
MT_DEVICE
,
},
{
.
virtual
=
TS72XX_RTC_INDEX_VIRT_BASE
,
.
virtual
=
(
unsigned
long
)
TS72XX_RTC_INDEX_VIRT_BASE
,
.
pfn
=
__phys_to_pfn
(
TS72XX_RTC_INDEX_PHYS_BASE
),
.
length
=
TS72XX_RTC_INDEX_SIZE
,
.
type
=
MT_DEVICE
,
},
{
.
virtual
=
TS72XX_RTC_DATA_VIRT_BASE
,
.
virtual
=
(
unsigned
long
)
TS72XX_RTC_DATA_VIRT_BASE
,
.
pfn
=
__phys_to_pfn
(
TS72XX_RTC_DATA_PHYS_BASE
),
.
length
=
TS72XX_RTC_DATA_SIZE
,
.
type
=
MT_DEVICE
,
...
...
arch/arm/mach-ep93xx/
include/mach/
ts72xx.h
→
arch/arm/mach-ep93xx/ts72xx.h
浏览文件 @
17a505ed
...
...
@@ -14,7 +14,7 @@
*/
#define TS72XX_MODEL_PHYS_BASE 0x22000000
#define TS72XX_MODEL_VIRT_BASE
0xfebff000
#define TS72XX_MODEL_VIRT_BASE
IOMEM(0xfebff000)
#define TS72XX_MODEL_SIZE 0x00001000
#define TS72XX_MODEL_TS7200 0x00
...
...
@@ -26,7 +26,7 @@
#define TS72XX_OPTIONS_PHYS_BASE 0x22400000
#define TS72XX_OPTIONS_VIRT_BASE
0xfebfe000
#define TS72XX_OPTIONS_VIRT_BASE
IOMEM(0xfebfe000)
#define TS72XX_OPTIONS_SIZE 0x00001000
#define TS72XX_OPTIONS_COM2_RS485 0x02
...
...
@@ -34,18 +34,18 @@
#define TS72XX_OPTIONS2_PHYS_BASE 0x22800000
#define TS72XX_OPTIONS2_VIRT_BASE
0xfebfd000
#define TS72XX_OPTIONS2_VIRT_BASE
IOMEM(0xfebfd000)
#define TS72XX_OPTIONS2_SIZE 0x00001000
#define TS72XX_OPTIONS2_TS9420 0x04
#define TS72XX_OPTIONS2_TS9420_BOOT 0x02
#define TS72XX_RTC_INDEX_VIRT_BASE
0xfebf9000
#define TS72XX_RTC_INDEX_VIRT_BASE
IOMEM(0xfebf9000)
#define TS72XX_RTC_INDEX_PHYS_BASE 0x10800000
#define TS72XX_RTC_INDEX_SIZE 0x00001000
#define TS72XX_RTC_DATA_VIRT_BASE
0xfebf8000
#define TS72XX_RTC_DATA_VIRT_BASE
IOMEM(0xfebf8000)
#define TS72XX_RTC_DATA_PHYS_BASE 0x11700000
#define TS72XX_RTC_DATA_SIZE 0x00001000
...
...
arch/arm/mach-exynos/include/mach/map.h
浏览文件 @
17a505ed
...
...
@@ -89,7 +89,7 @@
#define EXYNOS4_PA_L2CC 0x10502000
#define EXYNOS4_PA_MDMA0 0x10810000
#define EXYNOS4_PA_MDMA1 0x128
4
0000
#define EXYNOS4_PA_MDMA1 0x128
5
0000
#define EXYNOS4_PA_PDMA0 0x12680000
#define EXYNOS4_PA_PDMA1 0x12690000
#define EXYNOS5_PA_MDMA0 0x10800000
...
...
arch/arm/mach-exynos/include/mach/sysmmu.h
浏览文件 @
17a505ed
...
...
@@ -58,7 +58,7 @@ static inline void platform_set_sysmmu(
#endif
#else
/* !CONFIG_EXYNOS_DEV_SYSMMU */
#define platform_set_sysmmu(
dev, sysmmu
) do { } while (0)
#define platform_set_sysmmu(
sysmmu, dev
) do { } while (0)
#endif
#define SYSMMU_CLOCK_DEVNAME(ipname, id) (SYSMMU_DEVNAME_BASE "." #id)
...
...
arch/arm/mach-msm/board-msm8x60.c
浏览文件 @
17a505ed
...
...
@@ -93,11 +93,6 @@ static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = {
static
void
__init
msm8x60_dt_init
(
void
)
{
if
(
of_machine_is_compatible
(
"qcom,msm8660-surf"
))
{
printk
(
KERN_INFO
"Init surf UART registers
\n
"
);
msm8x60_init_uart12dm
();
}
of_platform_populate
(
NULL
,
of_default_bus_match_table
,
msm_auxdata_lookup
,
NULL
);
}
...
...
arch/arm/mach-msm/include/mach/msm_iomap-8960.h
浏览文件 @
17a505ed
...
...
@@ -46,7 +46,7 @@
#define MSM8960_TMR0_SIZE SZ_4K
#ifdef CONFIG_DEBUG_MSM8960_UART
#define MSM_DEBUG_UART_BASE 0x
E1
040000
#define MSM_DEBUG_UART_BASE 0x
F0
040000
#define MSM_DEBUG_UART_PHYS 0x16440000
#endif
...
...
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
浏览文件 @
17a505ed
...
...
@@ -63,7 +63,7 @@
#define MSM8X60_TMR0_SIZE SZ_4K
#ifdef CONFIG_DEBUG_MSM8660_UART
#define MSM_DEBUG_UART_BASE 0x
E1
040000
#define MSM_DEBUG_UART_BASE 0x
F0
040000
#define MSM_DEBUG_UART_PHYS 0x19C40000
#endif
...
...
arch/arm/mach-msm/io.c
浏览文件 @
17a505ed
...
...
@@ -29,30 +29,31 @@
#include <mach/board.h>
#define MSM_CHIP_DEVICE
(name, chip
) { \
#define MSM_CHIP_DEVICE
_TYPE(name, chip, mem_type
) { \
.virtual = (unsigned long) MSM_##name##_BASE, \
.pfn = __phys_to_pfn(chip##_##name##_PHYS), \
.length = chip##_##name##_SIZE, \
.type =
MT_DEVICE_NONSHARED
, \
.type =
mem_type
, \
}
#define MSM_DEVICE_TYPE(name, mem_type) \
MSM_CHIP_DEVICE_TYPE(name, MSM, mem_type)
#define MSM_CHIP_DEVICE(name, chip) \
MSM_CHIP_DEVICE_TYPE(name, chip, MT_DEVICE)
#define MSM_DEVICE(name) MSM_CHIP_DEVICE(name, MSM)
#if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_MSM7X27) \
|| defined(CONFIG_ARCH_MSM7X25)
static
struct
map_desc
msm_io_desc
[]
__initdata
=
{
MSM_DEVICE
(
VIC
),
MSM_CHIP_DEVICE
(
CSR
,
MSM7X00
),
MSM_DEVICE
(
DMOV
),
MSM_CHIP_DEVICE
(
GPIO1
,
MSM7X00
),
MSM_CHIP_DEVICE
(
GPIO2
,
MSM7X00
),
MSM_DEVICE
(
CLK_CTL
),
MSM_DEVICE
_TYPE
(
VIC
,
MT_DEVICE_NONSHARED
),
MSM_CHIP_DEVICE
_TYPE
(
CSR
,
MSM7X00
,
MT_DEVICE_NONSHARED
),
MSM_DEVICE
_TYPE
(
DMOV
,
MT_DEVICE_NONSHARED
),
MSM_CHIP_DEVICE
_TYPE
(
GPIO1
,
MSM7X00
,
MT_DEVICE_NONSHARED
),
MSM_CHIP_DEVICE
_TYPE
(
GPIO2
,
MSM7X00
,
MT_DEVICE_NONSHARED
),
MSM_DEVICE
_TYPE
(
CLK_CTL
,
MT_DEVICE_NONSHARED
),
#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
defined(CONFIG_DEBUG_MSM_UART3)
MSM_DEVICE
(
DEBUG_UART
),
#endif
#ifdef CONFIG_ARCH_MSM7X30
MSM_DEVICE
(
GCC
),
MSM_DEVICE_TYPE
(
DEBUG_UART
,
MT_DEVICE_NONSHARED
),
#endif
{
.
virtual
=
(
unsigned
long
)
MSM_SHARED_RAM_BASE
,
...
...
arch/arm/mach-nomadik/board-nhk8815.c
浏览文件 @
17a505ed
...
...
@@ -112,8 +112,7 @@ static struct mtd_partition nhk8815_partitions[] = {
static
struct
nomadik_nand_platform_data
nhk8815_nand_data
=
{
.
parts
=
nhk8815_partitions
,
.
nparts
=
ARRAY_SIZE
(
nhk8815_partitions
),
.
options
=
NAND_COPYBACK
|
NAND_CACHEPRG
|
NAND_NO_PADDING
\
|
NAND_NO_READRDY
,
.
options
=
NAND_COPYBACK
|
NAND_CACHEPRG
|
NAND_NO_PADDING
,
.
init
=
nhk8815_nand_init
,
};
...
...
arch/arm/mach-omap2/gpio.c
浏览文件 @
17a505ed
...
...
@@ -60,6 +60,7 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
pdata
->
regs
=
kzalloc
(
sizeof
(
struct
omap_gpio_reg_offs
),
GFP_KERNEL
);
if
(
!
pdata
->
regs
)
{
pr_err
(
"gpio%d: Memory allocation failed
\n
"
,
id
);
kfree
(
pdata
);
return
-
ENOMEM
;
}
...
...
@@ -121,6 +122,7 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
break
;
default:
WARN
(
1
,
"Invalid gpio bank_type
\n
"
);
kfree
(
pdata
->
regs
);
kfree
(
pdata
);
return
-
EINVAL
;
}
...
...
arch/arm/mach-omap2/omap-wakeupgen.c
浏览文件 @
17a505ed
...
...
@@ -229,13 +229,7 @@ static inline void omap4_irq_save_context(void)
/* Save AuxBoot* registers */
val
=
__raw_readl
(
wakeupgen_base
+
OMAP_AUX_CORE_BOOT_0
);
__raw_writel
(
val
,
sar_base
+
AUXCOREBOOT0_OFFSET
);
val
=
__raw_readl
(
wakeupgen_base
+
OMAP_AUX_CORE_BOOT_0
);
__raw_writel
(
val
,
sar_base
+
AUXCOREBOOT1_OFFSET
);
/* Save SyncReq generation logic */
val
=
__raw_readl
(
wakeupgen_base
+
OMAP_AUX_CORE_BOOT_0
);
__raw_writel
(
val
,
sar_base
+
AUXCOREBOOT0_OFFSET
);
val
=
__raw_readl
(
wakeupgen_base
+
OMAP_AUX_CORE_BOOT_0
);
val
=
__raw_readl
(
wakeupgen_base
+
OMAP_AUX_CORE_BOOT_1
);
__raw_writel
(
val
,
sar_base
+
AUXCOREBOOT1_OFFSET
);
/* Save SyncReq generation logic */
...
...
arch/arm/mach-s3c24xx/mach-h1940.c
浏览文件 @
17a505ed
...
...
@@ -380,7 +380,7 @@ int h1940_led_blink_set(unsigned gpio, int state,
default:
blink_gpio
=
S3C2410_GPA
(
3
);
check_gpio1
=
S3C2410_GPA
(
1
);
check_gpio
1
=
S3C2410_GPA
(
7
);
check_gpio
2
=
S3C2410_GPA
(
7
);
break
;
}
...
...
@@ -460,7 +460,7 @@ static void h1940_set_mmc_power(unsigned char power_mode, unsigned short vdd)
break
;
default:
break
;
}
;
}
}
static
struct
s3c24xx_mci_pdata
h1940_mmc_cfg
__initdata
=
{
...
...
arch/arm/mach-tegra/powergate.c
浏览文件 @
17a505ed
...
...
@@ -199,7 +199,9 @@ int __init tegra_powergate_init(void)
#ifdef CONFIG_DEBUG_FS
static
const
char
*
const
powergate_name
[]
=
{
static
const
char
*
const
*
powergate_name
;
static
const
char
*
const
powergate_name_t20
[]
=
{
[
TEGRA_POWERGATE_CPU
]
=
"cpu"
,
[
TEGRA_POWERGATE_3D
]
=
"3d"
,
[
TEGRA_POWERGATE_VENC
]
=
"venc"
,
...
...
@@ -209,6 +211,23 @@ static const char * const powergate_name[] = {
[
TEGRA_POWERGATE_MPE
]
=
"mpe"
,
};
static
const
char
*
const
powergate_name_t30
[]
=
{
[
TEGRA_POWERGATE_CPU
]
=
"cpu0"
,
[
TEGRA_POWERGATE_3D
]
=
"3d0"
,
[
TEGRA_POWERGATE_VENC
]
=
"venc"
,
[
TEGRA_POWERGATE_VDEC
]
=
"vdec"
,
[
TEGRA_POWERGATE_PCIE
]
=
"pcie"
,
[
TEGRA_POWERGATE_L2
]
=
"l2"
,
[
TEGRA_POWERGATE_MPE
]
=
"mpe"
,
[
TEGRA_POWERGATE_HEG
]
=
"heg"
,
[
TEGRA_POWERGATE_SATA
]
=
"sata"
,
[
TEGRA_POWERGATE_CPU1
]
=
"cpu1"
,
[
TEGRA_POWERGATE_CPU2
]
=
"cpu2"
,
[
TEGRA_POWERGATE_CPU3
]
=
"cpu3"
,
[
TEGRA_POWERGATE_CELP
]
=
"celp"
,
[
TEGRA_POWERGATE_3D1
]
=
"3d1"
,
};
static
int
powergate_show
(
struct
seq_file
*
s
,
void
*
data
)
{
int
i
;
...
...
@@ -237,14 +256,24 @@ static const struct file_operations powergate_fops = {
int
__init
tegra_powergate_debugfs_init
(
void
)
{
struct
dentry
*
d
;
int
err
=
-
ENOMEM
;
d
=
debugfs_create_file
(
"powergate"
,
S_IRUGO
,
NULL
,
NULL
,
&
powergate_fops
);
if
(
!
d
)
return
-
ENOMEM
;
switch
(
tegra_chip_id
)
{
case
TEGRA20
:
powergate_name
=
powergate_name_t20
;
break
;
case
TEGRA30
:
powergate_name
=
powergate_name_t30
;
break
;
}
if
(
powergate_name
)
{
d
=
debugfs_create_file
(
"powergate"
,
S_IRUGO
,
NULL
,
NULL
,
&
powergate_fops
);
if
(
!
d
)
return
-
ENOMEM
;
}
return
err
;
return
0
;
}
#endif
arch/arm/mach-ux500/Kconfig
浏览文件 @
17a505ed
...
...
@@ -29,6 +29,7 @@ config MACH_MOP500
select I2C
select I2C_NOMADIK
select SOC_BUS
select REGULATOR_FIXED_VOLTAGE
help
Include support for the MOP500 development platform.
...
...
arch/arm/mach-ux500/board-mop500-regulators.c
浏览文件 @
17a505ed
...
...
@@ -13,6 +13,21 @@
#include <linux/regulator/ab8500.h>
#include "board-mop500-regulators.h"
static
struct
regulator_consumer_supply
gpio_en_3v3_consumers
[]
=
{
REGULATOR_SUPPLY
(
"vdd33a"
,
"smsc911x.0"
),
};
struct
regulator_init_data
gpio_en_3v3_regulator
=
{
.
constraints
=
{
.
name
=
"EN-3V3"
,
.
min_uV
=
3300000
,
.
max_uV
=
3300000
,
.
valid_ops_mask
=
REGULATOR_CHANGE_STATUS
,
},
.
num_consumer_supplies
=
ARRAY_SIZE
(
gpio_en_3v3_consumers
),
.
consumer_supplies
=
gpio_en_3v3_consumers
,
};
/*
* TPS61052 regulator
*/
...
...
arch/arm/mach-ux500/board-mop500-regulators.h
浏览文件 @
17a505ed
...
...
@@ -18,5 +18,6 @@ extern struct ab8500_regulator_reg_init
ab8500_regulator_reg_init
[
AB8500_NUM_REGULATOR_REGISTERS
];
extern
struct
regulator_init_data
ab8500_regulators
[
AB8500_NUM_REGULATORS
];
extern
struct
regulator_init_data
tps61052_regulator
;
extern
struct
regulator_init_data
gpio_en_3v3_regulator
;
#endif
arch/arm/mach-ux500/board-mop500.c
浏览文件 @
17a505ed
...
...
@@ -23,6 +23,7 @@
#include <linux/spi/spi.h>
#include <linux/mfd/abx500/ab8500.h>
#include <linux/regulator/ab8500.h>
#include <linux/regulator/fixed.h>
#include <linux/mfd/tc3589x.h>
#include <linux/mfd/tps6105x.h>
#include <linux/mfd/abx500/ab8500-gpio.h>
...
...
@@ -76,6 +77,23 @@ static struct platform_device snowball_led_dev = {
},
};
static
struct
fixed_voltage_config
snowball_gpio_en_3v3_data
=
{
.
supply_name
=
"EN-3V3"
,
.
gpio
=
SNOWBALL_EN_3V3_ETH_GPIO
,
.
microvolts
=
3300000
,
.
enable_high
=
1
,
.
init_data
=
&
gpio_en_3v3_regulator
,
.
startup_delay
=
5000
,
/* 1200us */
};
static
struct
platform_device
snowball_gpio_en_3v3_regulator_dev
=
{
.
name
=
"reg-fixed-voltage"
,
.
id
=
1
,
.
dev
=
{
.
platform_data
=
&
snowball_gpio_en_3v3_data
,
},
};
static
struct
ab8500_gpio_platform_data
ab8500_gpio_pdata
=
{
.
gpio_base
=
MOP500_AB8500_PIN_GPIO
(
1
),
.
irq_base
=
MOP500_AB8500_VIR_GPIO_IRQ_BASE
,
...
...
@@ -565,6 +583,7 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
&
snowball_led_dev
,
&
snowball_key_dev
,
&
snowball_sbnet_dev
,
&
snowball_gpio_en_3v3_regulator_dev
,
};
static
void
__init
mop500_init_machine
(
void
)
...
...
arch/arm/mach-ux500/cpu-db8500.c
浏览文件 @
17a505ed
...
...
@@ -18,6 +18,7 @@
#include <linux/io.h>
#include <linux/mfd/abx500/ab8500.h>
#include <asm/pmu.h>
#include <asm/mach/map.h>
#include <asm/pmu.h>
#include <plat/gpio-nomadik.h>
...
...
arch/arm/mach-ux500/cpu.c
浏览文件 @
17a505ed
...
...
@@ -49,6 +49,8 @@ void __init ux500_init_irq(void)
void
__iomem
*
dist_base
;
void
__iomem
*
cpu_base
;
gic_arch_extn
.
flags
=
IRQCHIP_SKIP_SET_WAKE
|
IRQCHIP_MASK_ON_SUSPEND
;
if
(
cpu_is_u8500_family
())
{
dist_base
=
__io_address
(
U8500_GIC_DIST_BASE
);
cpu_base
=
__io_address
(
U8500_GIC_CPU_BASE
);
...
...
arch/arm/mm/cache-l2x0.c
浏览文件 @
17a505ed
...
...
@@ -554,7 +554,7 @@ static const struct of_device_id l2x0_ids[] __initconst = {
int
__init
l2x0_of_init
(
u32
aux_val
,
u32
aux_mask
)
{
struct
device_node
*
np
;
struct
l2x0_of_data
*
data
;
const
struct
l2x0_of_data
*
data
;
struct
resource
res
;
np
=
of_find_matching_node
(
NULL
,
l2x0_ids
);
...
...
arch/arm/plat-samsung/devs.c
浏览文件 @
17a505ed
...
...
@@ -1591,6 +1591,8 @@ struct platform_device s3c64xx_device_spi1 = {
void
__init
s3c64xx_spi1_set_platdata
(
int
(
*
cfg_gpio
)(
void
),
int
src_clk_nr
,
int
num_cs
)
{
struct
s3c64xx_spi_info
pd
;
/* Reject invalid configuration */
if
(
!
num_cs
||
src_clk_nr
<
0
)
{
pr_err
(
"%s: Invalid SPI configuration
\n
"
,
__func__
);
...
...
arch/powerpc/platforms/83xx/suspend.c
浏览文件 @
17a505ed
...
...
@@ -326,7 +326,7 @@ static int pmc_probe(struct platform_device *ofdev)
const
struct
of_device_id
*
match
;
struct
device_node
*
np
=
ofdev
->
dev
.
of_node
;
struct
resource
res
;
struct
pmc_type
*
type
;
const
struct
pmc_type
*
type
;
int
ret
=
0
;
match
=
of_match_device
(
pmc_match
,
&
ofdev
->
dev
);
...
...
arch/powerpc/platforms/cell/celleb_pci.c
浏览文件 @
17a505ed
...
...
@@ -472,7 +472,7 @@ int __init celleb_setup_phb(struct pci_controller *phb)
{
struct
device_node
*
dev
=
phb
->
dn
;
const
struct
of_device_id
*
match
;
struct
celleb_phb_spec
*
phb_spec
;
const
struct
celleb_phb_spec
*
phb_spec
;
int
rc
;
match
=
of_match_node
(
celleb_phb_match
,
dev
);
...
...
arch/powerpc/sysdev/fsl_msi.c
浏览文件 @
17a505ed
...
...
@@ -368,7 +368,7 @@ static int __devinit fsl_of_msi_probe(struct platform_device *dev)
int
err
,
i
,
j
,
irq_index
,
count
;
int
rc
;
const
u32
*
p
;
struct
fsl_msi_feature
*
features
;
const
struct
fsl_msi_feature
*
features
;
int
len
;
u32
offset
;
static
const
u32
all_avail
[]
=
{
0
,
NR_MSI_IRQS
};
...
...
@@ -502,15 +502,15 @@ static const struct fsl_msi_feature vmpic_msi_feature = {
static
const
struct
of_device_id
fsl_of_msi_ids
[]
=
{
{
.
compatible
=
"fsl,mpic-msi"
,
.
data
=
(
void
*
)
&
mpic_msi_feature
,
.
data
=
&
mpic_msi_feature
,
},
{
.
compatible
=
"fsl,ipic-msi"
,
.
data
=
(
void
*
)
&
ipic_msi_feature
,
.
data
=
&
ipic_msi_feature
,
},
{
.
compatible
=
"fsl,vmpic-msi"
,
.
data
=
(
void
*
)
&
vmpic_msi_feature
,
.
data
=
&
vmpic_msi_feature
,
},
{}
};
...
...
drivers/dma/tegra20-apb-dma.c
浏览文件 @
17a505ed
...
...
@@ -201,7 +201,7 @@ struct tegra_dma {
struct
clk
*
dma_clk
;
spinlock_t
global_lock
;
void
__iomem
*
base_addr
;
struct
tegra_dma_chip_data
*
chip_data
;
const
struct
tegra_dma_chip_data
*
chip_data
;
/* Some register need to be cache before suspend */
u32
reg_gen
;
...
...
@@ -1173,14 +1173,14 @@ static void tegra_dma_free_chan_resources(struct dma_chan *dc)
}
/* Tegra20 specific DMA controller information */
static
struct
tegra_dma_chip_data
tegra20_dma_chip_data
=
{
static
const
struct
tegra_dma_chip_data
tegra20_dma_chip_data
=
{
.
nr_channels
=
16
,
.
max_dma_count
=
1024UL
*
64
,
};
#if defined(CONFIG_OF)
/* Tegra30 specific DMA controller information */
static
struct
tegra_dma_chip_data
tegra30_dma_chip_data
=
{
static
const
struct
tegra_dma_chip_data
tegra30_dma_chip_data
=
{
.
nr_channels
=
32
,
.
max_dma_count
=
1024UL
*
64
,
};
...
...
@@ -1204,7 +1204,7 @@ static int __devinit tegra_dma_probe(struct platform_device *pdev)
struct
tegra_dma
*
tdma
;
int
ret
;
int
i
;
struct
tegra_dma_chip_data
*
cdata
=
NULL
;
const
struct
tegra_dma_chip_data
*
cdata
=
NULL
;
if
(
pdev
->
dev
.
of_node
)
{
const
struct
of_device_id
*
match
;
...
...
drivers/gpio/gpio-mpc8xxx.c
浏览文件 @
17a505ed
...
...
@@ -38,7 +38,7 @@ struct mpc8xxx_gpio_chip {
*/
u32
data
;
struct
irq_domain
*
irq
;
void
*
of_dev_id_data
;
const
void
*
of_dev_id_data
;
};
static
inline
u32
mpc8xxx_gpio2mask
(
unsigned
int
gpio
)
...
...
drivers/gpio/gpio-omap.c
浏览文件 @
17a505ed
...
...
@@ -1058,7 +1058,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev)
struct
device
*
dev
=
&
pdev
->
dev
;
struct
device_node
*
node
=
dev
->
of_node
;
const
struct
of_device_id
*
match
;
struct
omap_gpio_platform_data
*
pdata
;
const
struct
omap_gpio_platform_data
*
pdata
;
struct
resource
*
res
;
struct
gpio_bank
*
bank
;
int
ret
=
0
;
...
...
@@ -1440,19 +1440,19 @@ static struct omap_gpio_reg_offs omap4_gpio_regs = {
.
fallingdetect
=
OMAP4_GPIO_FALLINGDETECT
,
};
static
struct
omap_gpio_platform_data
omap2_pdata
=
{
const
static
struct
omap_gpio_platform_data
omap2_pdata
=
{
.
regs
=
&
omap2_gpio_regs
,
.
bank_width
=
32
,
.
dbck_flag
=
false
,
};
static
struct
omap_gpio_platform_data
omap3_pdata
=
{
const
static
struct
omap_gpio_platform_data
omap3_pdata
=
{
.
regs
=
&
omap2_gpio_regs
,
.
bank_width
=
32
,
.
dbck_flag
=
true
,
};
static
struct
omap_gpio_platform_data
omap4_pdata
=
{
const
static
struct
omap_gpio_platform_data
omap4_pdata
=
{
.
regs
=
&
omap4_gpio_regs
,
.
bank_width
=
32
,
.
dbck_flag
=
true
,
...
...
drivers/i2c/busses/i2c-mpc.c
浏览文件 @
17a505ed
...
...
@@ -647,7 +647,7 @@ static int __devinit fsl_i2c_probe(struct platform_device *op)
}
if
(
match
->
data
)
{
struct
mpc_i2c_data
*
data
=
match
->
data
;
const
struct
mpc_i2c_data
*
data
=
match
->
data
;
data
->
setup
(
op
->
dev
.
of_node
,
i2c
,
clock
,
data
->
prescaler
);
}
else
{
/* Backwards compatibility */
...
...
@@ -730,24 +730,24 @@ static int mpc_i2c_resume(struct device *dev)
SIMPLE_DEV_PM_OPS
(
mpc_i2c_pm_ops
,
mpc_i2c_suspend
,
mpc_i2c_resume
);
#endif
static
struct
mpc_i2c_data
mpc_i2c_data_512x
__devinitdata
=
{
static
const
struct
mpc_i2c_data
mpc_i2c_data_512x
__devinitdata
=
{
.
setup
=
mpc_i2c_setup_512x
,
};
static
struct
mpc_i2c_data
mpc_i2c_data_52xx
__devinitdata
=
{
static
const
struct
mpc_i2c_data
mpc_i2c_data_52xx
__devinitdata
=
{
.
setup
=
mpc_i2c_setup_52xx
,
};
static
struct
mpc_i2c_data
mpc_i2c_data_8313
__devinitdata
=
{
static
const
struct
mpc_i2c_data
mpc_i2c_data_8313
__devinitdata
=
{
.
setup
=
mpc_i2c_setup_8xxx
,
};
static
struct
mpc_i2c_data
mpc_i2c_data_8543
__devinitdata
=
{
static
const
struct
mpc_i2c_data
mpc_i2c_data_8543
__devinitdata
=
{
.
setup
=
mpc_i2c_setup_8xxx
,
.
prescaler
=
2
,
};
static
struct
mpc_i2c_data
mpc_i2c_data_8544
__devinitdata
=
{
static
const
struct
mpc_i2c_data
mpc_i2c_data_8544
__devinitdata
=
{
.
setup
=
mpc_i2c_setup_8xxx
,
.
prescaler
=
3
,
};
...
...
drivers/i2c/busses/i2c-omap.c
浏览文件 @
17a505ed
...
...
@@ -944,7 +944,8 @@ omap_i2c_probe(struct platform_device *pdev)
struct
omap_i2c_dev
*
dev
;
struct
i2c_adapter
*
adap
;
struct
resource
*
mem
,
*
irq
,
*
ioarea
;
struct
omap_i2c_bus_platform_data
*
pdata
=
pdev
->
dev
.
platform_data
;
const
struct
omap_i2c_bus_platform_data
*
pdata
=
pdev
->
dev
.
platform_data
;
struct
device_node
*
node
=
pdev
->
dev
.
of_node
;
const
struct
of_device_id
*
match
;
irq_handler_t
isr
;
...
...
drivers/macintosh/mediabay.c
浏览文件 @
17a505ed
...
...
@@ -63,7 +63,7 @@ struct media_bay_info {
int
value_count
;
int
timer
;
struct
macio_dev
*
mdev
;
struct
mb_ops
*
ops
;
const
struct
mb_ops
*
ops
;
int
index
;
int
cached_gpio
;
int
sleeping
;
...
...
@@ -669,7 +669,7 @@ static int media_bay_resume(struct macio_dev *mdev)
/* Definitions of "ops" structures.
*/
static
struct
mb_ops
ohare_mb_ops
=
{
static
const
struct
mb_ops
ohare_mb_ops
=
{
.
name
=
"Ohare"
,
.
content
=
ohare_mb_content
,
.
power
=
ohare_mb_power
,
...
...
@@ -678,7 +678,7 @@ static struct mb_ops ohare_mb_ops = {
.
un_reset_ide
=
ohare_mb_un_reset_ide
,
};
static
struct
mb_ops
heathrow_mb_ops
=
{
static
const
struct
mb_ops
heathrow_mb_ops
=
{
.
name
=
"Heathrow"
,
.
content
=
heathrow_mb_content
,
.
power
=
heathrow_mb_power
,
...
...
@@ -687,7 +687,7 @@ static struct mb_ops heathrow_mb_ops = {
.
un_reset_ide
=
heathrow_mb_un_reset_ide
,
};
static
struct
mb_ops
keylargo_mb_ops
=
{
static
const
struct
mb_ops
keylargo_mb_ops
=
{
.
name
=
"KeyLargo"
,
.
init
=
keylargo_mb_init
,
.
content
=
keylargo_mb_content
,
...
...
drivers/mfd/da9052-i2c.c
浏览文件 @
17a505ed
...
...
@@ -46,7 +46,7 @@ static int da9052_i2c_enable_multiwrite(struct da9052 *da9052)
return
0
;
}
static
struct
i2c_device_id
da9052_i2c_id
[]
=
{
static
const
struct
i2c_device_id
da9052_i2c_id
[]
=
{
{
"da9052"
,
DA9052
},
{
"da9053-aa"
,
DA9053_AA
},
{
"da9053-ba"
,
DA9053_BA
},
...
...
@@ -104,7 +104,7 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client,
const
struct
of_device_id
*
deviceid
;
deviceid
=
of_match_node
(
dialog_dt_ids
,
np
);
id
=
(
const
struct
i2c_device_id
*
)
deviceid
->
data
;
id
=
deviceid
->
data
;
}
#endif
...
...
drivers/mmc/host/omap_hsmmc.c
浏览文件 @
17a505ed
...
...
@@ -1782,7 +1782,7 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev)
if
(
match
)
{
pdata
=
of_get_hsmmc_pdata
(
&
pdev
->
dev
);
if
(
match
->
data
)
{
u16
*
offsetp
=
match
->
data
;
const
u16
*
offsetp
=
match
->
data
;
pdata
->
reg_offset
=
*
offsetp
;
}
}
...
...
drivers/net/can/mscan/mpc5xxx_can.c
浏览文件 @
17a505ed
...
...
@@ -380,12 +380,12 @@ static int mpc5xxx_can_resume(struct platform_device *ofdev)
}
#endif
static
struct
mpc5xxx_can_data
__devinitdata
mpc5200_can_data
=
{
static
const
struct
mpc5xxx_can_data
__devinitdata
mpc5200_can_data
=
{
.
type
=
MSCAN_TYPE_MPC5200
,
.
get_clock
=
mpc52xx_can_get_clock
,
};
static
struct
mpc5xxx_can_data
__devinitdata
mpc5121_can_data
=
{
static
const
struct
mpc5xxx_can_data
__devinitdata
mpc5121_can_data
=
{
.
type
=
MSCAN_TYPE_MPC5121
,
.
get_clock
=
mpc512x_can_get_clock
,
};
...
...
drivers/pcmcia/pxa2xx_base.c
浏览文件 @
17a505ed
...
...
@@ -297,7 +297,7 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
}
clk
=
clk_get
(
&
dev
->
dev
,
NULL
);
if
(
!
clk
)
if
(
IS_ERR
(
clk
)
)
return
-
ENODEV
;
pxa2xx_drv_pcmcia_ops
(
ops
);
...
...
drivers/spi/spi-imx.c
浏览文件 @
17a505ed
...
...
@@ -97,7 +97,7 @@ struct spi_imx_data {
const
void
*
tx_buf
;
unsigned
int
txfifo
;
/* number of words pushed in tx FIFO */
struct
spi_imx_devtype_data
*
devtype_data
;
const
struct
spi_imx_devtype_data
*
devtype_data
;
int
chipselect
[
0
];
};
...
...
drivers/spi/spi-omap2-mcspi.c
浏览文件 @
17a505ed
...
...
@@ -1116,7 +1116,7 @@ MODULE_DEVICE_TABLE(of, omap_mcspi_of_match);
static
int
__devinit
omap2_mcspi_probe
(
struct
platform_device
*
pdev
)
{
struct
spi_master
*
master
;
struct
omap2_mcspi_platform_config
*
pdata
;
const
struct
omap2_mcspi_platform_config
*
pdata
;
struct
omap2_mcspi
*
mcspi
;
struct
resource
*
r
;
int
status
=
0
,
i
;
...
...
drivers/tty/serial/mpc52xx_uart.c
浏览文件 @
17a505ed
...
...
@@ -598,7 +598,7 @@ static struct psc_ops mpc512x_psc_ops = {
};
#endif
static
struct
psc_ops
*
psc_ops
;
static
const
struct
psc_ops
*
psc_ops
;
/* ======================================================================== */
/* UART operations */
...
...
drivers/watchdog/mpc8xxx_wdt.c
浏览文件 @
17a505ed
...
...
@@ -193,7 +193,7 @@ static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev)
int
ret
;
const
struct
of_device_id
*
match
;
struct
device_node
*
np
=
ofdev
->
dev
.
of_node
;
struct
mpc8xxx_wdt_type
*
wdt_type
;
const
struct
mpc8xxx_wdt_type
*
wdt_type
;
u32
freq
=
fsl_get_sys_freq
();
bool
enabled
;
...
...
include/linux/atmel_tc.h
浏览文件 @
17a505ed
...
...
@@ -63,7 +63,7 @@ struct atmel_tc {
struct
platform_device
*
pdev
;
struct
resource
*
iomem
;
void
__iomem
*
regs
;
struct
atmel_tcb_config
*
tcb_config
;
const
struct
atmel_tcb_config
*
tcb_config
;
int
irq
[
3
];
struct
clk
*
clk
[
3
];
struct
list_head
node
;
...
...
include/linux/mod_devicetable.h
浏览文件 @
17a505ed
...
...
@@ -232,7 +232,7 @@ struct of_device_id
char
type
[
32
];
char
compatible
[
128
];
#ifdef __KERNEL__
void
*
data
;
const
void
*
data
;
#else
kernel_ulong_t
data
;
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录