ENGR00315894-34 imx6:dlsabresd/slevk Fix build break when enables EPDC

-Use the new pins' name for imx6dl.
-Change the read/write to registers by using register structure.

Signed-off-by: Ye.Li <B37916@freescale.com>

1 files changed, 14 insertions, 11 deletions

diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index e98170b..6a6c405 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -9,6 +9,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
@@ -470,6 +471,7 @@ static void epdc_disable_pins(void)
 static void setup_epdc(void)
 {
 	unsigned int reg;
+	struct mxc_ccm_reg *ccm_regs = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
 
 	/*** epdc Maxim PMIC settings ***/
 
@@ -492,31 +494,31 @@ static void setup_epdc(void)
 	/*** Set pixel clock rates for EPDC ***/
 
 	/* EPDC AXI clk from PFD_400M, set to 396/2 = 198MHz */
-	reg = readl(CCM_BASE_ADDR + CLKCTL_CHSCCDR);
+	reg = readl(&ccm_regs->chsccdr);
 	reg &= ~0x3F000;
 	reg |= (0x4 << 15) | (1 << 12);
-	writel(reg, CCM_BASE_ADDR + CLKCTL_CHSCCDR);
+	writel(reg, &ccm_regs->chsccdr);
 
 	/* EPDC AXI clk enable */
-	reg = readl(CCM_BASE_ADDR + CLKCTL_CCGR3);
+	reg = readl(&ccm_regs->CCGR3);
 	reg |= 0x0030;
-	writel(reg, CCM_BASE_ADDR + CLKCTL_CCGR3);
+	writel(reg, &ccm_regs->CCGR3);
 
 	/* EPDC PIX clk from PFD_540M, set to 540/4/5 = 27MHz */
-	reg = readl(CCM_BASE_ADDR + CLKCTL_CSCDR2);
+	reg = readl(&ccm_regs->cscdr2);
 	reg &= ~0x03F000;
 	reg |= (0x5 << 15) | (4 << 12);
-	writel(reg, CCM_BASE_ADDR + CLKCTL_CSCDR2);
+	writel(reg, &ccm_regs->cscdr2);
 
-	reg = readl(CCM_BASE_ADDR + CLKCTL_CBCMR);
+	reg = readl(&ccm_regs->cbcmr);
 	reg &= ~0x03800000;
 	reg |= (0x3 << 23);
-	writel(reg, CCM_BASE_ADDR + CLKCTL_CBCMR);
+	writel(reg, &ccm_regs->cbcmr);
 
 	/* EPDC PIX clk enable */
-	reg = readl(CCM_BASE_ADDR + CLKCTL_CCGR3);
+	reg = readl(&ccm_regs->CCGR3);
 	reg |= 0x0C00;
-	writel(reg, CCM_BASE_ADDR + CLKCTL_CCGR3);
+	writel(reg, &ccm_regs->CCGR3);
 
 	panel_info.epdc_data.working_buf_addr = CONFIG_WORKING_BUF_ADDR;
 	panel_info.epdc_data.waveform_buf_addr = CONFIG_WAVEFORM_BUF_ADDR;
@@ -539,6 +541,7 @@ static void setup_epdc(void)
 void epdc_power_on(void)
 {
 	unsigned int reg;
+	struct gpio_regs *gpio_regs = (struct gpio_regs *)GPIO2_BASE_ADDR;
 
 	/* Set EPD_PWR_CTL0 to high - enable EINK_VDD (3.15) */
 	gpio_set_value(IMX_GPIO_NR(2, 7), 1);
@@ -552,7 +555,7 @@ void epdc_power_on(void)
 
 	/* Wait for PWRGOOD == 1 */
 	while (1) {
-		reg = readl(GPIO2_BASE_ADDR + GPIO_PSR);
+		reg = readl(&gpio_regs->gpio_psr);
 		if (!(reg & (1 << 13)))
 			break;