ENGR00122643: Integrate linear PMIC

Integrate linear PMIC.

Signed-off-by: Terry Lv <r65388@freescale.com>

4 files changed, 128 insertions, 2 deletions

diff --git a/board/freescale/mx51_bbg/mx51_bbg.c b/board/freescale/mx51_bbg/mx51_bbg.c
index 1d553c1..32bfde8 100644
--- a/board/freescale/mx51_bbg/mx51_bbg.c
+++ b/board/freescale/mx51_bbg/mx51_bbg.c
@@ -60,6 +60,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static u32 system_rev;
 static enum boot_device boot_dev;
+static u32 voltage_setup;
 u32	mx51_io_base_addr;
 
 static inline void setup_boot_device(void)
@@ -306,6 +307,7 @@ static void setup_expio(void)
 	writew(reg, mx51_io_base_addr + PBC_SW_RESET);
 }
 
+#ifdef CONFIG_IMX_ECSPI
 void spi_io_init(struct imx_spi_dev_t *dev)
 {
 	switch (dev->base) {
@@ -347,7 +349,9 @@ void spi_io_init(struct imx_spi_dev_t *dev)
 		break;
 	}
 }
+#endif
 
+#ifdef CONFIG_MXC_FEC
 static void setup_fec(void)
 {
 	/*FEC_MDIO*/
@@ -433,13 +437,93 @@ static void setup_fec(void)
 	writel(0x2180, IOMUXC_BASE_ADDR + 0x054C);
 	writel(0x0, IOMUXC_BASE_ADDR + 0x096C);
 }
+#endif
+
+#ifdef CONFIG_I2C_MXC
+static void setup_i2c(unsigned int module_base)
+{
+	unsigned int reg;
+
+	switch (module_base) {
+	case I2C1_BASE_ADDR:
+		reg = IOMUXC_BASE_ADDR + 0x5c; /* i2c1 SDA */
+		writel(0x14, reg);
+		reg = IOMUXC_BASE_ADDR + 0x3f0;
+		writel(0x10d, reg);
+		reg = IOMUXC_BASE_ADDR + 0x9B4;
+		writel(0x0, reg);
+
+		reg = IOMUXC_BASE_ADDR + 0x68; /* i2c2 SCL */
+		writel(0x14, reg);
+		reg = IOMUXC_BASE_ADDR + 0x3fc;
+		writel(0x10d, reg);
+		reg = IOMUXC_BASE_ADDR + 0x9B0;
+		writel(0x0, reg);
+		break;
+	case I2C2_BASE_ADDR:
+		/* dummy here*/
+		break;
+	default:
+		printf("Invalid I2C base: 0x%x\n", module_base);
+		break;
+	}
+}
+
+static void setup_core_voltage_i2c(void)
+{
+	unsigned int reg;
+	unsigned char buf[1] = { 0 };
+
+	puts("PMIC Mode: linear\n");
+
+	writel(0x0, CCM_BASE_ADDR + CLKCTL_CACRR);
+	reg = readl(GPIO2_BASE_ADDR + 0x0);
+	reg &= ~0x4000;  /* Lower reset line */
+	writel(reg, GPIO2_BASE_ADDR + 0x0);
+
+	reg = readl(GPIO2_BASE_ADDR + 0x4);
+	reg |= 0x4000;  /* configure GPIO lines as output */
+	writel(reg, GPIO2_BASE_ADDR + 0x4);
+
+	/* Reset the ethernet controller over GPIO */
+	writel(0x1, IOMUXC_BASE_ADDR + 0x0AC);
+
+	/*Configure LDO4*/
+	i2c_read(0x34, 0x12, 1, buf, 1);
+	buf[0] = buf[0] | 0x40;
+	if (i2c_write(0x34, 0x12, 1, buf, 1)) {
+		puts("write to PMIC 0x12 failed!\n");
+		return;
+	}
+	i2c_read(0x34, 0x12, 1, buf, 1);
+	printf("PMIC 0x12: 0x%x \n", buf[0]);
+
+	i2c_read(0x34, 0x10, 1, buf, 1);
+	buf[0] = buf[0] | 0x40;
+	if (i2c_write(0x34, 0x10, 1, buf, 1)) {
+		puts("write to PMIC 0x10 failed!\n");
+		return;
+	}
+	i2c_read(0x34, 0x10, 1, buf, 1);
+	printf("PMIC 0x10: 0x%x \n", buf[0]);
+
+	udelay(500);
+
+	reg = readl(GPIO2_BASE_ADDR + 0x0);
+	reg |= 0x4000;
+	writel(reg, GPIO2_BASE_ADDR + 0x0);
+}
+#endif
 
