diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:39:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:39:22 -0500 |
commit | 2ac9d7aaccbd598b5bd19ac40761b723bb675442 (patch) | |
tree | 09132a44e33798aaa5e80f10bf025b510015cab3 /arch/arm/plat-samsung/include | |
parent | 5ede3ceb7b2c2843e153a1803edbdc8c56655950 (diff) | |
parent | dcf7ec5ee62a78123057a1e286c88ca739717409 (diff) |
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Driver specific changes
Again, a lot of platforms have changes in here: pxa, samsung, omap,
at91, imx, ...
* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
ARM: sa1100: clean up of the clock support
ARM: pxa: add dummy clock for sa1100-rtc
RTC: sa1100: support sa1100, pxa and mmp soc families
RTC: sa1100: remove redundant code of setting alarm
RTC: sa1100: Clean out ost register
Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
ARM: EXYNOS: Modified files for SPI consolidation work
ARM: S5P64X0: Enable SDHCI support
ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
ARM: S5P64X0: Add HSMMC setup for host Controller
ARM: EXYNOS: Add USB OHCI support to ORIGEN board
USB: Add Samsung Exynos OHCI diver
ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
ARM: EXYNOS: Add USB OHCI device
net: macb: fix build break with !CONFIG_OF
i2c: tegra: Support DVC controller in device tree
i2c: tegra: Add __devinit/exit to probe/remove
net/at91_ether: use gpio_is_valid for phy IRQ line
ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT
...
Diffstat (limited to 'arch/arm/plat-samsung/include')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/sdhci.h | 44 |
2 files changed, 45 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 83b1e31696d9..4214ea0ff8fe 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
@@ -123,6 +123,7 @@ extern struct platform_device exynos4_device_dwmci; | |||
123 | extern struct platform_device exynos4_device_i2s0; | 123 | extern struct platform_device exynos4_device_i2s0; |
124 | extern struct platform_device exynos4_device_i2s1; | 124 | extern struct platform_device exynos4_device_i2s1; |
125 | extern struct platform_device exynos4_device_i2s2; | 125 | extern struct platform_device exynos4_device_i2s2; |
126 | extern struct platform_device exynos4_device_ohci; | ||
126 | extern struct platform_device exynos4_device_pcm0; | 127 | extern struct platform_device exynos4_device_pcm0; |
127 | extern struct platform_device exynos4_device_pcm1; | 128 | extern struct platform_device exynos4_device_pcm1; |
128 | extern struct platform_device exynos4_device_pcm2; | 129 | extern struct platform_device exynos4_device_pcm2; |
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h index dcff7dd1ae8a..656dc00d30ed 100644 --- a/arch/arm/plat-samsung/include/plat/sdhci.h +++ b/arch/arm/plat-samsung/include/plat/sdhci.h | |||
@@ -123,6 +123,10 @@ extern void exynos4_setup_sdhci0_cfg_gpio(struct platform_device *, int w); | |||
123 | extern void exynos4_setup_sdhci1_cfg_gpio(struct platform_device *, int w); | 123 | extern void exynos4_setup_sdhci1_cfg_gpio(struct platform_device *, int w); |
124 | extern void exynos4_setup_sdhci2_cfg_gpio(struct platform_device *, int w); | 124 | extern void exynos4_setup_sdhci2_cfg_gpio(struct platform_device *, int w); |
125 | extern void exynos4_setup_sdhci3_cfg_gpio(struct platform_device *, int w); | 125 | extern void exynos4_setup_sdhci3_cfg_gpio(struct platform_device *, int w); |
126 | extern void s5p64x0_setup_sdhci0_cfg_gpio(struct platform_device *, int w); | ||
127 | extern void s5p64x0_setup_sdhci1_cfg_gpio(struct platform_device *, int w); | ||
128 | extern void s5p6440_setup_sdhci2_cfg_gpio(struct platform_device *, int w); | ||
129 | extern void s5p6450_setup_sdhci2_cfg_gpio(struct platform_device *, int w); | ||
126 | 130 | ||
127 | /* S3C2416 SDHCI setup */ | 131 | /* S3C2416 SDHCI setup */ |
128 | 132 | ||
@@ -146,6 +150,7 @@ static inline void s3c2416_default_sdhci0(void) { } | |||
146 | static inline void s3c2416_default_sdhci1(void) { } | 150 | static inline void s3c2416_default_sdhci1(void) { } |
147 | 151 | ||
148 | #endif /* CONFIG_S3C2416_SETUP_SDHCI */ | 152 | #endif /* CONFIG_S3C2416_SETUP_SDHCI */ |
153 | |||
149 | /* S3C64XX SDHCI setup */ | 154 | /* S3C64XX SDHCI setup */ |
150 | 155 | ||
151 | #ifdef CONFIG_S3C64XX_SETUP_SDHCI | 156 | #ifdef CONFIG_S3C64XX_SETUP_SDHCI |
@@ -201,6 +206,45 @@ static inline void s3c6400_default_sdhci2(void) { } | |||
201 | 206 | ||
202 | #endif /* CONFIG_S3C64XX_SETUP_SDHCI */ | 207 | #endif /* CONFIG_S3C64XX_SETUP_SDHCI */ |
203 | 208 | ||
209 | /* S5P64X0 SDHCI setup */ | ||
210 | |||
211 | #ifdef CONFIG_S5P64X0_SETUP_SDHCI | ||
212 | static inline void s5p64x0_default_sdhci0(void) | ||
213 | { | ||
214 | #ifdef CONFIG_S3C_DEV_HSMMC | ||
215 | s3c_hsmmc0_def_platdata.cfg_gpio = s5p64x0_setup_sdhci0_cfg_gpio; | ||
216 | #endif | ||
217 | } | ||
218 | |||
219 | static inline void s5p64x0_default_sdhci1(void) | ||
220 | { | ||
221 | #ifdef CONFIG_S3C_DEV_HSMMC1 | ||
222 | s3c_hsmmc1_def_platdata.cfg_gpio = s5p64x0_setup_sdhci1_cfg_gpio; | ||
223 | #endif | ||
224 | } | ||
225 | |||
226 | static inline void s5p6440_default_sdhci2(void) | ||
227 | { | ||
228 | #ifdef CONFIG_S3C_DEV_HSMMC2 | ||
229 | s3c_hsmmc2_def_platdata.cfg_gpio = s5p6440_setup_sdhci2_cfg_gpio; | ||
230 | #endif | ||
231 | } | ||
232 | |||
233 | static inline void s5p6450_default_sdhci2(void) | ||
234 | { | ||
235 | #ifdef CONFIG_S3C_DEV_HSMMC2 | ||
236 | s3c_hsmmc2_def_platdata.cfg_gpio = s5p6450_setup_sdhci2_cfg_gpio; | ||
237 | #endif | ||
238 | } | ||
239 | |||
240 | #else | ||
241 | static inline void s5p64x0_default_sdhci0(void) { } | ||
242 | static inline void s5p64x0_default_sdhci1(void) { } | ||
243 | static inline void s5p6440_default_sdhci2(void) { } | ||
244 | static inline void s5p6450_default_sdhci2(void) { } | ||
245 | |||
246 | #endif /* CONFIG_S5P64X0_SETUP_SDHCI */ | ||
247 | |||
204 | /* S5PC100 SDHCI setup */ | 248 | /* S5PC100 SDHCI setup */ |
205 | 249 | ||
206 | #ifdef CONFIG_S5PC100_SETUP_SDHCI | 250 | #ifdef CONFIG_S5PC100_SETUP_SDHCI |