diff options
| author | Danny Nold <dannynold@freescale.com> | 2012-02-08 21:28:42 -0600 |
|---|---|---|
| committer | Danny Nold <dannynold@freescale.com> | 2012-02-15 10:21:13 -0600 |
| commit | 0de735b2cd67c82edb744af1880683d2fa1e9cc2 (patch) | |
| tree | 3d529f6ac76b2901b4247cebf81b04edfe3393bc /arch/arm/configs | |
| parent | 56264cb98cc8736cab57b0a63c0b00b65fb73249 (diff) | |
ENGR00174106-1 - EPDC fb: Support EPDC on MX 6DL/S
- Added EPDC and EPD PMIC (Maxim 17135) to MX6Q ARM2 board file
- Added EPDC-related IOMUX and GPIO settings
- Added EPDC clock configuration settings to clock file
- Updated config files with EPDC and Maxim 17135 config entries
Signed-off-by: Danny Nold <dannynold@freescale.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx6_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/configs/imx6_updater_defconfig | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index 8f00d362cc15..5d9d768b34c2 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -275,6 +275,7 @@ CONFIG_IMX_HAVE_PLATFORM_IMX_VIIM=y CONFIG_IMX_HAVE_PLATFORM_PERFMON=y CONFIG_IMX_HAVE_PLATFORM_LDB=y CONFIG_IMX_HAVE_PLATFORM_IMX_PXP=y +CONFIG_IMX_HAVE_PLATFORM_IMX_EPDC=y CONFIG_IMX_HAVE_PLATFORM_IMX_SPDIF=y CONFIG_IMX_HAVE_PLATFORM_VIV_GPU=y CONFIG_IMX_HAVE_PLATFORM_MXC_HDMI=y @@ -1443,7 +1444,7 @@ CONFIG_MFD_PFUZE=y # CONFIG_EZX_PCAP is not set # CONFIG_MFD_WL1273_CORE is not set # CONFIG_MFD_TPS65910 is not set -# CONFIG_MFD_MAX17135 is not set +CONFIG_MFD_MAX17135=y CONFIG_MFD_MXC_HDMI=y CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set @@ -1466,6 +1467,7 @@ CONFIG_REGULATOR_PFUZE100=y # CONFIG_REGULATOR_AD5398 is not set CONFIG_REGULATOR_ANATOP=y # CONFIG_REGULATOR_TPS6524X is not set +CONFIG_REGULATOR_MAX17135=y CONFIG_MEDIA_SUPPORT=y # diff --git a/arch/arm/configs/imx6_updater_defconfig b/arch/arm/configs/imx6_updater_defconfig index d0d8e7607563..b03276bf28ba 100644 --- a/arch/arm/configs/imx6_updater_defconfig +++ b/arch/arm/configs/imx6_updater_defconfig @@ -1217,7 +1217,7 @@ CONFIG_MFD_PFUZE=y # CONFIG_EZX_PCAP is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_WL1273_CORE is not set -# CONFIG_MFD_MAX17135 is not set +CONFIG_MFD_MAX17135=y CONFIG_MFD_MXC_HDMI=y CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set @@ -1238,8 +1238,9 @@ CONFIG_REGULATOR_PFUZE100=y # CONFIG_REGULATOR_TPS6507X is not set # CONFIG_REGULATOR_ISL6271A is not set # CONFIG_REGULATOR_AD5398 is not set -# CONFIG_REGULATOR_TPS6524X is not set CONFIG_REGULATOR_ANATOP=y +# CONFIG_REGULATOR_TPS6524X is not set +CONFIG_REGULATOR_MAX17135=y CONFIG_MEDIA_SUPPORT=y # |