diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-davinci/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/sr_device.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 |
7 files changed, 6 insertions, 12 deletions
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 2ce1ef07c13d..ab99c3c3b752 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig | |||
@@ -62,7 +62,6 @@ config MACH_DAVINCI_EVM | |||
62 | bool "TI DM644x EVM" | 62 | bool "TI DM644x EVM" |
63 | default ARCH_DAVINCI_DM644x | 63 | default ARCH_DAVINCI_DM644x |
64 | depends on ARCH_DAVINCI_DM644x | 64 | depends on ARCH_DAVINCI_DM644x |
65 | select MISC_DEVICES | ||
66 | select EEPROM_AT24 | 65 | select EEPROM_AT24 |
67 | select I2C | 66 | select I2C |
68 | help | 67 | help |
@@ -72,7 +71,6 @@ config MACH_DAVINCI_EVM | |||
72 | config MACH_SFFSDR | 71 | config MACH_SFFSDR |
73 | bool "Lyrtech SFFSDR" | 72 | bool "Lyrtech SFFSDR" |
74 | depends on ARCH_DAVINCI_DM644x | 73 | depends on ARCH_DAVINCI_DM644x |
75 | select MISC_DEVICES | ||
76 | select EEPROM_AT24 | 74 | select EEPROM_AT24 |
77 | select I2C | 75 | select I2C |
78 | help | 76 | help |
@@ -106,7 +104,6 @@ config MACH_DAVINCI_DM6467_EVM | |||
106 | default ARCH_DAVINCI_DM646x | 104 | default ARCH_DAVINCI_DM646x |
107 | depends on ARCH_DAVINCI_DM646x | 105 | depends on ARCH_DAVINCI_DM646x |
108 | select MACH_DAVINCI_DM6467TEVM | 106 | select MACH_DAVINCI_DM6467TEVM |
109 | select MISC_DEVICES | ||
110 | select EEPROM_AT24 | 107 | select EEPROM_AT24 |
111 | select I2C | 108 | select I2C |
112 | help | 109 | help |
@@ -120,7 +117,6 @@ config MACH_DAVINCI_DM365_EVM | |||
120 | bool "TI DM365 EVM" | 117 | bool "TI DM365 EVM" |
121 | default ARCH_DAVINCI_DM365 | 118 | default ARCH_DAVINCI_DM365 |
122 | depends on ARCH_DAVINCI_DM365 | 119 | depends on ARCH_DAVINCI_DM365 |
123 | select MISC_DEVICES | ||
124 | select EEPROM_AT24 | 120 | select EEPROM_AT24 |
125 | select I2C | 121 | select I2C |
126 | help | 122 | help |
@@ -132,7 +128,6 @@ config MACH_DAVINCI_DA830_EVM | |||
132 | default ARCH_DAVINCI_DA830 | 128 | default ARCH_DAVINCI_DA830 |
133 | depends on ARCH_DAVINCI_DA830 | 129 | depends on ARCH_DAVINCI_DA830 |
134 | select GPIO_PCF857X | 130 | select GPIO_PCF857X |
135 | select MISC_DEVICES | ||
136 | select EEPROM_AT24 | 131 | select EEPROM_AT24 |
137 | select I2C | 132 | select I2C |
138 | help | 133 | help |
@@ -219,7 +214,6 @@ config MACH_TNETV107X | |||
219 | config MACH_MITYOMAPL138 | 214 | config MACH_MITYOMAPL138 |
220 | bool "Critical Link MityDSP-L138/MityARM-1808 SoM" | 215 | bool "Critical Link MityDSP-L138/MityARM-1808 SoM" |
221 | depends on ARCH_DAVINCI_DA850 | 216 | depends on ARCH_DAVINCI_DA850 |
222 | select MISC_DEVICES | ||
223 | select EEPROM_AT24 | 217 | select EEPROM_AT24 |
224 | select I2C | 218 | select I2C |
225 | help | 219 | help |
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 519bcd3079e8..e5fa46bfde2f 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
@@ -311,7 +311,7 @@ static void __init omap_apollon_init(void) | |||
311 | /* LCD PWR_EN */ | 311 | /* LCD PWR_EN */ |
312 | omap_mux_init_signal("mcbsp2_dr.gpio_11", OMAP_PULL_ENA | OMAP_PULL_UP); | 312 | omap_mux_init_signal("mcbsp2_dr.gpio_11", OMAP_PULL_ENA | OMAP_PULL_UP); |
313 | 313 | ||
314 | /* Use Interal loop-back in MMC/SDIO Module Input Clock selection */ | 314 | /* Use Internal loop-back in MMC/SDIO Module Input Clock selection */ |
315 | v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); | 315 | v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); |
316 | v |= (1 << 24); | 316 | v |= (1 << 24); |
317 | omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0); | 317 | omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0); |
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index b627cdc12b84..70f6d1d25463 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -106,7 +106,7 @@ static struct platform_device leds_gpio = { | |||
106 | static struct omap_abe_twl6040_data panda_abe_audio_data = { | 106 | static struct omap_abe_twl6040_data panda_abe_audio_data = { |
107 | /* Audio out */ | 107 | /* Audio out */ |
108 | .has_hs = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | 108 | .has_hs = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, |
109 | /* HandsFree through expasion connector */ | 109 | /* HandsFree through expansion connector */ |
110 | .has_hf = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | 110 | .has_hf = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, |
111 | /* PandaBoard: FM TX, PandaBoardES: can be connected to audio out */ | 111 | /* PandaBoard: FM TX, PandaBoardES: can be connected to audio out */ |
112 | .has_aux = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | 112 | .has_aux = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, |
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c index e35a86bf4e1d..637a1bdf2ac4 100644 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c | |||
@@ -313,7 +313,7 @@ int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state) | |||
313 | scu_pwrst_prepare(cpu, power_state); | 313 | scu_pwrst_prepare(cpu, power_state); |
314 | 314 | ||
315 | /* | 315 | /* |
316 | * CPU never retuns back if targetted power state is OFF mode. | 316 | * CPU never retuns back if targeted power state is OFF mode. |
317 | * CPU ONLINE follows normal CPU ONLINE ptah via | 317 | * CPU ONLINE follows normal CPU ONLINE ptah via |
318 | * omap_secondary_startup(). | 318 | * omap_secondary_startup(). |
319 | */ | 319 | */ |
diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index e107e3915a8a..d033a65f4e4e 100644 --- a/arch/arm/mach-omap2/sr_device.c +++ b/arch/arm/mach-omap2/sr_device.c | |||
@@ -131,7 +131,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) | |||
131 | 131 | ||
132 | omap_voltage_get_volttable(sr_data->voltdm, &volt_data); | 132 | omap_voltage_get_volttable(sr_data->voltdm, &volt_data); |
133 | if (!volt_data) { | 133 | if (!volt_data) { |
134 | pr_warning("%s: No Voltage table registerd fo VDD%d." | 134 | pr_warning("%s: No Voltage table registered fo VDD%d." |
135 | "Something really wrong\n\n", __func__, i + 1); | 135 | "Something really wrong\n\n", __func__, i + 1); |
136 | goto exit; | 136 | goto exit; |
137 | } | 137 | } |
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 3882f3c7608c..de47f170ba50 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c | |||
@@ -96,7 +96,7 @@ void __init omap4_pmic_init(const char *pmic_type, | |||
96 | 96 | ||
97 | void __init omap_pmic_late_init(void) | 97 | void __init omap_pmic_late_init(void) |
98 | { | 98 | { |
99 | /* Init the OMAP TWL parameters (if PMIC has been registerd) */ | 99 | /* Init the OMAP TWL parameters (if PMIC has been registered) */ |
100 | if (pmic_i2c_board_info.irq) | 100 | if (pmic_i2c_board_info.irq) |
101 | omap3_twl_init(); | 101 | omap3_twl_init(); |
102 | if (omap4_i2c1_board_info[0].irq) | 102 | if (omap4_i2c1_board_info[0].irq) |
diff --git a/arch/arm/plat-samsung/include/plat/gpio-cfg.h b/arch/arm/plat-samsung/include/plat/gpio-cfg.h index df8155b9d4d1..08740eed050c 100644 --- a/arch/arm/plat-samsung/include/plat/gpio-cfg.h +++ b/arch/arm/plat-samsung/include/plat/gpio-cfg.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #ifndef __PLAT_GPIO_CFG_H | 24 | #ifndef __PLAT_GPIO_CFG_H |
25 | #define __PLAT_GPIO_CFG_H __FILE__ | 25 | #define __PLAT_GPIO_CFG_H __FILE__ |
26 | 26 | ||
27 | #include<linux/types.h> | 27 | #include <linux/types.h> |
28 | 28 | ||
29 | typedef unsigned int __bitwise__ samsung_gpio_pull_t; | 29 | typedef unsigned int __bitwise__ samsung_gpio_pull_t; |
30 | typedef unsigned int __bitwise__ s5p_gpio_drvstr_t; | 30 | typedef unsigned int __bitwise__ s5p_gpio_drvstr_t; |