diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:27:36 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:27:36 +0800 |
| commit | 7ac674d56fec2e9dd144416fd616020aad3170cb (patch) | |
| tree | bad3070d766810bd1c10058ae5b54e4de93fae28 /arch/arm/mach-mx5/Kconfig | |
| parent | 95df9608d81e4290a7a2657eef99229db2ec9aa6 (diff) | |
| parent | 3ffa6554d683f636518844887d5dc259b367e731 (diff) | |
Merge branch 'topic/lt-3.2-imx6-ugly' into lt-3.2-imx6
* topic/lt-3.2-imx6-ugly: (129 commits)
imx6q: add clock debugfs support
imx6q-sabrelite: add iomux setup
iomux: add and export mxc_iomux_set_gpr_register()
imx6q: add iomux v3 support
imx6q: add UART2 as debug UART (to be removed)
SAUCE: fix the missing header of <linux/module.h>
SAUCE: fix the removal of mxc_register_device()
SAUCE: mx53_loco: fix gpio_to_irq() being non-constant
SAUCE: fix building errors after rebased to v3.2
LINARO: Add lt-mx5_defconfig
ARM i.MX5: fix system_rev if not set by atag or DT
ENGR00162701 mxc_vout: fix potential deadlock of fb_blank
ENGR00162666 mxc_vout: v4l2 playback blocking issue
ENGR00162665 ipuv3 fb: fix non-interleave format wrong color issue
ENGR00162664 mxc_vout: modify pp bypass condition
ENGR00162663 ipuv3 fb: add vertical flip support
ENGR00162475 ipuv3 fb: fix camera preview failure
ENGR00162360 mxc_vout: fix STREAMOFF and G_CROP issues
ENGR00162358 ipuv3 fb: only check pos when fb is unblank
ENGR00162354 ipuv3 device: correct kthread operation for split task
...
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
arch/arm/plat-mxc/include/mach/mx6q.h
arch/arm/plat-mxc/include/mach/mxc.h
drivers/char/Kconfig
drivers/char/Makefile
drivers/mxc/Kconfig
drivers/mxc/Makefile
drivers/rtc/Kconfig
Diffstat (limited to 'arch/arm/mach-mx5/Kconfig')
| -rw-r--r-- | arch/arm/mach-mx5/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index af0c212e3c7..da99de76ae0 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig @@ -31,6 +31,11 @@ config SOC_IMX51 select ARCH_MXC_AUDMUX_V2 select ARCH_HAS_CPUFREQ select ARCH_MX51 + select IMX_HAVE_PLATFORM_IMX_IIM + select IMX_HAVE_PLATFORM_IMX_IPUV3 + select IMX_HAVE_PLATFORM_IMX_TVE + select IMX_HAVE_PLATFORM_IMX_VPU + select IMX_HAVE_PLATFORM_IMX_SPDIF config SOC_IMX53 bool @@ -38,7 +43,15 @@ config SOC_IMX53 select ARM_L1_CACHE_SHIFT_6 select MXC_TZIC select ARCH_MXC_IOMUX_V3 + select ARCH_MXC_AUDMUX_V2 + select ARCH_HAS_CPUFREQ select ARCH_MX53 + select IMX_HAVE_PLATFORM_IMX_IIM + select IMX_HAVE_PLATFORM_IMX_IPUV3 + select IMX_HAVE_PLATFORM_IMX_TVE + select IMX_HAVE_PLATFORM_LDB + select IMX_HAVE_PLATFORM_IMX_VPU + select IMX_HAVE_PLATFORM_IMX_SPDIF #comment "i.MX50 machines:" @@ -221,10 +234,14 @@ config MACH_MX53_LOCO select SOC_IMX53 select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_IMX_I2C + select IMX_HAVE_PLATFORM_IMX_SRTC select IMX_HAVE_PLATFORM_IMX_UART + select IMX_HAVE_PLATFORM_MXC_GPU + select IMX_HAVE_PLATFORM_MXC_PWM select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX select IMX_HAVE_PLATFORM_GPIO_KEYS select LEDS_GPIO_REGISTER + select IMX_HAVE_PLATFORM_IMX_SSI help Include support for MX53 LOCO platform. This includes specific configurations for the board and its peripherals. |