Merge branch '2019-11-07-ti-imports'
authorTom Rini <trini@konsulko.com>
Fri, 8 Nov 2019 12:26:51 +0000 (07:26 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 8 Nov 2019 12:26:51 +0000 (07:26 -0500)
- LogicPD platform fixes
- Adaptive Voltage Scaling (AVS) support
- Minor bugfixes

27 files changed:
arch/arm/dts/k3-am654-r5-base-board.dts
arch/arm/dts/k3-j721e-mcu-wakeup.dtsi
arch/arm/dts/k3-j721e-r5-common-proc-board.dts
arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi
arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
arch/arm/mach-k3/am6_init.c
arch/arm/mach-k3/j721e_init.c
board/logicpd/omap3som/omap3logic.c
board/ti/common/Kconfig
configs/am65x_evm_r5_defconfig
configs/j721e_evm_r5_defconfig
configs/omap35_logic_defconfig
configs/omap3_logic_defconfig
configs/omap3_logic_somlv_defconfig
drivers/clk/clk-ti-sci.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/misc/k3_avs.c [new file with mode: 0644]
drivers/power/pmic/Kconfig
drivers/power/pmic/Makefile
drivers/power/pmic/tps65941.c [new file with mode: 0644]
drivers/power/regulator/Kconfig
drivers/power/regulator/Makefile
drivers/power/regulator/tps62360_regulator.c [new file with mode: 0644]
drivers/power/regulator/tps65941_regulator.c [new file with mode: 0644]
include/k3-avs.h [new file with mode: 0644]
include/power/tps65941.h [new file with mode: 0644]

index 174d2023060d36f9877e8333ed67b144ad77e8b1..5c110ef9ddea1aa85e932d6ae05f5c60d8112b7e 100644 (file)
                u-boot,dm-spl;
        };
 
+       wkup_vtm0: wkup_vtm@42050000 {
+               compatible = "ti,am654-vtm", "ti,am654-avs";
+               reg = <0x42050000 0x25c>;
+               power-domains = <&k3_pds 80>;
+               #thermal-sensor-cells = <1>;
+       };
+
        clk_200mhz: dummy_clock {
                compatible = "fixed-clock";
                #clock-cells = <0>;
        power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
 };
 
+&wkup_vtm0 {
+       vdd-supply-3 = <&vdd_mpu>;
+       vdd-supply-4 = <&vdd_mpu>;
+       u-boot,dm-spl;
+};
+
 &wkup_pmx0 {
        u-boot,dm-spl;
        wkup_uart0_pins_default: wkup_uart0_pins_default {
        pinctrl-names = "default";
        pinctrl-0 = <&wkup_i2c0_pins_default>;
        clock-frequency = <400000>;
+       u-boot,dm-spl;
+
+       vdd_mpu: tps62363@60 {
+               compatible = "ti,tps62363";
+               reg = <0x60>;
+               regulator-name = "VDD_MPU";
+               regulator-min-microvolt = <500000>;
+               regulator-max-microvolt = <1770000>;
+               regulator-always-on;
+               regulator-boot-on;
+               ti,vsel0-state-high;
+               ti,vsel1-state-high;
+               u-boot,dm-spl;
+       };
 };
index 92beeea34dbaf399f99a4c35086b85c282003850..5dd07ac4daf7380ba8897332506d47bc1f30cb06 100644 (file)
                clock-names = "fclk";
        };
 
+       wkup_i2c0: i2c@42120000 {
+               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+               reg = <0x0 0x42120000 0x0 0x100>;
+               interrupts = <GIC_SPI 896 IRQ_TYPE_LEVEL_HIGH>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               clock-names = "fck";
+               clocks = <&k3_clks 197 0>;
+               power-domains = <&k3_pds 197 TI_SCI_PD_EXCLUSIVE>;
+       };
+
        mcu_uart0: serial@40a00000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x40a00000 0x00 0x100>;
index 54d7998d27a00ed5162041ccee0f1ed04ca41b08..41af48214f6fc72ba1f9a3ab170efb70f4ec3f51 100644 (file)
                mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>;
                mbox-names = "tx", "rx";
        };
+
+       wkup_vtm0: wkup_vtm@42040000 {
+               compatible = "ti,am654-vtm", "ti,j721e-avs";
+               reg = <0x0 0x42040000 0x0 0x330>;
+               power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>;
+               #thermal-sensor-cells = <1>;
+       };
 };
 
 &dmsc {
                        J721E_WKUP_IOPAD(0xe0, PIN_OUTPUT, 0) /* (G29) WKUP_GPIO0_12.MCU_UART0_TXD */
                >;
        };
+
+       wkup_i2c0_pins_default: wkup-i2c0-pins-default {
+               pinctrl-single,pins = <
+                       J721E_WKUP_IOPAD(0xf8, PIN_INPUT_PULLUP, 0) /* (J25) WKUP_I2C0_SCL */
+                       J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */
+               >;
+       };
 };
 
 &main_pmx0 {
        ti,driver-strength-ohm = <50>;
 };
 
+&wkup_i2c0 {
+       u-boot,dm-spl;
+       tps659413a: tps659413a@48 {
+               reg = <0x48>;
+               compatible = "ti,tps659413";
+               u-boot,dm-spl;
+               pinctrl-names = "default";
+               pinctrl-0 = <&wkup_i2c0_pins_default>;
+               clock-frequency = <400000>;
+
+               regulators: regulators {
+                       u-boot,dm-spl;
+                       buck12_reg: buck12 {
+                               /*VDD_MPU*/
+                               regulator-name = "buck12";
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1250000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                               u-boot,dm-spl;
+                       };
+               };
+       };
+};
+
+&wkup_vtm0 {
+       vdd-supply-2 = <&buck12_reg>;
+       u-boot,dm-spl;
+};
+
 #include "k3-j721e-common-proc-board-u-boot.dtsi"
index 1abd9a38870333f4f3665785bf68aae0b785cee6..e5d9e4f1b1d7b4d56a20afc7dfc7155d224d9aa6 100644 (file)
        };
 };
 
+&gpio1 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio2 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio3 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio5 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio6 {
+       /delete-property/ u-boot,dm-spl;
+};
+
 &i2c1 {
        clock-frequency = <400000>;
 };
index 976330f89716a740c82474a8dfed0159434bc440..76f74326ae888e729320e181534b3b1222336d4d 100644 (file)
        clock-frequency = <400000>;
 };
 
