diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 21:48:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 21:48:30 -0400 |
commit | 95360fd63606918167a5365b770a6d28d333f0ed (patch) | |
tree | 37b2d868fb70d3ef214345e56d7993a0c73a0ddc /arch/arm/mach-imx | |
parent | 8f446a7a069e0af0639385f67c78ee2279bca04c (diff) | |
parent | e6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad (diff) |
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc board specific updates from Olof Johansson:
"Misc board updates:
- Greg added a handful of boards to KS8695 (since he has stepped up
to maintain it).
- Qualcomm has added DT-only board support for a couple of their
newer SoCs.
- misc other updates for Samsung and Freescale boards."
Fix up trivial conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
due to gpio device data being added next to hdmi device data that got moved.
* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: msm: Allow 8960 and 8660 to compile together
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
ARM: EXYNOS: Use generic pwm driver in Origen board
ARM: shmobile: armadillo800eva: Add support RTC
ARM: ks8695: add board support for the OpenGear boards based on the KS8695
ARM: ks8695: add board support for the SnapGear boards based on the KS8695
ARM: dts: Add heartbeat gpio-leds support to Origen
ARM: dts: Use active low flag for gpio-keys on Origen
ARM: shmobile: marzen: enable thermal sensor
ARM: shmobile: marzen: fixup regulator id for smsc911x
ARM: shmobile: marzen: add SDHI0 support
ARM: mmp: enable debug uart port in defconfig
ARM: mmp: implement DEBUG_LL port choice
ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore
ARM: mx27pdk: Add audio support
ARM: ttc_dkb: add nand support
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx27_3ds.c | 21 |
2 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 7ca5fe45945f..3a2042fb9712 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -298,6 +298,7 @@ config MACH_MX27_3DS | |||
298 | select IMX_HAVE_PLATFORM_IMX_FB | 298 | select IMX_HAVE_PLATFORM_IMX_FB |
299 | select IMX_HAVE_PLATFORM_IMX_I2C | 299 | select IMX_HAVE_PLATFORM_IMX_I2C |
300 | select IMX_HAVE_PLATFORM_IMX_KEYPAD | 300 | select IMX_HAVE_PLATFORM_IMX_KEYPAD |
301 | select IMX_HAVE_PLATFORM_IMX_SSI | ||
301 | select IMX_HAVE_PLATFORM_IMX_UART | 302 | select IMX_HAVE_PLATFORM_IMX_UART |
302 | select IMX_HAVE_PLATFORM_MX2_CAMERA | 303 | select IMX_HAVE_PLATFORM_MX2_CAMERA |
303 | select IMX_HAVE_PLATFORM_MXC_EHCI | 304 | select IMX_HAVE_PLATFORM_MXC_EHCI |
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 58c24c1a7ab7..05996f39005c 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c | |||
@@ -158,6 +158,11 @@ static const int mx27pdk_pins[] __initconst = { | |||
158 | PB21_PF_CSI_HSYNC, | 158 | PB21_PF_CSI_HSYNC, |
159 | CSI_PWRDWN | GPIO_GPIO | GPIO_OUT, | 159 | CSI_PWRDWN | GPIO_GPIO | GPIO_OUT, |
160 | CSI_RESET | GPIO_GPIO | GPIO_OUT, | 160 | CSI_RESET | GPIO_GPIO | GPIO_OUT, |
161 | /* SSI4 */ | ||
162 | PC16_PF_SSI4_FS, | ||
163 | PC17_PF_SSI4_RXD, | ||
164 | PC18_PF_SSI4_TXD, | ||
165 | PC19_PF_SSI4_CLK, | ||
161 | }; | 166 | }; |
162 | 167 | ||
163 | static struct gpio mx27_3ds_camera_gpios[] = { | 168 | static struct gpio mx27_3ds_camera_gpios[] = { |
@@ -329,13 +334,24 @@ static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = { | |||
329 | }; | 334 | }; |
330 | 335 | ||
331 | /* MC13783 */ | 336 | /* MC13783 */ |
337 | static struct mc13xxx_codec_platform_data mx27_3ds_codec = { | ||
338 | .dac_ssi_port = MC13783_SSI1_PORT, | ||
339 | .adc_ssi_port = MC13783_SSI1_PORT, | ||
340 | }; | ||
341 | |||
332 | static struct mc13xxx_platform_data mc13783_pdata = { | 342 | static struct mc13xxx_platform_data mc13783_pdata = { |
333 | .regulators = { | 343 | .regulators = { |
334 | .regulators = mx27_3ds_regulators, | 344 | .regulators = mx27_3ds_regulators, |
335 | .num_regulators = ARRAY_SIZE(mx27_3ds_regulators), | 345 | .num_regulators = ARRAY_SIZE(mx27_3ds_regulators), |
336 | 346 | ||
337 | }, | 347 | }, |
338 | .flags = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC, | 348 | .flags = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC | |
349 | MC13XXX_USE_CODEC, | ||
350 | .codec = &mx27_3ds_codec, | ||
351 | }; | ||
352 | |||
353 | static struct imx_ssi_platform_data mx27_3ds_ssi_pdata = { | ||
354 | .flags = IMX_SSI_DMA | IMX_SSI_NET, | ||
339 | }; | 355 | }; |
340 | 356 | ||
341 | /* SPI */ | 357 | /* SPI */ |
@@ -512,6 +528,9 @@ static void __init mx27pdk_init(void) | |||
512 | } | 528 | } |
513 | 529 | ||
514 | imx27_add_mx2_camera(&mx27_3ds_cam_pdata); | 530 | imx27_add_mx2_camera(&mx27_3ds_cam_pdata); |
531 | imx27_add_imx_ssi(0, &mx27_3ds_ssi_pdata); | ||
532 | |||
533 | imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0); | ||
515 | } | 534 | } |
516 | 535 | ||
517 | static void __init mx27pdk_timer_init(void) | 536 | static void __init mx27pdk_timer_init(void) |