summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
authorDanny Nold <dannynold@freescale.com>2012-02-08 21:28:42 -0600
committerDanny Nold <dannynold@freescale.com>2012-02-15 10:21:13 -0600
commit0de735b2cd67c82edb744af1880683d2fa1e9cc2 (patch)
tree3d529f6ac76b2901b4247cebf81b04edfe3393bc /arch/arm/plat-mxc
parent56264cb98cc8736cab57b0a63c0b00b65fb73249 (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/plat-mxc')
-rw-r--r--arch/arm/plat-mxc/devices/platform-imx-epdc-fb.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx-epdc-fb.c b/arch/arm/plat-mxc/devices/platform-imx-epdc-fb.c
index d7dbe3edcaef..404a264e7ddc 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-epdc-fb.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-epdc-fb.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -22,7 +22,7 @@
#include <mach/hardware.h>
#include <mach/devices-common.h>
-#define imx5_epdc_data_entry_single(soc, size) \
+#define imx_epdc_data_entry_single(soc, size) \
{ \
.iobase = soc ## _EPDC_BASE_ADDR, \
.irq = soc ## _INT_EPDC, \
@@ -31,7 +31,12 @@
#ifdef CONFIG_SOC_IMX50
const struct imx_epdc_data imx50_epdc_data __initconst =
- imx5_epdc_data_entry_single(MX50, SZ_4K);
+ imx_epdc_data_entry_single(MX50, SZ_4K);
+#endif
+
+#ifdef CONFIG_SOC_IMX6Q
+const struct imx_epdc_data imx6dl_epdc_data __initconst =
+ imx_epdc_data_entry_single(MX6DL, SZ_16K);
#endif
struct platform_device *__init imx_add_imx_epdc(