-static void power_init(void)
+#ifdef CONFIG_IMX_ECSPI
+static void setup_core_voltage_spi(void)
 {
 	struct spi_slave *slave;
 	unsigned int val;
 	unsigned int reg;
 
+	puts("PMIC Mode: SPI\n");
+
 #define REV_ATLAS_LITE_1_0         0x8
 #define REV_ATLAS_LITE_1_1         0x9
 #define REV_ATLAS_LITE_2_0         0x10
@@ -554,6 +638,7 @@ static void power_init(void)
 
 	spi_pmic_free(slave);
 }
+#endif
 
 #ifdef CONFIG_NET_MULTI
 
@@ -719,7 +804,13 @@ int board_init(void)
 	setup_uart();
 	setup_nfc();
 	setup_expio();
+#ifdef CONFIG_MXC_FEC
 	setup_fec();
+#endif
+#ifdef CONFIG_I2C_MXC
+	setup_i2c(I2C1_BASE_ADDR);
+#endif
+
 	return 0;
 }
 
@@ -916,7 +1007,15 @@ inline int check_recovery_cmd_file(void)
 
 int board_late_init(void)
 {
-	power_init();
+#ifdef CONFIG_I2C_MXC
+	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	if (!i2c_probe(0x34))
+		setup_core_voltage_i2c();
+	else
+#endif
+#ifdef CONFIG_IMX_ECSPI
+		setup_core_voltage_spi();
+#endif
 
 #if defined(CONFIG_FSL_ANDROID) && defined(CONFIG_MXC_KPD)
 	if (waiting_for_func_key_pressing())
diff --git a/include/configs/mx51_bbg.h b/include/configs/mx51_bbg.h
index 121c7a1..117e506 100644
--- a/include/configs/mx51_bbg.h
+++ b/include/configs/mx51_bbg.h
@@ -95,6 +95,7 @@
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_FUSE
+#define CONFIG_CMD_I2C
 
 /*
  * FUSE Configs
@@ -129,6 +130,18 @@
 	#define CONFIG_DOS_PARTITION	1
 	#define CONFIG_CMD_FAT		1
 #endif
+
+/*
+ * I2C Configs
+ */
+#ifdef CONFIG_CMD_I2C
+	#define CONFIG_HARD_I2C         1
+	#define CONFIG_I2C_MXC          1
+	#define CONFIG_SYS_I2C_PORT             I2C1_BASE_ADDR
+	#define CONFIG_SYS_I2C_SPEED            400000
+	#define CONFIG_SYS_I2C_SLAVE            0xfe
+#endif
+
 /*
  * Eth Configs
  */
diff --git a/include/configs/mx51_bbg_android.h b/include/configs/mx51_bbg_android.h
index a0bb39e..5f7435d 100644
--- a/include/configs/mx51_bbg_android.h
+++ b/include/configs/mx51_bbg_android.h
@@ -81,6 +81,7 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NET
 #define CONFIG_NET_RETRY_COUNT	100
+#define CONFIG_CMD_I2C
 
 /*
  * Android support Configs
@@ -256,6 +257,16 @@
 	#define CONFIG_CMD_FAT		1
 	#define CONFIG_CMD_EXT2		1
 #endif
+
+/*
+ * I2C Configs
+ */
+#define CONFIG_HARD_I2C         1
+#define CONFIG_I2C_MXC          1
+#define CONFIG_SYS_I2C_PORT             I2C1_BASE_ADDR
+#define CONFIG_SYS_I2C_SPEED            400000
+#define CONFIG_SYS_I2C_SLAVE            0xfe
+
 /*-----------------------------------------------------------------------
  * Stack sizes
  *
diff --git a/include/configs/mx51_bbg_mfg.h b/include/configs/mx51_bbg_mfg.h
index 4d35de2..becad73 100644
--- a/include/configs/mx51_bbg_mfg.h
+++ b/include/configs/mx51_bbg_mfg.h
@@ -47,6 +47,7 @@
 #define CONFIG_DISPLAY_BOARDINFO
 
 #define BOARD_LATE_INIT
+
 /*
  * Disabled for now due to build problems under Debian and a significant
  * increase in the final file size: 144260 vs. 109536 Bytes.
@@ -207,6 +208,8 @@
 /* TO1 boards */
 /* #define PHYS_SDRAM_1_SIZE	(128 * 1024 * 1024) */
 #define PHYS_SDRAM_1_SIZE	(512 * 1024 * 1024)
+#define iomem_valid_addr(addr, size) \
+	(addr >= PHYS_SDRAM_1 && addr <= (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE))
 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization