board: lg-x3: convert LG Optimus 4X and Vu to use DM PMIC

Since required drivers were merged, we can safely clean up the
board and switch to DM based driver with device tree support.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/arch/arm/dts/tegra30-lg-x3.dtsi b/arch/arm/dts/tegra30-lg-x3.dtsi
index 6e52fc5a53eeb54f91191aadd7a3ce183e60e264..aa207a70c7ee4b5cf5641448c5f02dc875655d88 100644 (file)
--- a/arch/arm/dts/tegra30-lg-x3.dtsi
+++ b/arch/arm/dts/tegra30-lg-x3.dtsi
@@ -110,6 +110,7 @@
                                        regulator-name = "vdd_ddr_rx";
                                        regulator-min-microvolt = <2850000>;
                                        regulator-max-microvolt = <2850000>;
+                                       regulator-boot-on;
                                };
                        };
                };

diff --git a/board/lg/x3-t30/x3-t30-spl.c b/board/lg/x3-t30/x3-t30-spl.c
index 864f2de45f1fa5b2fc0b8ba7a978fc2069723a16..00f79dd1db417c5eec6e9c794dc9a179800357ad 100644 (file)
--- a/board/lg/x3-t30/x3-t30-spl.c
+++ b/board/lg/x3-t30/x3-t30-spl.c
@@ -9,7 +9,7 @@
  *  Svyatoslav Ryhel <clamor95@gmail.com>
  */
 
-#include <common.h>
+#include <asm/arch/tegra.h>
 #include <asm/arch-tegra/tegra_i2c.h>
 #include <linux/delay.h>
 

diff --git a/board/lg/x3-t30/x3-t30.c b/board/lg/x3-t30/x3-t30.c
index a08e00dd87cb356f3939ea92ccae7e4da0467caf..6b9169be6a13ee2b9c3c48e3e83b458014655dee 100644 (file)
--- a/board/lg/x3-t30/x3-t30.c
+++ b/board/lg/x3-t30/x3-t30.c
@@ -7,60 +7,13 @@
  *  Svyatoslav Ryhel <clamor95@gmail.com>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
-#include <i2c.h>
-#include <log.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/clock.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/tegra.h>
 #include <asm/arch-tegra/fuse.h>
-#include <asm/gpio.h>
-#include <linux/delay.h>
-#include "pinmux-config-x3.h"
-
-#define MAX77663_I2C_ADDR              0x1C
-
-#define MAX77663_REG_SD2               0x18
-#define MAX77663_REG_LDO2              0x27
-#define MAX77663_REG_LDO3              0x29
-#define MAX77663_REG_LDO5              0x2D
-#define MAX77663_REG_ONOFF_CFG1                0x41
-#define   ONOFF_PWR_OFF                        BIT(1)
-
-#ifdef CONFIG_CMD_POWEROFF
-int do_poweroff(struct cmd_tbl *cmdtp, int flag,
-               int argc, char *const argv[])
-{
-       struct udevice *dev;
-       uchar data_buffer[1];
-       int ret;
-
-       ret = i2c_get_chip_for_busnum(0, MAX77663_I2C_ADDR, 1, &dev);
-       if (ret) {
-               log_debug("cannot find PMIC I2C chip\n");
-               return 0;
-       }
-
-       ret = dm_i2c_read(dev, MAX77663_REG_ONOFF_CFG1, data_buffer, 1);
-       if (ret)
-               return ret;
 
-       data_buffer[0] |= ONOFF_PWR_OFF;
-
-       ret = dm_i2c_write(dev, MAX77663_REG_ONOFF_CFG1, data_buffer, 1);
-       if (ret)
-               return ret;
-
-       /* wait some time and then print error */
-       mdelay(5000);
-
-       printf("Failed to power off!!!\n");
-       return 1;
-}
-#endif
+#include "pinmux-config-x3.h"
 
 /*
  * Routine: pinmux_init
@@ -82,50 +35,6 @@ void pinmux_init(void)
 #endif
 }
 
-#ifdef CONFIG_MMC_SDHCI_TEGRA
-static void max77663_voltage_init(void)
-{
-       struct udevice *dev;
-       int ret;
-
-       ret = i2c_get_chip_for_busnum(0, MAX77663_I2C_ADDR, 1, &dev);
-       if (ret) {
-               log_debug("cannot find PMIC I2C chip\n");
-               return;
-       }
-
-       /* 0x60 for 1.8v, bit7:0 = voltage */
-       ret = dm_i2c_reg_write(dev, MAX77663_REG_SD2, 0x60);
-       if (ret)
-               log_debug("vdd_1v8_vio set failed: %d\n", ret);
-
-       /* 0xF2 for 3.30v, enabled: bit7:6 = 11 = enable, bit5:0 = voltage */
-       ret = dm_i2c_reg_write(dev, MAX77663_REG_LDO2, 0xF2);
-       if (ret)
-               log_debug("avdd_usb set failed: %d\n", ret);
-
-       /* 0xEC for 3.00v, enabled: bit7:6 = 11 = enable, bit5:0 = voltage */
-       ret = dm_i2c_reg_write(dev, MAX77663_REG_LDO3, 0xEC);
-       if (ret)
-               log_debug("vdd_usd set failed: %d\n", ret);
-
-       /* 0xE9 for 2.85v, enabled: bit7:6 = 11 = enable, bit5:0 = voltage */
-       ret = dm_i2c_reg_write(dev, MAX77663_REG_LDO5, 0xE9);
-       if (ret)
-               log_debug("vcore_emmc set failed: %d\n", ret);
-}
-
-/*
- * Routine: pin_mux_mmc
- * Description: setup the MMC muxes, power rails, etc.
- */
-void pin_mux_mmc(void)
-{
-       /* Bring up uSD and eMMC power */
-       max77663_voltage_init();
-}
-#endif /* MMC */
-
 int nvidia_board_init(void)
 {
        /* Set up panel bridge clocks */

diff --git a/configs/x3_t30_defconfig b/configs/x3_t30_defconfig
index a151f58524026c3ea8cca163d06ebae4c5ced075..90cbc2078a32d4f92cd402b3bfa92944b28475d2 100644 (file)
--- a/configs/x3_t30_defconfig
+++ b/configs/x3_t30_defconfig
@@ -45,6 +45,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_UMS_ABORT_KEYED=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PAUSE=y
+CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
@@ -64,11 +65,14 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_BUTTON_KEYBOARD=y
 CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_MAX77663=y
 CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_MAX77663=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
+CONFIG_SYSRESET_MAX77663=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_TEGRA=y