pcl052: Cosmic board init and configuration support

Signed-off-by: Chris Conley <cconley@phytec.com>
Signed-off-by: Russell Robinson <rrobinson@phytec.com>

7 files changed, 19 insertions, 5 deletions

diff --git a/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c b/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c
index 5d7605421294..3dfebf4aba6f 100644
--- a/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c
+++ b/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c
@@ -50,7 +50,7 @@ const struct imx_fsl_usb2_udc_data imx6q_fsl_usb2_udc_data __initconst =
 #endif /* ifdef CONFIG_SOC_IMX6Q */
 
 #ifdef CONFIG_ARCH_MVF
-#ifdef CONFIG_MACH_PCM052
+#if (defined CONFIG_MACH_PCM052 || defined CONFIG_MACH_PCL052)
 const struct imx_fsl_usb2_udc_data mvf_fsl_usb2_udc_data[] __initconst = {
        mvf_fsl_usb2_udc_data_entry_single(MVF, 0),
        mvf_fsl_usb2_udc_data_entry_single(MVF, 1),
diff --git a/arch/arm/plat-mxc/devices/platform-fsl-usb2-wakeup.c b/arch/arm/plat-mxc/devices/platform-fsl-usb2-wakeup.c
index 80c44f48393d..d66983335d00 100644
--- a/arch/arm/plat-mxc/devices/platform-fsl-usb2-wakeup.c
+++ b/arch/arm/plat-mxc/devices/platform-fsl-usb2-wakeup.c
@@ -35,7 +35,7 @@ const struct imx_fsl_usb2_wakeup_data imx6q_fsl_hs_wakeup_data[] __initconst = {
 #endif /* ifdef CONFIG_SOC_IMX6Q */
 #ifdef CONFIG_SOC_MVFA5
 const struct imx_fsl_usb2_wakeup_data mvf_fsl_otg_wakeup_data[] __initconst = {
-#ifdef CONFIG_MACH_PCM052
+#if (defined CONFIG_MACH_PCM052 || defined CONFIG_MACH_PCL052)
        mvf_fsl_usb2_wakeup_data_entry_single(MVF, 0),
        mvf_fsl_usb2_wakeup_data_entry_single(MVF, 1),
 #else
diff --git a/arch/arm/plat-mxc/devices/platform-mxc-ehci.c b/arch/arm/plat-mxc/devices/platform-mxc-ehci.c
index 928f3b792e0f..688aebb5858c 100644
--- a/arch/arm/plat-mxc/devices/platform-mxc-ehci.c
+++ b/arch/arm/plat-mxc/devices/platform-mxc-ehci.c
@@ -66,7 +66,7 @@ const struct imx_mxc_ehci_data imx6q_mxc_ehci_hs_data[] __initconst = {
 #endif /* ifdef CONFIG_SOC_IMX6Q */
 
 #ifdef CONFIG_ARCH_MVF
-#ifdef CONFIG_MACH_PCM052
+#if (defined CONFIG_MACH_PCM052 || defined CONFIG_MACH_PCL052)
 const struct imx_mxc_ehci_data mvf_mxc_ehci_otg_data[] __initconst = {
        mvf_mxc_ehci_data_entry_single(MVF, 0),
        mvf_mxc_ehci_data_entry_single(MVF, 1),
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h
index 89eb0a87f21c..6b3c12171480 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h
@@ -87,6 +87,12 @@ typedef enum iomux_config {
 		IOMUX_PAD(0x0048, 0x0048, 5, 0x0000, 0, MVF600_SDHC_PAD_CTRL)
 #define MVF600_PAD19_PTA29__SDHC1_DAT3				\
 		IOMUX_PAD(0x004C, 0x004C, 5, 0x0000, 0, MVF600_SDHC_PAD_CTRL)
+
+/*set PTB28 as GPIO for sdhc card detecting on PCL052*/
+#define MVF600_PAD98_PTB28__SDHC1_SW_CD			\
+		IOMUX_PAD(0x0188, 0x0188, 0, 0x0000, 0, \
+				MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE)
+
 /*set PTD6 as GPIO for sdhc card detecting*/
 #define MVF600_PAD85_PTD6__SDHC1_SW_CD			\
 		IOMUX_PAD(0x0154, 0x0154, 0, 0x0000, 0, \
@@ -265,6 +271,8 @@ typedef enum iomux_config {
 /*DCU0*/
 #define MVF600_PAD25_PTB3_LCD_ENABLE				\
 		IOMUX_PAD(0x64, 0x64, 0, 0x0000, 0, MVF600_DCU_PAD_CTRL)
+#define MVF600_PAD108_PTE3_LCD_ENABLE				\
+		IOMUX_PAD(0x01B0, 0x01B0, 0, 0x0000, 0, MVF600_DCU_PAD_CTRL)
 #define MVF600_PAD105_PTE0_DCU0_HSYNC				\
 		IOMUX_PAD(0x01A4, 0x01A4, 1, 0x0000, 0, MVF600_DCU_PAD_CTRL)
 #define MVF600_PAD106_PTE1_DCU0_VSYNC				\
diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h
index 4edd8d91c57d..add1b0250483 100644
--- a/arch/arm/plat-mxc/include/mach/irqs.h
+++ b/arch/arm/plat-mxc/include/mach/irqs.h
@@ -74,7 +74,7 @@
 #define MX5_IPU_IRQS 0
 #endif
 
-#ifdef CONFIG_MACH_PCM052
+#if (defined CONFIG_MACH_PCM052 || defined CONFIG_MACH_PCL052)
 #define STMPE_IRQ_BASE		(MXC_IPU_IRQ_START)
 #define STMPE_MAX_GPIOS		24
 #define STMPE_IRQ_END		(STMPE_IRQ_BASE + STMPE_MAX_GPIOS)
diff --git a/arch/arm/plat-mxc/include/mach/mvf-dcu-fb.h b/arch/arm/plat-mxc/include/mach/mvf-dcu-fb.h
index d4364f1bdd8b..1aba4dc8d73e 100644
--- a/arch/arm/plat-mxc/include/mach/mvf-dcu-fb.h
+++ b/arch/arm/plat-mxc/include/mach/mvf-dcu-fb.h
@@ -35,6 +35,12 @@ struct dfb_chroma_key {
 	__u8  blue_min;
 };
 
+#if (defined CONFIG_MACH_PCL052)
+#define DCU_LCD_ENABLE_PIN	108	
+#else
+#define DCU_LCD_ENABLE_PIN	25
+#endif
+
 #define MFB_SET_CHROMA_KEY	_IOW('M', 1, struct mfb_chroma_key)
 #define MFB_SET_BRIGHTNESS	_IOW('M', 3, __u8)
 
diff --git a/arch/arm/plat-mxc/include/mach/mvf.h b/arch/arm/plat-mxc/include/mach/mvf.h
index fb0e5eb69704..a7827137d538 100644
--- a/arch/arm/plat-mxc/include/mach/mvf.h
+++ b/arch/arm/plat-mxc/include/mach/mvf.h
@@ -555,7 +555,7 @@
 #define MVF_INT_I2C2		105
 #define MVF_INT_I2C3		106
 
-#ifdef CONFIG_MACH_PCM052
+#if (defined CONFIG_MACH_PCM052 || defined CONFIG_MACH_PCL052)
 #define MVF_INT_USB0           107
 #define MVF_INT_USB1           108
 #else