+&gpio1 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio2 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio3 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio5 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio6 {
+       /delete-property/ u-boot,dm-spl;
+};
+
 /delete-node/ &uart2;
 /delete-node/ &uart3;
 /delete-node/ &mmc2;
index 0b564f7bd16647134a9e84be1044c9fa2e887b1f..99edcd9a247640e84e40ad0a621026e221bba5bb 100644 (file)
@@ -116,6 +116,13 @@ void board_init_f(ulong dummy)
        /* Perform EEPROM-based board detection */
        do_board_detect();
 
+#if defined(CONFIG_CPU_V7R) && defined(CONFIG_K3_AVS0)
+       ret = uclass_get_device_by_driver(UCLASS_MISC, DM_GET_DRIVER(k3_avs),
+                                         &dev);
+       if (ret)
+               printf("AVS init failed: %d\n", ret);
+#endif
+
 #ifdef CONFIG_K3_AM654_DDRSS
        ret = uclass_get_device(UCLASS_RAM, 0, &dev);
        if (ret)
index 5e3813252baed24f5a6553e5444edee4860c53b2..d0bf86abeb222c078aacb075f2eeebc87da3b797 100644 (file)
@@ -118,6 +118,13 @@ void board_init_f(ulong dummy)
        preloader_console_init();
 #endif
 
+#if defined(CONFIG_CPU_V7R) && defined(CONFIG_K3_AVS0)
+       ret = uclass_get_device_by_driver(UCLASS_MISC, DM_GET_DRIVER(k3_avs),
+                                         &dev);
+       if (ret)
+               printf("AVS init failed: %d\n", ret);
+#endif
+
 #if defined(CONFIG_K3_J721E_DDRSS)
        ret = uclass_get_device(UCLASS_RAM, 0, &dev);
        if (ret)
index ee77ce077c1ae319067fc94877ca1efe186163c8..43f049e592feb63be08eaa978e96862d6d9fdbe6 100644 (file)
@@ -141,6 +141,7 @@ void spl_board_prepare_for_linux(void)
 int misc_init_r(void)
 {
        twl4030_power_init();
+       twl4030_power_mmc_init(0);
        omap_die_id_display();
        return 0;
 }
index b1956b810035ab5e1ff64427942353453fcb0d05..9ead7ca03811db3216e934614a4fdece031f7af5 100644 (file)
@@ -8,11 +8,13 @@ config EEPROM_BUS_ADDRESS
        int "Board EEPROM's I2C bus address"
        range 0 8
        default 0
+       depends on TI_I2C_BOARD_DETECT
 
 config EEPROM_CHIP_ADDRESS
        hex "Board EEPROM's I2C chip address"
        range 0 0xff
        default 0x50
+       depends on TI_I2C_BOARD_DETECT
 
 config TI_COMMON_CMD_OPTIONS
        bool "Enable cmd options on TI platforms"
index d0619e9b7a45e0cfefec64cb3edd2bd78cbabac9..4f122808de00e7d1bb9b192020c6561d5dc98f39 100644 (file)
@@ -84,6 +84,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_SPL_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_SPL_DM_REGULATOR_GPIO=y
+CONFIG_DM_REGULATOR_TPS62360=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_K3_SYSTEM_CONTROLLER=y
@@ -98,3 +99,4 @@ CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_FS_FAT_MAX_CLUSTSIZE=16384
+CONFIG_K3_AVS0=y
index 30df739003c66255a1e69271d68504a7b76a357f..e5cda6800c16136dfb961c27389229fdcbe5bec3 100644 (file)
@@ -45,8 +45,6 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-common-proc-board"
-CONFIG_SPL_MULTI_DTB_FIT=y
-CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
@@ -59,10 +57,14 @@ CONFIG_CLK_TI_SCI=y
 CONFIG_TI_SCI_PROTOCOL=y
 CONFIG_DM_GPIO=y
 CONFIG_DA8XX_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_I2C_OMAP24XX=y
 CONFIG_DM_MAILBOX=y
 CONFIG_K3_SEC_PROXY=y
 CONFIG_MISC=y
 CONFIG_FS_LOADER=y
+CONFIG_K3_AVS0=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_AM654=y
@@ -75,6 +77,11 @@ CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_TI_SCI_POWER_DOMAIN=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_TPS65941=y
+CONFIG_DM_REGULATOR=y
+CONFIG_SPL_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_TPS65941=y
 CONFIG_K3_SYSTEM_CONTROLLER=y
 CONFIG_REMOTEPROC_TI_K3_ARM64=y
 CONFIG_DM_RESET=y
index 78fcbaaca25d983942d44ff21d48f162b8a3b946..3c9acd7e41973f471515cd99e758c11cbc8911a0 100644 (file)
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SYS_TEXT_BASE=0x80100000
 CONFIG_TI_COMMON_CMD_OPTIONS=y
+# CONFIG_SPL_GPIO_SUPPORT is not set
 CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_OMAP3_LOGIC=y
 # CONFIG_SPL_OMAP3_ID_NAND is not set
index 81b57a8f7a0b1aa8032e9b62c1f9669717c91304..51547e71496fe99da6301cb4cb35fd9fd1442b16 100644 (file)
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SYS_TEXT_BASE=0x80100000
 CONFIG_TI_COMMON_CMD_OPTIONS=y
+# CONFIG_SPL_GPIO_SUPPORT is not set
 CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_OMAP3_LOGIC=y
 # CONFIG_SPL_OMAP3_ID_NAND is not set
index 656a2d5cb1f9e86ec1594f55603ca80d74997ce2..cec5e7ef2e5323c43e657ae2afbf6724f1edbc01 100644 (file)
@@ -4,6 +4,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SYS_TEXT_BASE=0x80100000
 CONFIG_TI_COMMON_CMD_OPTIONS=y
+# CONFIG_SPL_GPIO_SUPPORT is not set
 CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_OMAP3_LOGIC=y
 # CONFIG_SPL_OMAP3_ID_NAND is not set
index c25415d4107add09bc28d8c0f1a1546ac18b9af0..478349f22f29f04813264805e156b37878deff54 100644 (file)
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <clk-uclass.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
+#include <k3-avs.h>
 
 /**
  * struct ti_sci_clk_data - clock controller information structure
@@ -101,6 +102,10 @@ static ulong ti_sci_clk_set_rate(struct clk *clk, ulong rate)
 
        debug("%s(clk=%p, rate=%lu)\n", __func__, clk, rate);
 
+#ifdef CONFIG_K3_AVS0
+       k3_avs_notify_freq(clk->id, clk->data, rate);
+#endif
+
        /* Ask for exact frequency by using same value for min/target/max */
        ret = cops->set_freq(sci, clk->id, clk->data, rate, rate, rate);
        if (ret)
index 4985ea033b1514c13278a1c27def09661d39aa2e..7a8ba587da5bf1441d0dbbb4be6e13209c6f7f2b 100644 (file)
@@ -421,4 +421,13 @@ config MICROCHIP_FLEXCOM
          Only one function can be used at a time and is chosen at boot time
          according to the device tree.
 
+config K3_AVS0
+       depends on ARCH_K3 && SPL_DM_REGULATOR
+       bool "AVS class 0 support for K3 devices"
+       help
+         K3 devices have the optimized voltage values for the main voltage
+         domains stored in efuse within the VTM IP. This driver reads the
+         optimized voltage from the efuse, so that it can be programmed
+         to the PMIC on board.
+
 endmenu
index f61263640b84625cb6aefd7ede6b12f4b3791c45..870655e80228d09cea5433982c2373b4114e50c2 100644 (file)
@@ -66,3 +66,4 @@ obj-$(CONFIG_VEXPRESS_CONFIG) += vexpress_config.o
 obj-$(CONFIG_WINBOND_W83627) += winbond_w83627.o
 obj-$(CONFIG_JZ4780_EFUSE) += jz4780_efuse.o
 obj-$(CONFIG_MICROCHIP_FLEXCOM) += microchip_flexcom.o
+obj-$(CONFIG_K3_AVS0) += k3_avs.o
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
new file mode 100644 (file)
index 0000000..c19c3c0
--- /dev/null
@@ -0,0 +1,388 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Texas Instruments' K3 Clas 0 Adaptive Voltage Scaling driver
+ *
+ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
+ *      Tero Kristo <t-kristo@ti.com>
+ *
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <asm/io.h>
+#include <i2c.h>
+#include <k3-avs.h>
+#include <power/regulator.h>
+
+#define AM6_VTM_DEVINFO(i)     (priv->base + 0x100 + 0x20 * (i))
+#define AM6_VTM_OPPVID_VD(i)   (priv->base + 0x104 + 0x20 * (i))
+
+#define AM6_VTM_AVS0_SUPPORTED BIT(12)
+
+#define AM6_VTM_OPP_SHIFT(opp) (8 * (opp))
+#define AM6_VTM_OPP_MASK       0xff
+
+#define VD_FLAG_INIT_DONE      BIT(0)
+
+struct k3_avs_privdata {
+       void *base;
+       struct vd_config *vd_config;
+};
+
+struct opp {
+       u32 freq;
+       u32 volt;
+};
+
+struct vd_data {
+       int id;
+       u8 opp;
+       u8 flags;
+       int dev_id;
+       int clk_id;
+       struct opp opps[NUM_OPPS];
+       struct udevice *supply;
+};
+
+struct vd_config {
+       struct vd_data *vds;
+       u32 (*efuse_xlate)(struct k3_avs_privdata *priv, int idx, int opp);
+};
+
+static struct k3_avs_privdata *k3_avs_priv;
+
+/**
+ * am6_efuse_voltage: read efuse voltage from VTM
+ * @priv: driver private data
+ * @idx: VD to read efuse for
+ * @opp: opp id to read
+ *
+ * Reads efuse value for the specified OPP, and converts the register
+ * value to a voltage. Returns the voltage in uV, or 0 if nominal voltage
+ * should be used.
+ *
+ * Efuse val to volt conversion logic:
+ *
+ * val > 171 volt increments in 20mV steps with base 171 => 1.66V
+ * val between 115 to 11 increments in 10mV steps with base 115 => 1.1V
+ * val between 15 to 115 increments in 5mV steps with base 15 => .6V
+ * val between 1 to 15 increments in 20mv steps with base 0 => .3V
+ * val 0 is invalid
+ */
+static u32 am6_efuse_xlate(struct k3_avs_privdata *priv, int idx, int opp)
+{
+       u32 val = readl(AM6_VTM_OPPVID_VD(idx));
+
+       val >>= AM6_VTM_OPP_SHIFT(opp);
+       val &= AM6_VTM_OPP_MASK;
+
+       if (!val)
+               return 0;
+
+       if (val > 171)
+               return 1660000 + 20000 * (val - 171);
+
+       if (val > 115)
+               return 1100000 + 10000 * (val - 115);
+
+       if (val > 15)
+               return 600000 + 5000 * (val - 15);
+
+       return 300000 + 20000 * val;
+}
+
+static int k3_avs_program_voltage(struct k3_avs_privdata *priv,
+                                 struct vd_data *vd,
+                                 int opp_id)
+{
+       u32 volt = vd->opps[opp_id].volt;
+       struct vd_data *vd2;
+
+       if (!vd->supply)
+               return -ENODEV;
+
+       vd->opp = opp_id;
+       vd->flags |= VD_FLAG_INIT_DONE;
+
+       /* Take care of ganged rails and pick the Max amongst them*/
+       for (vd2 = priv->vd_config->vds; vd2->id >= 0; vd2++) {
+               if (vd == vd2)
+                       continue;
+
+               if (vd2->supply != vd->supply)
+                       continue;
+
+               if (vd2->opps[vd2->opp].volt > volt)
+                       volt = vd2->opps[vd2->opp].volt;
+
+               vd2->flags |= VD_FLAG_INIT_DONE;
+       }
+
+       return regulator_set_value(vd->supply, volt);
+}
+
+static struct vd_data *get_vd(struct k3_avs_privdata *priv, int idx)
+{
+       struct vd_data *vd;
+
+       for (vd = priv->vd_config->vds; vd->id >= 0 && vd->id != idx; vd++)
+               ;
+
+       if (vd->id < 0)
+               return NULL;
+
+       return vd;
+}
+
+/**
+ * k3_avs_set_opp: Sets the voltage for an arbitrary VD rail
+ * @dev: AVS device
+ * @vdd_id: voltage domain ID
+ * @opp_id: OPP ID
+ *
+ * Programs the desired OPP value for the defined voltage rail. This
+ * should be called from board files if reconfiguration is desired.
+ * Returns 0 on success, negative error value on failure.
+ */
+int k3_avs_set_opp(struct udevice *dev, int vdd_id, int opp_id)
+{
+       struct k3_avs_privdata *priv = dev_get_priv(dev);
+       struct vd_data *vd;
+
+       vd = get_vd(priv, vdd_id);
+       if (!vd)
+               return -EINVAL;
+
+       return k3_avs_program_voltage(priv, vd, opp_id);
+}
+
+static int match_opp(struct vd_data *vd, u32 freq)
+{
+       struct opp *opp;
+       int opp_id;
+
+       for (opp_id = 0; opp_id < NUM_OPPS; opp_id++) {
+               opp = &vd->opps[opp_id];
+               if (opp->freq == freq)
+                       return opp_id;
+       }
+
+       printf("No matching OPP found for freq %d.\n", freq);
+
+       return -EINVAL;
+}
+
+/**
+ * k3_avs_notify_freq: Notify clock rate change towards AVS subsystem
+ * @dev_id: Device ID for the clock to be changed
+ * @clk_id: Clock ID for the clock to be changed
+ * @freq: New frequency for clock
+ *
+ * Checks if the provided clock is the MPU clock or not, if not, return
+ * immediately. If MPU clock is provided, maps the provided MPU frequency
+ * towards an MPU OPP, and programs the voltage to the regulator. Return 0
+ * on success, negative error value on failure.
+ */
+int k3_avs_notify_freq(int dev_id, int clk_id, u32 freq)
+{
+       int opp_id;
+       struct k3_avs_privdata *priv = k3_avs_priv;
+       struct vd_data *vd;
+
+       for (vd = priv->vd_config->vds; vd->id >= 0; vd++) {
+               if (vd->dev_id != dev_id || vd->clk_id != clk_id)
+                       continue;
+
+               opp_id = match_opp(vd, freq);
+               if (opp_id < 0)
+                       return opp_id;
+
+               vd->opp = opp_id;
+               return k3_avs_program_voltage(priv, vd, opp_id);
+       }
+
+       return -EINVAL;
+}
+
+static int k3_avs_configure(struct udevice *dev, struct k3_avs_privdata *priv)
+{
+       struct vd_config *conf;
+       int ret;
+       char pname[20];
+       struct vd_data *vd;
+
+       conf = (void *)dev_get_driver_data(dev);
+
+       priv->vd_config = conf;
+
+       for (vd = conf->vds; vd->id >= 0; vd++) {
+               sprintf(pname, "vdd-supply-%d", vd->id);
+               ret = device_get_supply_regulator(dev, pname, &vd->supply);
+               if (ret)
+                       dev_warn(dev, "supply not found for VD%d.\n", vd->id);
+
+               sprintf(pname, "ti,default-opp-%d", vd->id);
+               ret = dev_read_u32_default(dev, pname, -1);
+               if (ret != -1)
+                       vd->opp = ret;
+       }
+
+       return 0;
+}
+
+/**
+ * k3_avs_probe: parses VD info from VTM, and re-configures the OPP data
+ *
+ * Parses all VDs on a device calculating the AVS class-0 voltages for them,
+ * and updates the vd_data based on this. The vd_data itself shall be used
+ * to program the required OPPs later on. Returns 0 on success, negative
+ * error value on failure.
+ */
+static int k3_avs_probe(struct udevice *dev)
+{
+       int opp_id;
+       u32 volt;
+       struct opp *opp;
+       struct k3_avs_privdata *priv;
+       struct vd_data *vd;
+       int ret;
+
+       priv = dev_get_priv(dev);
+
+       k3_avs_priv = priv;
+
+       ret = k3_avs_configure(dev, priv);
+       if (ret)
+               return ret;
+
+       priv->base = dev_read_addr_ptr(dev);
+       if (!priv->base)
+               return -ENODEV;
+
+       for (vd = priv->vd_config->vds; vd->id >= 0; vd++) {
+               if (!(readl(AM6_VTM_DEVINFO(vd->id)) &
+                     AM6_VTM_AVS0_SUPPORTED)) {
+                       dev_warn(dev, "AVS-class 0 not supported for VD%d\n",
+                                vd->id);
+                       continue;
+               }
+
+               for (opp_id = 0; opp_id < NUM_OPPS; opp_id++) {
+                       opp = &vd->opps[opp_id];
+
+                       if (!opp->freq)
+                               continue;
+
+                       volt = priv->vd_config->efuse_xlate(priv, vd->id,
+                                                           opp_id);
+                       if (volt)
+                               opp->volt = volt;
+               }
+       }
+
+       for (vd = priv->vd_config->vds; vd->id >= 0; vd++) {
+               if (vd->flags & VD_FLAG_INIT_DONE)
+                       continue;
+
+               k3_avs_program_voltage(priv, vd, vd->opp);
+       }
+
+       return 0;
+}
+
+static struct vd_data am654_vd_data[] = {
+       {
+               .id = AM6_VDD_CORE,
+               .dev_id = 82, /* AM6_DEV_CBASS0 */
+               .clk_id = 0, /* main sysclk0 */
+               .opp = AM6_OPP_NOM,
+               .opps = {
+                       [AM6_OPP_NOM] = {
+                               .volt = 1000000,
+                               .freq = 250000000, /* CBASS0 */
+                       },
+               },
+       },
+       {
+               .id = AM6_VDD_MPU0,
+               .dev_id = 202, /* AM6_DEV_COMPUTE_CLUSTER_A53_0 */
+               .clk_id = 0, /* ARM clock */
+               .opp = AM6_OPP_NOM,
+               .opps = {
+                       [AM6_OPP_NOM] = {
+                               .volt = 1000000,
+                               .freq = 800000000,
+                       },
+                       [AM6_OPP_OD] = {
+                               .volt = 1100000,
+                               .freq = 1000000000,
+                       },
+                       [AM6_OPP_TURBO] = {
+                               .volt = 1220000,
+                               .freq = 1100000000,
+                       },
+               },
+       },
+       {
+               .id = AM6_VDD_MPU1,
+               .opp = AM6_OPP_NOM,
+               .dev_id = 204, /* AM6_DEV_COMPUTE_CLUSTER_A53_2 */
+               .clk_id = 0, /* ARM clock */
+               .opps = {
+                       [AM6_OPP_NOM] = {
+                               .volt = 1000000,
+                               .freq = 800000000,
+                       },
+                       [AM6_OPP_OD] = {
+                               .volt = 1100000,
+                               .freq = 1000000000,
+                       },
+                       [AM6_OPP_TURBO] = {
+                               .volt = 1220000,
+                               .freq = 1100000000,
+                       },
+               },
+       },
+       { .id = -1 },
+};
+
+static struct vd_data j721e_vd_data[] = {
+       {
+               .id = J721E_VDD_MPU,
+               .opp = AM6_OPP_NOM,
+               .dev_id = 202, /* J721E_DEV_A72SS0_CORE0 */
+               .clk_id = 2, /* ARM clock */
+               .opps = {
+                       [AM6_OPP_NOM] = {
+                               .volt = 880000, /* TBD in DM */
+                               .freq = 2000000000,
+                       },
+               },
+       },
+       { .id = -1 },
+};
+
+static struct vd_config j721e_vd_config = {
+       .efuse_xlate = am6_efuse_xlate,
+       .vds = j721e_vd_data,
+};
+
+static struct vd_config am654_vd_config = {
+       .efuse_xlate = am6_efuse_xlate,
+       .vds = am654_vd_data,
+};
+
+static const struct udevice_id k3_avs_ids[] = {
+       { .compatible = "ti,am654-avs", .data = (ulong)&am654_vd_config },
+       { .compatible = "ti,j721e-avs", .data = (ulong)&j721e_vd_config },
+       {}
+};
+
+U_BOOT_DRIVER(k3_avs) = {
+       .name = "k3_avs",
+       .of_match = k3_avs_ids,
+       .id = UCLASS_MISC,
+       .probe = k3_avs_probe,
+       .priv_auto_alloc_size = sizeof(struct k3_avs_privdata),
+};
index 4718dc700cd513af76a520d9d0950ced24f4d338..b4bf01867460e527e167271334e7701f16baf8e2 100644 (file)
@@ -275,3 +275,10 @@ config SPL_PMIC_LP87565
        help
        The LP87565 is a PMIC containing a bunch of SMPS.
        This driver binds the pmic children in SPL.
+
+config PMIC_TPS65941
+       bool "Enable driver for Texas Instruments TPS65941 PMIC"
+       depends on DM_PMIC
+       help
+       The TPS65941 is a PMIC containing a bunch of SMPS & LDOs.
+       This driver binds the pmic children.
index 888dbb2857397630cf2f74fbde750310675de652..ec6432780564d3f2c86e0ac514e4a7125e6e744a 100644 (file)
@@ -39,3 +39,4 @@ obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o
 obj-$(CONFIG_POWER_TPS65910) += pmic_tps65910.o
 obj-$(CONFIG_POWER_HI6553) += pmic_hi6553.o
 obj-$(CONFIG_POWER_MC34VR500) += pmic_mc34vr500.o
+obj-$(CONFIG_PMIC_TPS65941) += tps65941.o
diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c
new file mode 100644 (file)
index 0000000..e8f3c95
--- /dev/null
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2019 Texas Instruments Incorporated, <www.ti.com>
+ * Keerthy <j-keerthy@ti.com>
+ */
+
+#include <common.h>
+#include <fdtdec.h>
+#include <errno.h>
+#include <dm.h>
+#include <i2c.h>
+#include <power/pmic.h>
+#include <power/regulator.h>
+#include <power/tps65941.h>
+#include <dm/device.h>
+
+static const struct pmic_child_info pmic_children_info[] = {
+       { .prefix = "ldo", .driver = TPS65941_LDO_DRIVER },
+       { .prefix = "buck", .driver = TPS65941_BUCK_DRIVER },
+       { },
+};
+
+static int tps65941_write(struct udevice *dev, uint reg, const uint8_t *buff,
+                         int len)
+{
+       if (dm_i2c_write(dev, reg, buff, len)) {
+               pr_err("write error to device: %p register: %#x!\n", dev, reg);
+               return -EIO;
+       }
+
+       return 0;
+}
+
+static int tps65941_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
+{
+       if (dm_i2c_read(dev, reg, buff, len)) {
+               pr_err("read error from device: %p register: %#x!\n", dev, reg);
+               return -EIO;
+       }
+
+       return 0;
+}
+
+static int tps65941_bind(struct udevice *dev)
+{
+       ofnode regulators_node;
+       int children;
+
+       regulators_node = dev_read_subnode(dev, "regulators");
+       if (!ofnode_valid(regulators_node)) {
+               debug("%s: %s regulators subnode not found!\n", __func__,
+                     dev->name);
+               return -ENXIO;
+       }
+
+       debug("%s: '%s' - found regulators subnode\n", __func__, dev->name);
+
+       children = pmic_bind_children(dev, regulators_node, pmic_children_info);
+       if (!children)
+               printf("%s: %s - no child found\n", __func__, dev->name);
+
+       /* Always return success for this device */
+       return 0;
+}
+
+static struct dm_pmic_ops tps65941_ops = {
+       .read = tps65941_read,
+       .write = tps65941_write,
+};
+
+static const struct udevice_id tps65941_ids[] = {
+       { .compatible = "ti,tps659411", .data = TPS659411 },
+       { .compatible = "ti,tps659413", .data = TPS659413 },
+       { }
+};
+
+U_BOOT_DRIVER(pmic_tps65941) = {
+       .name = "tps65941_pmic",
+       .id = UCLASS_PMIC,
+       .of_match = tps65941_ids,
+       .bind = tps65941_bind,
+       .ops = &tps65941_ops,
+};
index 9aa00fad42f4962784bb1ed914d55f12e599fccb..25fc787a2941398d5786d3a27eed65955314d398 100644 (file)
@@ -273,6 +273,16 @@ config DM_REGULATOR_TPS65910
        regulator types of the TPS65910 (BUCK, BOOST and LDO). It implements
        the get/set api for value and enable.
 
