Merge branch 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel into ti-lsk-linux-4.4.y

TI-Feature: ti_linux_base_lsk
TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.4.y

* 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  soc: ti: opp-domain: Make ti,absolute-max-voltage-uv mandatory
  ARM: dts: OMAP5: Switch to opp-v2 definitions
  ARM: dts: OMAP5: Move the cpu-opp-domain to SoC dtsi
  ARM: dts: omap5-cm-t54: Switch to opp-domain
  ARM: dts: omap5-board-common: Move the opp-domain definition to board-common dts
  ARM: dts: omap5-uevm: Remove voltage tolerance
  ARM: dts: DRA7/AM57x: Move cpu-opp-domain mapping to SoC map
  ARM: dts: dra72-evm-common: Get rid of voltage tolerance

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

12 files changed, 50 insertions, 55 deletions

diff --git a/Documentation/devicetree/bindings/opp/ti-omap5-opp-domain.txt b/Documentation/devicetree/bindings/opp/ti-omap5-opp-domain.txt
index c9ba3c6ba89f..aa31b16a1cd2 100644
--- a/Documentation/devicetree/bindings/opp/ti-omap5-opp-domain.txt
+++ b/Documentation/devicetree/bindings/opp/ti-omap5-opp-domain.txt
@@ -35,8 +35,6 @@ Required Properties:
         optimized efuse configuration. Each item consists of the following:
         volt: voltage in uV - reference voltage (OPP voltage)
         efuse_offseet: efuse offset from reg where the optimized voltage is stored.
-
-Optional Properties:
 - ti,absolute-max-voltage-uv: absolute maximum voltage for the OPP domain.
 
 Example:
@@ -63,6 +61,7 @@ oppdm_mpu: oppdm@4a003b20 {
         1160000 0x4
         1210000 0x8
         >;
+        ti,absolute-max-voltage-uv = <1500000>;
 };
 
 oppdm_core: oppdm@4a003d20 {
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index 78252b0c89c9..d2ddf6154d73 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -99,10 +99,6 @@
         cd-gpios = <&gpio6 27 0>; /* gpio 219 */
 };
 
-&cpu0 {
-        cpu-opp-domain = <&oppdm_mpu>;
-};
-
 &oppdm_mpu {
         vdd-supply = <&smps12_reg>;
 };
diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts
index 044082c919e9..442804030236 100644
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@ -447,10 +447,6 @@
         reset-delay-us = <2>;   /* PHY datasheet states 1uS min */
 };
 
-&cpu0 {
-        cpu-opp-domain = <&oppdm_mpu>;
-};
-
 &oppdm_mpu {
         vdd-supply = <&smps12_reg>;
 };
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index 4a8b83a12bb8..e9a98cce0401 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -533,10 +533,6 @@
        };
 };
 
-&cpu0 {
-        cpu-opp-domain = <&oppdm_mpu>;
-};
-
 &oppdm_mpu {
         vdd-supply = <&smps12_reg>;
 };
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index a0c41d16c920..5adcf9148644 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -919,10 +919,6 @@
         };
 };
 
-&cpu0 {
-        cpu-opp-domain = <&oppdm_mpu>;
-};
-
 &oppdm_mpu {
         vdd-supply = <&smps123_reg>;
 };
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index ad18b453411c..30f22e2f9bbc 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -82,6 +82,7 @@
                         reg = <0>;
 
                         operating-points-v2 = <&cpu0_opp_table>;
+                        cpu-opp-domain = <&oppdm_mpu>;
                         ti,syscon-efuse = <&scm_wkup 0x20c 0xf80000 19>;
                         ti,syscon-rev = <&scm_wkup 0x204>;
 
diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
index 65e91dd34616..7d75e171dd99 100644
--- a/arch/arm/boot/dts/dra72-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
@@ -709,11 +709,6 @@
         timers = <&timer5>;
 };
 
-&cpu0 {
-        cpu-opp-domain = <&oppdm_mpu>;
-        voltage-tolerance = <1>;
-};
-
 &oppdm_mpu {
         vdd-supply = <&smps1_reg>;
 };
diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index 87cbaab4d1b1..d4ce98d79520 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -707,10 +707,6 @@
         pinctrl-0 = <&uart5_pins>;
 };
 
-&cpu0 {
-        cpu0-supply = <&smps123_reg>;
-};
-
 &dss {
         status = "ok";
 };
