]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
board: transformer-t30: convert ASUS Transformers to use DM PMIC
authorSvyatoslav Ryhel <clamor95@gmail.com>
Sat, 26 Aug 2023 15:39:29 +0000 (18:39 +0300)
committerSvyatoslav Ryhel <clamor95@gmail.com>
Tue, 28 Nov 2023 07:16:26 +0000 (09:16 +0200)
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>
arch/arm/dts/tegra30-asus-p1801-t.dts
arch/arm/dts/tegra30-asus-tf600t.dts
arch/arm/dts/tegra30-asus-transformer.dtsi
board/asus/transformer-t30/Kconfig
board/asus/transformer-t30/configs/tf600t.config
board/asus/transformer-t30/transformer-t30-spl.c
board/asus/transformer-t30/transformer-t30.c
configs/transformer_t30_defconfig

index 39f7caf8d0b0a6d1b83097ad99a376865bd995e3..d62d43268b84604b90234b95944c2ae2b30d5e41 100644 (file)
                                        regulator-name = "vdd_emmc_core";
                                        regulator-min-microvolt = <3300000>;
                                        regulator-max-microvolt = <3300000>;
+                                       regulator-boot-on;
                                };
 
                                /* uSD slot VDD */
                                        regulator-name = "vdd_usd";
                                        regulator-min-microvolt = <3100000>;
                                        regulator-max-microvolt = <3100000>;
+                                       regulator-boot-on;
                                };
 
                                /* uSD slot VDDIO */
index fd9d11ca19c968eda48cc2575bb6df0f1c27c982..efc6a83b9dfe0dffa571c809e0d14fe941f02076 100644 (file)
                                        regulator-name = "vdd_1v2_backlight";
                                        regulator-min-microvolt = <1200000>;
                                        regulator-max-microvolt = <1200000>;
+                                       regulator-boot-on;
                                };
 
                                vcore_lcd: vdd2 {
                                        regulator-name = "vcore_lcd";
                                        regulator-min-microvolt = <1500000>;
                                        regulator-max-microvolt = <1500000>;
+                                       regulator-boot-on;
                                };
 
                                vdd_1v8_vio: vddio {
                                        regulator-name = "vdd_emmc_core";
                                        regulator-min-microvolt = <3300000>;
                                        regulator-max-microvolt = <3300000>;
+                                       regulator-boot-on;
                                };
 
                                /* uSD slot VDDIO */
                                        regulator-name = "avdd_dsi_csi";
                                        regulator-min-microvolt = <1200000>;
                                        regulator-max-microvolt = <1200000>;
+                                       regulator-boot-on;
                                };
                        };
                };
index 888f9ca74e6b9057c1ab61afbc258cfdb548e33f..afddb83983a990686b1cca127c7b500564472097 100644 (file)
@@ -82,6 +82,7 @@
                                        regulator-name = "vdd_emmc_core";
                                        regulator-min-microvolt = <3300000>;
                                        regulator-max-microvolt = <3300000>;
+                                       regulator-boot-on;
                                };
 
                                /* uSD slot VDD */
@@ -89,6 +90,7 @@
                                        regulator-name = "vdd_usd";
                                        regulator-min-microvolt = <3100000>;
                                        regulator-max-microvolt = <3100000>;
+                                       regulator-boot-on;
                                };
 
                                /* uSD slot VDDIO */
index accc999c435c97de616c97881e1320838f4c02a6..915436ba6c5659708b017674b10fd838e65a1ea8 100644 (file)
@@ -9,14 +9,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "transformer-t30"
 
-config TRANSFORMER_SPI_BOOT
-       bool "Enable support for SPI based flash"
-       select TEGRA20_SLINK
-       select DM_SPI_FLASH
-       select SPI_FLASH_WINBOND
-       help
-         Tegra 3 based Transformers with Windows RT have core
-         boot sequence (BCT and EBT) on separate SPI FLASH
-         memory with 4MB size.
-
 endif
index 18ab4fbd878c381cab89090ed6e505aff8f171ea..e40d0fdd47953e868060b3956e274e9f1772b65a 100644 (file)
@@ -1,4 +1,4 @@
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf600t"
-CONFIG_TRANSFORMER_SPI_BOOT=y
 CONFIG_BOOTCOMMAND="setenv gpio_button 222; if run check_button; then poweroff; fi; setenv gpio_button 132; if run check_button; then echo Starting SPI flash update ...; run update_spi; fi; run bootcmd_usb0; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;"
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_USB_GADGET_PRODUCT_NUM=0x4d00
index 89819b2b921049522a991ca936dcc4777a343377..952e2c822410de9098bcba60849fcc25b979cefa 100644 (file)
@@ -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>
 
index ba795a802eb1d8b9a2d52141dc8ba5f38921d3ef..7cac6fde6f494064e14b98a8cdd9ccc88ea2fb76 100644 (file)
@@ -9,70 +9,12 @@
 
 /* T30 Transformers derive from Cardhu board */
 