+config DM_REGULATOR_TPS62360
+       bool "Enable driver for TPS6236x Power Regulator"
+       depends on DM_REGULATOR
+       help
+       The TPS6236X DC/DC step down converter provides a single output
+       power line peaking at 3A current. This driver supports all four
+       variants of the chip (TPS62360, TPS62361, TPS62362, TPS62363). It
+       implements the get/set api for value only, as the power line is
+       always on.
+
 config DM_REGULATOR_STPMIC1
        bool "Enable driver for STPMIC1 regulators"
        depends on DM_REGULATOR && PMIC_STPMIC1
@@ -313,3 +323,13 @@ config SPL_DM_REGULATOR_LP873X
        This enables implementation of driver-model regulator uclass
        features for REGULATOR LP873X and the family of LP873X PMICs.
        The driver implements get/set api for: value and enable in SPL.
+
+config DM_REGULATOR_TPS65941
+       bool "Enable driver for TPS65941 PMIC regulators"
+        depends on PMIC_TPS65941
+       help
+       This enables implementation of driver-model regulator uclass
+       features for REGULATOR TPS65941 and the family of TPS65941 PMICs.
+       TPS65941 series of PMICs have 5 single phase BUCKs that can also
+       be configured in multi phase modes & 4 LDOs. The driver implements
+       get/set api for value and enable.
index 6a3d4bbee4c6270b362c9d2113e7bda9ce270770..b611c901baa80f5f1df5b37b0cf9cb6d25ea2711 100644 (file)
@@ -26,4 +26,6 @@ obj-$(CONFIG_$(SPL_)DM_REGULATOR_LP873X) += lp873x_regulator.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_LP87565) += lp87565_regulator.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_STM32_VREFBUF) += stm32-vrefbuf.o
 obj-$(CONFIG_DM_REGULATOR_TPS65910) += tps65910_regulator.o