@@ -729,3 +725,15 @@
                 };
         };
 };
+
+&oppdm_mpu {
+        vdd-supply = <&smps123_reg>;
+};
+
+&oppdm_mm {
+        vdd-supply = <&smps45_reg>;
+};
+
+&oppdm_core {
+        vdd-supply = <&smps6_reg>;
+};
diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts
index 3774b37be6c8..1eeafde57b76 100644
--- a/arch/arm/boot/dts/omap5-cm-t54.dts
+++ b/arch/arm/boot/dts/omap5-cm-t54.dts
@@ -635,8 +635,16 @@
        vbus-supply = <&smps10_out1_reg>;
 };
 
-&cpu0 {
-        cpu0-supply = <&smps123_reg>;
+&oppdm_mpu {
+        vdd-supply = <&smps123_reg>;
+};
+
+&oppdm_mm {
+        vdd-supply = <&smps45_reg>;
+};
+
+&oppdm_core {
+        vdd-supply = <&smps8_reg>;
 };
 
 &dss {
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index bcaba151620b..5903e7e2d294 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -66,23 +66,6 @@
         };
 };
 
-&cpu0 {
-        cpu-opp-domain = <&oppdm_mpu>;
-        voltage-tolerance = <1>;
-};
-
-&oppdm_mpu {
-        vdd-supply = <&smps123_reg>;
-};
-
-&oppdm_mm {
-        vdd-supply = <&smps45_reg>;
-};
-
-&oppdm_core {
-        vdd-supply = <&smps6_reg>;
-};
-
 &tpd12s015 {
         gpios = <&gpio9 0 GPIO_ACTIVE_HIGH>,    /* TCA6424A P01, CT CP HPD */
                 <&gpio9 1 GPIO_ACTIVE_HIGH>,    /* TCA6424A P00, LS OE */
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 50c59d447b9e..fb9c8fb1b5b2 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -45,11 +45,8 @@
                         compatible = "arm,cortex-a15";
                         reg = <0x0>;
 
-                        operating-points = <
-                                /* kHz    uV */
-                                1000000 1060000
-                                1500000 1250000
-                        >;
+                        operating-points-v2 = <&cpu0_opp_table>;
+                        cpu-opp-domain = <&oppdm_mpu>;
 
                         clocks = <&dpll_mpu_ck>;
                         clock-names = "cpu";
@@ -68,6 +65,22 @@
                 };
         };
 
+        cpu0_opp_table: opp_table0 {
+                compatible = "operating-points-v2";
+                opp-shared;
+
+                opp_nom@1000000000 {
+                        opp-hz = /bits/ 64 <1000000000>;
+                        opp-microvolt = <1060000 850000 1100000>;
+                        opp-suspend;
+                };
+
+                opp_high@1500000000 {
+                        opp-hz = /bits/ 64 <1500000000>;
+                        opp-microvolt = <1250000 850000 1250000>;
+                };
+        };
+
         thermal-zones {
                 #include "omap4-cpu-thermal.dtsi"
                 #include "omap5-gpu-thermal.dtsi"
diff --git a/drivers/soc/ti/ti-opp-domain.c b/drivers/soc/ti/ti-opp-domain.c
index 00eaca29a36d..10e16b560dc8 100644
--- a/drivers/soc/ti/ti-opp-domain.c
+++ b/drivers/soc/ti/ti-opp-domain.c
@@ -122,6 +122,14 @@ static int oppdm_store_optimized_voltages(struct device *dev,
                 goto out;
         }
 
+        ret = of_property_read_u32(dev->of_node, "ti,absolute-max-voltage-uv",
+                                   &data->vdd_absolute_max_voltage_uv);
+        if (ret) {
+                dev_err(dev, "ti,absolute-max-voltage-uv is missing\n");
+                ret = -EINVAL;
+                goto out;
+        }
+
         table = kzalloc(sizeof(*data->vdd_table) *
                                   data->num_vdd_table, GFP_KERNEL);
         if (!table) {
@@ -160,10 +168,6 @@ static int oppdm_store_optimized_voltages(struct device *dev,
                         table->optimized_uv = table->reference_uv;
                 }
         }
-
-        of_property_read_u32(dev->of_node, "ti,absolute-max-voltage-uv",
-                             &data->vdd_absolute_max_voltage_uv);
-
 out:
         iounmap(base);
 out_map: