sunxi: Enable AXP221s in I2C mode with the R40 SoC

The R40 SoC uses the AXP221s in I2C mode to supply power.

Some regulator's common usages have changed, and also the recommended
voltage for existing usages have changed. Update the defaults to match.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c
index 7c57f02792b94e04c2117efba771867171710c39..f917c3e070a515e75551ab20372459a8f9d8806b 100644 (file)
--- a/arch/arm/mach-sunxi/pmic_bus.c
+++ b/arch/arm/mach-sunxi/pmic_bus.c
@@ -41,6 +41,9 @@ int pmic_bus_init(void)
        p2wi_init();
        ret = p2wi_change_to_p2wi_mode(AXP221_CHIP_ADDR, AXP221_CTRL_ADDR,
                                       AXP221_INIT_DATA);
+# elif defined CONFIG_MACH_SUN8I_R40
+       /* Nothing. R40 uses the AXP221s in I2C mode */
+       ret = 0;
 # else
        ret = rsb_init();
        if (ret)
@@ -65,6 +68,8 @@ int pmic_bus_read(u8 reg, u8 *data)
 #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER
 # ifdef CONFIG_MACH_SUN6I
        return p2wi_read(reg, data);
+# elif defined CONFIG_MACH_SUN8I_R40
+       return i2c_read(AXP209_I2C_ADDR, reg, 1, data, 1);
 # else
        return rsb_read(AXP223_RUNTIME_ADDR, reg, data);
 # endif
@@ -80,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data)
 #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER
 # ifdef CONFIG_MACH_SUN6I
        return p2wi_write(reg, data);
+# elif defined CONFIG_MACH_SUN8I_R40
+       return i2c_write(AXP209_I2C_ADDR, reg, 1, &data, 1);
 # else
        return rsb_write(AXP223_RUNTIME_ADDR, reg, data);
 # endif

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 3df707731325e574266a9076cfbae6529d915d10..f40b8ff57d25c11625bd7b679bfe8e6da38299af 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -473,7 +473,7 @@ config USB3_VBUS_PIN
 
 config I2C0_ENABLE
        bool "Enable I2C/TWI controller 0"
-       default y if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
+       default y if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUN8I_R40
        default n if MACH_SUN6I || MACH_SUN8I
        select CMD_I2C
        ---help---

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 64e5bc2f74b43cfb9d16021bc3c804ff487ec1ec..911ecb1144a6c8608d738b76cec09c8face4a3c5 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -10,7 +10,7 @@ choice
        prompt "Select Sunxi PMIC Variant"
        depends on ARCH_SUNXI
        default AXP209_POWER if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
-       default AXP221_POWER if MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33
+       default AXP221_POWER if MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_R40
        default AXP818_POWER if MACH_SUN8I_A83T
        default SUNXI_NO_PMIC if MACH_SUNXI_H3_H5 || MACH_SUN50I
 
@@ -37,7 +37,7 @@ config AXP209_POWER
 
 config AXP221_POWER
        bool "axp221 / axp223 pmic support"
-       depends on MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33
+       depends on MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_R40
        select CMD_POWEROFF
        ---help---
        Select this to enable support for the axp221/axp223 pmic found on most
@@ -70,7 +70,7 @@ endchoice
 config AXP_DCDC1_VOLT
        int "axp pmic dcdc1 voltage"
        depends on AXP221_POWER || AXP809_POWER || AXP818_POWER
-       default 3300 if AXP818_POWER
+       default 3300 if AXP818_POWER || MACH_SUN8I_R40
        default 3000 if MACH_SUN6I || MACH_SUN8I || MACH_SUN9I
        ---help---
        Set the voltage (mV) to program the axp pmic dcdc1 at, set to 0 to
@@ -97,6 +97,7 @@ config AXP_DCDC2_VOLT
        On A23/A33 boards dcdc2 is used for VDD-SYS and should be 1.1V.
        On A80 boards dcdc2 powers the GPU and can be left off.
        On A83T boards dcdc2 is used for VDD-CPUA(cluster 0) and should be 0.9V.
+       On R40 boards dcdc2 is VDD-CPU and should be 1.1V
 
 config AXP_DCDC3_VOLT
        int "axp pmic dcdc3 voltage"
@@ -104,6 +105,7 @@ config AXP_DCDC3_VOLT
        default 900 if AXP809_POWER || AXP818_POWER
        default 1500 if AXP152_POWER
        default 1250 if AXP209_POWER
+       default 1100 if MACH_SUN8I_R40
        default 1200 if MACH_SUN6I || MACH_SUN8I
        ---help---
        Set the voltage (mV) to program the axp pmic dcdc3 at, set to 0 to
@@ -114,6 +116,7 @@ config AXP_DCDC3_VOLT
        On A23 / A31 / A33 boards dcdc3 is VDD-CPU and should be 1.2V.
        On A80 boards dcdc3 is used for VDD-CPUA(cluster 0) and should be 0.9V.
        On A83T boards dcdc3 is used for VDD-CPUB(cluster 1) and should be 0.9V.
+       On R40 boards dcdc3 is VDD-SYS and VDD-GPU and should be 1.1V.
 
 config AXP_DCDC4_VOLT
        int "axp pmic dcdc4 voltage"
@@ -138,13 +141,13 @@ config AXP_DCDC5_VOLT
        ---help---
        Set the voltage (mV) to program the axp pmic dcdc5 at, set to 0 to
        disable dcdc5.
-       On A23 / A31 / A33 / A80 / A83T boards dcdc5 is VCC-DRAM and
+       On A23 / A31 / A33 / A80 / A83T / R40 boards dcdc5 is VCC-DRAM and
        should be 1.5V, 1.35V if DDR3L is used.
 
 config AXP_ALDO1_VOLT
        int "axp pmic (a)ldo1 voltage"
        depends on AXP221_POWER || AXP809_POWER || AXP818_POWER
-       default 0 if MACH_SUN6I
+       default 0 if MACH_SUN6I || MACH_SUN8I_R40
        default 1800 if MACH_SUN8I_A83T
        default 3000 if MACH_SUN8I || MACH_SUN9I
        ---help---
@@ -183,7 +186,8 @@ config AXP_ALDO3_VOLT
        Set the voltage (mV) to program the axp pmic aldo3 at, set to 0 to
        disable aldo3.
        On A10(s) / A13 / A20 boards aldo3 should be 2.8V.
-       On A23 / A31 / A33 boards aldo3 is VCC-PLL and AVCC and should be 3.0V.
+       On A23 / A31 / A33 / R40 boards aldo3 is VCC-PLL and AVCC and should
+       be 3.0V.
        On A80 boards aldo3 is normally not used.
        On A83T / H8 boards aldo3 is AVCC, VCC-PL, and VCC-LED, and should be
        3.0V.