-#include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
-#include <i2c.h>
-#include <log.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/gp_padctrl.h>
-#include <asm/arch/gpio.h>
-#include <asm/gpio.h>
-#include <linux/delay.h>
-#include "pinmux-config-transformer.h"
-
-#define TPS65911_I2C_ADDRESS           0x2D
-
-#define TPS65911_VDD1                  0x21
-#define TPS65911_VDD1_OP               0x22
-#define TPS65911_LDO1                  0x30
-#define TPS65911_LDO2                  0x31
-#define TPS65911_LDO3                  0x37
-#define TPS65911_LDO5                  0x32
-#define TPS65911_LDO6                  0x35
-
-#define TPS65911_DEVCTRL               0x3F
-#define   DEVCTRL_PWR_OFF_MASK         BIT(7)
-#define   DEVCTRL_DEV_ON_MASK          BIT(2)
-#define   DEVCTRL_DEV_OFF_MASK         BIT(0)
-
-#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, TPS65911_I2C_ADDRESS, 1, &dev);
-       if (ret) {
-               log_debug("cannot find PMIC I2C chip\n");
-               return 0;
-       }
-
-       ret = dm_i2c_read(dev, TPS65911_DEVCTRL, data_buffer, 1);
-       if (ret)
-               return ret;
 
-       data_buffer[0] |= DEVCTRL_PWR_OFF_MASK;
-
-       ret = dm_i2c_write(dev, TPS65911_DEVCTRL, data_buffer, 1);
-       if (ret)
-               return ret;
-
-       data_buffer[0] |= DEVCTRL_DEV_OFF_MASK;
-       data_buffer[0] &= ~DEVCTRL_DEV_ON_MASK;
-
-       ret = dm_i2c_write(dev, TPS65911_DEVCTRL, 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-transformer.h"
 
 /*
  * Routine: pinmux_init
@@ -92,66 +34,6 @@ void pinmux_init(void)
        }
 }
 
-#ifdef CONFIG_MMC_SDHCI_TEGRA
-static void tps65911_voltage_init(void)
-{
-       struct udevice *dev;
-       int ret;
-
-       ret = i2c_get_chip_for_busnum(0, TPS65911_I2C_ADDRESS, 1, &dev);
-       if (ret) {
-               log_debug("cannot find PMIC I2C chip\n");
-               return;
-       }
-
-       /* TPS659110: LDO1_REG = 3.3v, ACTIVE to SDMMC4 */
-       ret = dm_i2c_reg_write(dev, TPS65911_LDO1, 0xc9);
-       if (ret)
-               log_debug("vcore_emmc set failed: %d\n", ret);
-
-       if (of_machine_is_compatible("asus,tf600t")) {
-               /* TPS659110: VDD1_REG = 1.2v, ACTIVE to backlight */
-               ret = dm_i2c_reg_write(dev, TPS65911_VDD1_OP, 0x33);
-               if (ret)
-                       log_debug("vdd_bl set failed: %d\n", ret);
-
-               ret = dm_i2c_reg_write(dev, TPS65911_VDD1, 0x0d);
-               if (ret)
-                       log_debug("vdd_bl enable failed: %d\n", ret);
-
-               /* TPS659110: LDO5_REG = 3.3v, ACTIVE to SDMMC1 VIO */
-               ret = dm_i2c_reg_write(dev, TPS65911_LDO5, 0x65);
-               if (ret)
-                       log_debug("vdd_usd set failed: %d\n", ret);
-
-               /* TPS659110: LDO6_REG = 1.2v, ACTIVE to MIPI */
-               ret = dm_i2c_reg_write(dev, TPS65911_LDO6, 0x11);
-               if (ret)
-                       log_debug("vdd_mipi set failed: %d\n", ret);
-       } else {
-               /* TPS659110: LDO2_REG = 3.1v, ACTIVE to SDMMC1 */
-               ret = dm_i2c_reg_write(dev, TPS65911_LDO2, 0xb9);
-               if (ret)
-                       log_debug("vdd_usd set failed: %d\n", ret);
-
-               /* TPS659110: LDO3_REG = 3.1v, ACTIVE to SDMMC1 VIO */
-               ret = dm_i2c_reg_write(dev, TPS65911_LDO3, 0x5d);
-               if (ret)
-                       log_debug("vddio_usd 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 */
-       tps65911_voltage_init();
-}
-#endif /* MMC */
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
index 092c0aa2b01f747c01409f25319a0ab9282a8a78..8d828c1fa6cc0995f8a595d4c6438643ba86a53a 100644 (file)
@@ -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
@@ -65,10 +66,14 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_GPIO=y
 CONFIG_BUTTON_KEYBOARD=y
 CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_TPS65910=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_TPS65911=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
+CONFIG_TEGRA20_SLINK=y
+CONFIG_SYSRESET_TPS65910=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_TEGRA=y