+obj-$(CONFIG_DM_REGULATOR_TPS62360) += tps62360_regulator.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_STPMIC1) += stpmic1.o
+obj-$(CONFIG_DM_REGULATOR_TPS65941) += tps65941_regulator.o
diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c
new file mode 100644 (file)
index 0000000..3b123f5
--- /dev/null
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
+ *      Tero Kristo <t-kristo@ti.com>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <i2c.h>
+#include <power/regulator.h>
+
+#define TPS62360_REG_SET0      0
+
+#define TPS62360_I2C_CHIP      0x60
+
+#define TPS62360_VSEL_STEPSIZE 10000 /* In uV */
+
+struct tps62360_regulator_config {
+       u32 vmin;
+       u32 vmax;
+};
+
+struct tps62360_regulator_pdata {
+       u8 vsel_offset;
+       struct udevice *i2c;
+       struct tps62360_regulator_config *config;
+};
+
+/*
+ * TPS62362/TPS62363 are just re-using these values for now, their preset
+ * voltage values are just different compared to TPS62360/TPS62361.
+ */
+static struct tps62360_regulator_config tps62360_data = {
+       .vmin = 770000,
+       .vmax = 1400000,
+};
+
+static struct tps62360_regulator_config tps62361_data = {
+       .vmin = 500000,
+       .vmax = 1770000,
+};
+
+static int tps62360_regulator_set_value(struct udevice *dev, int uV)
+{
+       struct tps62360_regulator_pdata *pdata = dev_get_platdata(dev);
+       u8 regval;
+
+       if (uV < pdata->config->vmin || uV > pdata->config->vmax)
+               return -EINVAL;
+
+       uV -= pdata->config->vmin;
+
+       uV = DIV_ROUND_UP(uV, TPS62360_VSEL_STEPSIZE);
+
+       if (uV > U8_MAX)
+               return -EINVAL;
+
+       regval = (u8)uV;
+
+       return dm_i2c_write(pdata->i2c, TPS62360_REG_SET0 + pdata->vsel_offset,
+                           &regval, 1);
+}
+
+static int tps62360_regulator_get_value(struct udevice *dev)
+{
+       u8 regval;
+       int ret;
+       struct tps62360_regulator_pdata *pdata = dev_get_platdata(dev);
+
+       ret = dm_i2c_read(pdata->i2c, TPS62360_REG_SET0 + pdata->vsel_offset,
+                         &regval, 1);
+       if (ret) {
+               dev_err(dev, "i2c read failed: %d\n", ret);
+               return ret;
+       }
+
+       return (u32)regval * TPS62360_VSEL_STEPSIZE + pdata->config->vmin;
+}
+
+static int tps62360_regulator_ofdata_to_platdata(struct udevice *dev)
+{
+       struct tps62360_regulator_pdata *pdata = dev_get_platdata(dev);
+       u8 vsel0;
+       u8 vsel1;
+       int ret;
+
+       pdata->config = (void *)dev_get_driver_data(dev);
+
+       vsel0 = dev_read_bool(dev, "ti,vsel0-state-high");
+       vsel1 = dev_read_bool(dev, "ti,vsel1-state-high");
+
+       pdata->vsel_offset = vsel0 + vsel1 * 2;
+
+       ret = i2c_get_chip(dev->parent, TPS62360_I2C_CHIP, 1, &pdata->i2c);
+       if (ret) {
+               dev_err(dev, "i2c dev get failed.\n");
+               return ret;
+       }
+
+       return 0;
+}
+
+static const struct dm_regulator_ops tps62360_regulator_ops = {
+       .get_value  = tps62360_regulator_get_value,
+       .set_value  = tps62360_regulator_set_value,
+};
+
+static const struct udevice_id tps62360_regulator_ids[] = {
+       { .compatible = "ti,tps62360", .data = (ulong)&tps62360_data },
+       { .compatible = "ti,tps62361", .data = (ulong)&tps62361_data },
+       { .compatible = "ti,tps62362", .data = (ulong)&tps62360_data },
+       { .compatible = "ti,tps62363", .data = (ulong)&tps62361_data },
+       { },
+};
+
+U_BOOT_DRIVER(tps62360_regulator) = {
+       .name = "tps62360_regulator",
+       .id = UCLASS_REGULATOR,
+       .ops = &tps62360_regulator_ops,
+       .of_match = tps62360_regulator_ids,
+       .platdata_auto_alloc_size = sizeof(struct tps62360_regulator_pdata),
+       .ofdata_to_platdata = tps62360_regulator_ofdata_to_platdata,
+};
diff --git a/drivers/power/regulator/tps65941_regulator.c b/drivers/power/regulator/tps65941_regulator.c
new file mode 100644 (file)
index 0000000..a00ef58
--- /dev/null
@@ -0,0 +1,407 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2019
+ * Texas Instruments Incorporated, <www.ti.com>
+ *
+ * Keerthy <j-keerthy@ti.com>
+ */
+
+#include <common.h>
+#include <fdtdec.h>
+#include <errno.h>
+#include <dm.h>
+#include <i2c.h>
+#include <power/pmic.h>
+#include <power/regulator.h>
+#include <power/tps65941.h>
+
+static const char tps65941_buck_ctrl[TPS65941_BUCK_NUM] = {0x4, 0x6, 0x8, 0xA,
+                                                               0xC};
+static const char tps65941_buck_vout[TPS65941_BUCK_NUM] = {0xE, 0x10, 0x12,
+                                                               0x14, 0x16};
+static const char tps65941_ldo_ctrl[TPS65941_BUCK_NUM] = {0x1D, 0x1E, 0x1F,
+                                                               0x20};
+static const char tps65941_ldo_vout[TPS65941_BUCK_NUM] = {0x23, 0x24, 0x25,
+                                                               0x26};
+
+static int tps65941_buck_enable(struct udevice *dev, int op, bool *enable)
+{
+       int ret;
+       unsigned int adr;
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+       adr = uc_pdata->ctrl_reg;
+
+       ret = pmic_reg_read(dev->parent, adr);
+       if (ret < 0)
+               return ret;
+
+       if (op == PMIC_OP_GET) {
+               ret &= TPS65941_BUCK_MODE_MASK;
+
+               if (ret)
+                       *enable = true;
+               else
+                       *enable = false;
+
+               return 0;
+       } else if (op == PMIC_OP_SET) {
+               if (*enable)
+                       ret |= TPS65941_BUCK_MODE_MASK;
+               else
+                       ret &= ~TPS65941_BUCK_MODE_MASK;
+               ret = pmic_reg_write(dev->parent, adr, ret);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
+static int tps65941_buck_volt2val(int uV)
+{
+       if (uV > TPS65941_BUCK_VOLT_MAX)
+               return -EINVAL;
+       else if (uV > 1650000)
+               return (uV - 1660000) / 20000 + 0xAB;
+       else if (uV > 1110000)
+               return (uV - 1110000) / 10000 + 0x73;
+       else if (uV > 600000)
+               return (uV - 600000) / 5000 + 0x0F;
+       else if (uV >= 300000)
+               return (uV - 300000) / 20000 + 0x00;
+       else
+               return -EINVAL;
+}
+
+static int tps65941_buck_val2volt(int val)
+{
+       if (val > TPS65941_BUCK_VOLT_MAX_HEX)
+               return -EINVAL;
+       else if (val > 0xAB)
+               return 1660000 + (val - 0xAB) * 20000;
+       else if (val > 0x73)
+               return 1100000 + (val - 0x73) * 10000;
+       else if (val > 0xF)
+               return 600000 + (val - 0xF) * 5000;
+       else if (val >= 0x0)
+               return 300000 + val * 5000;
+       else
+               return -EINVAL;
+}
+
+int tps65941_lookup_slew(int id)
+{
+       switch (id) {
+       case 0:
+               return 33000;
+       case 1:
+               return 20000;
+       case 2:
+               return 10000;
+       case 3:
+               return 5000;
+       case 4:
+               return 2500;
+       case 5:
+               return 1300;
+       case 6:
+               return 630;
+       case 7:
+               return 310;
+       default:
+               return -1;
+       }
+}
+
+static int tps65941_buck_val(struct udevice *dev, int op, int *uV)
+{
+       unsigned int hex, adr;
+       int ret, delta, uwait, slew;
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+
+       if (op == PMIC_OP_GET)
+               *uV = 0;
+
+       adr = uc_pdata->volt_reg;
+
+       ret = pmic_reg_read(dev->parent, adr);
+       if (ret < 0)
+               return ret;
+
+       ret &= TPS65941_BUCK_VOLT_MASK;
+       ret = tps65941_buck_val2volt(ret);
+       if (ret < 0)
+               return ret;
+
+       if (op == PMIC_OP_GET) {
+               *uV = ret;
+               return 0;
+       }
+
+       /*
+        * Compute the delta voltage, find the slew rate and wait
+        * for the appropriate amount of time after voltage switch
+        */
+       if (*uV > ret)
+               delta = *uV - ret;
+       else
+               delta = ret - *uV;
+
+       slew = pmic_reg_read(dev->parent, uc_pdata->ctrl_reg + 1);
+       if (slew < 0)
+               return ret;
+
+       slew &= TP65941_BUCK_CONF_SLEW_MASK;
+       slew = tps65941_lookup_slew(slew);
+       if (slew <= 0)
+               return ret;
+
+       uwait = delta / slew;
+
+       hex = tps65941_buck_volt2val(*uV);
+       if (hex < 0)
+               return hex;
+
+       ret &= 0x0;
+       ret = hex;
+
+       ret = pmic_reg_write(dev->parent, adr, ret);
+
+       udelay(uwait);
+
+       return ret;
+}
+
+static int tps65941_ldo_enable(struct udevice *dev, int op, bool *enable)
+{
+       int ret;
+       unsigned int adr;
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+       adr = uc_pdata->ctrl_reg;
+
+       ret = pmic_reg_read(dev->parent, adr);
+       if (ret < 0)
+               return ret;
+
+       if (op == PMIC_OP_GET) {
+               ret &= TPS65941_LDO_MODE_MASK;
+
+               if (ret)
+                       *enable = true;
+               else
+                       *enable = false;
+
+               return 0;
+       } else if (op == PMIC_OP_SET) {
+               if (*enable)
+                       ret |= TPS65941_LDO_MODE_MASK;
+               else
+                       ret &= ~TPS65941_LDO_MODE_MASK;
+               ret = pmic_reg_write(dev->parent, adr, ret);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
+static int tps65941_ldo_val2volt(int val)
+{
+       if (val > TPS65941_LDO_VOLT_MAX_HEX || val < TPS65941_LDO_VOLT_MIN_HEX)
+               return -EINVAL;
+       else if (val >= TPS65941_LDO_VOLT_MIN_HEX)
+               return 600000 + (val - TPS65941_LDO_VOLT_MIN_HEX) * 50000;
+       else
+               return -EINVAL;
+}
+
+static int tps65941_ldo_val(struct udevice *dev, int op, int *uV)
+{
+       unsigned int hex, adr;
+       int ret;
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+
+       if (op == PMIC_OP_GET)
+               *uV = 0;
+
+       adr = uc_pdata->volt_reg;
+
+       ret = pmic_reg_read(dev->parent, adr);
+       if (ret < 0)
+               return ret;
+
+       ret &= TPS65941_LDO_VOLT_MASK;
+       ret = tps65941_ldo_val2volt(ret);
+       if (ret < 0)
+               return ret;
+
+       if (op == PMIC_OP_GET) {
+               *uV = ret;
+               return 0;
+       }
+
+       hex = tps65941_buck_volt2val(*uV);
+       if (hex < 0)
+               return hex;
+
+       ret &= 0x0;
+       ret = hex;
+
+       ret = pmic_reg_write(dev->parent, adr, ret);
+
+       return ret;
+}
+
+static int tps65941_ldo_probe(struct udevice *dev)
+{
+       struct dm_regulator_uclass_platdata *uc_pdata;
+       int idx;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+       uc_pdata->type = REGULATOR_TYPE_LDO;
+
+       idx = dev->driver_data;
+       if (idx == 1 || idx == 2 || idx == 3 || idx == 4) {
+               debug("Single phase regulator\n");
+       } else {
+               printf("Wrong ID for regulator\n");
+               return -EINVAL;
+       }
+
+       uc_pdata->ctrl_reg = tps65941_ldo_ctrl[idx - 1];
+       uc_pdata->volt_reg = tps65941_ldo_vout[idx - 1];
+
+       return 0;
+}
+
+static int tps65941_buck_probe(struct udevice *dev)
+{
+       struct dm_regulator_uclass_platdata *uc_pdata;
+       int idx;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+       uc_pdata->type = REGULATOR_TYPE_BUCK;
+
+       idx = dev->driver_data;
+       if (idx == 1 || idx == 2 || idx == 3 || idx == 4 || idx == 5) {
+               debug("Single phase regulator\n");
+       } else if (idx == 12) {
+               idx = 1;
+       } else if (idx == 34) {
+               idx = 3;
+       } else if (idx == 1234) {
+               idx = 1;
+       } else {
+               printf("Wrong ID for regulator\n");
+               return -EINVAL;
+       }
+
+       uc_pdata->ctrl_reg = tps65941_buck_ctrl[idx - 1];
+       uc_pdata->volt_reg = tps65941_buck_vout[idx - 1];
+
+       return 0;
+}
+
+static int ldo_get_value(struct udevice *dev)
+{
+       int uV;
+       int ret;
+
+       ret = tps65941_ldo_val(dev, PMIC_OP_GET, &uV);
+       if (ret)
+               return ret;
+
+       return uV;
+}
+
+static int ldo_set_value(struct udevice *dev, int uV)
+{
+       return tps65941_ldo_val(dev, PMIC_OP_SET, &uV);
+}
+
+static int ldo_get_enable(struct udevice *dev)
+{
+       bool enable = false;
+       int ret;
+
+       ret = tps65941_ldo_enable(dev, PMIC_OP_GET, &enable);
+       if (ret)
+               return ret;
+
+       return enable;
+}
+
+static int ldo_set_enable(struct udevice *dev, bool enable)
+{
+       return tps65941_ldo_enable(dev, PMIC_OP_SET, &enable);
+}
+
+static int buck_get_value(struct udevice *dev)
+{
+       int uV;
+       int ret;
+
+       ret = tps65941_buck_val(dev, PMIC_OP_GET, &uV);
+       if (ret)
+               return ret;
+
+       return uV;
+}
+
+static int buck_set_value(struct udevice *dev, int uV)
+{
+       return tps65941_buck_val(dev, PMIC_OP_SET, &uV);
+}
+
+static int buck_get_enable(struct udevice *dev)
+{
+       bool enable = false;
+       int ret;
+
+       ret = tps65941_buck_enable(dev, PMIC_OP_GET, &enable);
+       if (ret)
+               return ret;
+
+       return enable;
+}
+
+static int buck_set_enable(struct udevice *dev, bool enable)
+{
+       return tps65941_buck_enable(dev, PMIC_OP_SET, &enable);
+}
+
+static const struct dm_regulator_ops tps65941_ldo_ops = {
+       .get_value  = ldo_get_value,
+       .set_value  = ldo_set_value,
+       .get_enable = ldo_get_enable,
+       .set_enable = ldo_set_enable,
+};
+
+U_BOOT_DRIVER(tps65941_ldo) = {
+       .name = TPS65941_LDO_DRIVER,
+       .id = UCLASS_REGULATOR,
+       .ops = &tps65941_ldo_ops,
+       .probe = tps65941_ldo_probe,
+};
+
+static const struct dm_regulator_ops tps65941_buck_ops = {
+       .get_value  = buck_get_value,
+       .set_value  = buck_set_value,
+       .get_enable = buck_get_enable,
+       .set_enable = buck_set_enable,
+};
+
+U_BOOT_DRIVER(tps65941_buck) = {
+       .name = TPS65941_BUCK_DRIVER,
+       .id = UCLASS_REGULATOR,
+       .ops = &tps65941_buck_ops,
+       .probe = tps65941_buck_probe,
+};
diff --git a/include/k3-avs.h b/include/k3-avs.h
new file mode 100644 (file)
index 0000000..e3c3caf
--- /dev/null
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Texas Instruments' K3 Adaptive Voltage Scaling driver
+ *
+ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
+ *      Tero Kristo <t-kristo@ti.com>
+ *
+ */
+
+#ifndef _K3_AVS0_
+#define _K3_AVS0_
+
+#define AM6_VDD_WKUP           0
+#define AM6_VDD_MCU            1
+#define AM6_VDD_CORE           2
+#define AM6_VDD_MPU0           3
+#define AM6_VDD_MPU1           4
+
+#define J721E_VDD_MPU          2
+
+#define NUM_OPPS               4
+
+#define AM6_OPP_NOM            1
+#define AM6_OPP_OD             2
+#define AM6_OPP_TURBO          3
+
+int k3_avs_set_opp(struct udevice *dev, int vdd_id, int opp_id);
+int k3_avs_notify_freq(int dev_id, int clk_id, u32 freq);
+
+#endif
diff --git a/include/power/tps65941.h b/include/power/tps65941.h
new file mode 100644 (file)
index 0000000..2d48b31
--- /dev/null
@@ -0,0 +1,26 @@
+#define        TPS659411               0x0
+#define TPS659412              0x1
+#define TPS659413              0x2
+#define TPS659414              0x3
+
+/* I2C device address for pmic tps65941 */
+#define TPS65941_I2C_ADDR      (0x12 >> 1)
+#define TPS65941_LDO_NUM               4
+#define TPS65941_BUCK_NUM              5
+
+/* Drivers name */
+#define TPS65941_LDO_DRIVER            "tps65941_ldo"
+#define TPS65941_BUCK_DRIVER           "tps65941_buck"
+
+#define TPS65941_BUCK_VOLT_MASK                0xFF
+#define TPS65941_BUCK_VOLT_MAX_HEX     0xFF
+#define TPS65941_BUCK_VOLT_MAX         3340000
+#define TPS65941_BUCK_MODE_MASK                0x1
+
+#define TPS65941_LDO_VOLT_MASK         0x3E
+#define TPS65941_LDO_VOLT_MAX_HEX      0x3A
+#define TPS65941_LDO_VOLT_MIN_HEX      0x4
+#define TPS65941_LDO_VOLT_MAX          3300000
+#define TPS65941_LDO_MODE_MASK         0x1
+#define TPS65941_LDO_BYPASS_EN         0x80
+#define TP65941_BUCK_CONF_SLEW_MASK    0x7