ARM: dts: omap36xx: using OPP1G needs to control the abb_ldo

See DM3730,DM275 data sheet (SPRS685B) footnote (6) in Table 4-19
which says that ABB must be switched to FBB mode when using the
OPP1G.

The LOD definition abb_mpu_iva already exists so that we need
to add plumbing for vbb-supply = <&abb_mpu_iva>
and define two voltage vectors for each OPP so that the abb LDO
is also updated by the ti-cpufreq driver.

We also must switch the ti_cpufreq_soc_data to multi_regulator.

Note: reading out the abb reglator voltage to verify that
it does do transitions can be done by

cat /sys/devices/platform/68000000.ocp/483072f0.regulator-abb-mpu/regulator/regulator.*/microvolts

Likewise, read the twl4030 provided VDD voltage by

cat /sys/devices/platform/68000000.ocp/48070000.i2c/i2c-0/0-0048/48070000.i2c:twl@48:regulator-vdd1/regulator/regulator.*/microvolts

Note: to check if the ABB FBB is enabled/disabled, check
registers

PRM_LDO_ABB_CTRL 0x483072F4 bit 3:0 1=bypass 5=FBB
PRM_LDO_ABB_SETUP 0x483072F0 0x00=bypass 0x11=FBB

e.g.

/dev/mem opened.
Memory mapped at address 0xb6fe4000.
Value at address 0x483072F4 (0xb6fe42f4): 0x3205
/dev/mem opened.
Memory mapped at address 0xb6f89000.
Value at address 0x483072F4 (0xb6f892f4): 0x3201

Note: omap34xx and am3517 have/need no comparable LDO
or mechanism.

Suggested-by: Adam Ford <aford173@gmail.com>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 2fcd0c5d72baa6c72e0c449a9eb794dc24a27250..c618cb257d00b3625bc6954c1deb1e39483ec503 100644 (file)
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -23,6 +23,7 @@
                cpu: cpu@0 {
                        operating-points-v2 = <&cpu0_opp_table>;
 
+                       vbb-supply = <&abb_mpu_iva>;
                        clock-latency = <300000>; /* From omap-cpufreq driver */
                };
        };
@@ -37,9 +38,11 @@
                        /*
                         * we currently only select the max voltage from table
                         * Table 4-19 of the DM3730 Data sheet (SPRS685B)
-                        * Format is: <target min max>
+                        * Format is:   cpu0-supply:    <target min max>
+                        *              vbb-supply:     <target min max>
                         */
-                       opp-microvolt = <1012500 1012500 1012500>;
+                       opp-microvolt = <1012500 1012500 1012500>,
+                                        <1012500 1012500 1012500>;
                        /*
                         * first value is silicon revision bit mask
                         * second one is "speed binned" bit mask
@@ -50,25 +53,33 @@
 
                opp100-600000000 {
                        opp-hz = /bits/ 64 <600000000>;
-                       opp-microvolt = <1200000 1200000 1200000>;
+                       opp-microvolt = <1200000 1200000 1200000>,
+                                        <1200000 1200000 1200000>;
                        opp-supported-hw = <0xffffffff 3>;
                };
 
                opp130-800000000 {
                        opp-hz = /bits/ 64 <800000000>;
-                       opp-microvolt = <1325000 1325000 1325000>;
+                       opp-microvolt = <1325000 1325000 1325000>,
+                                        <1325000 1325000 1325000>;
                        opp-supported-hw = <0xffffffff 3>;
                };
 
                opp1g-1000000000 {
                        opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <1375000 1375000 1375000>;
+                       opp-microvolt = <1375000 1375000 1375000>,
+                                        <1375000 1375000 1375000>;
                        /* only on am/dm37x with speed-binned bit set */
                        opp-supported-hw = <0xffffffff 2>;
                        turbo-mode;
                };
        };
 
+       opp_supply_mpu_iva: opp_supply {
+               compatible = "ti,omap-opp-supply";
+               ti,absolute-max-voltage-uv = <1375000>;
+       };
+
        ocp@68000000 {
                uart4: serial@49042000 {
                        compatible = "ti,omap3-uart";

diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c
index a161098652e2c048bc260826ad5a26419f247472..c7e5d3d431188c4dfa7a893c50fa4c3d2d0bfccd 100644 (file)
--- a/drivers/cpufreq/ti-cpufreq.c
+++ b/drivers/cpufreq/ti-cpufreq.c
@@ -175,7 +175,7 @@ static struct ti_cpufreq_soc_data omap36xx_soc_data = {
        .efuse_shift = 9,
        .efuse_mask = BIT(9),
        .rev_offset = OMAP3_CONTROL_IDCODE - OMAP3_SYSCON_BASE,
-       .multi_regulator = false,
+       .multi_regulator = true,
 };
 
 /**