ARM: dts: am4372/dra7/omap5: Use "syscon-phy-power" instead of "ctrl-module"

Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
property from SATA and USB PHY node. Also remove the unused control
module dt nodes.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index df955ba..38790a3 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -896,18 +896,6 @@
                        status = "disabled";
                };
 
-               am43xx_control_usb2phy1: control-phy@44e10620 {
-                       compatible = "ti,control-phy-usb2-am437";
-                       reg = <0x44e10620 0x4>;
-                       reg-names = "power";
-               };
-
-               am43xx_control_usb2phy2: control-phy@0x44e10628 {
-                       compatible = "ti,control-phy-usb2-am437";
-                       reg = <0x44e10628 0x4>;
-                       reg-names = "power";
-               };
-
                ocp2scp0: ocp2scp@483a8000 {
                        compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
                        #address-cells = <1>;
@@ -918,7 +906,7 @@
                        usb2_phy1: phy@483a8000 {
                                compatible = "ti,am437x-usb2";
                                reg = <0x483a8000 0x8000>;
-                               ctrl-module = <&am43xx_control_usb2phy1>;
+                               syscon-phy-power = <&scm_conf 0x620>;
                                clocks = <&usb_phy0_always_on_clk32k>,
                                         <&usb_otg_ss0_refclk960m>;
                                clock-names = "wkupclk", "refclk";
@@ -937,7 +925,7 @@
                        usb2_phy2: phy@483e8000 {
                                compatible = "ti,am437x-usb2";
                                reg = <0x483e8000 0x8000>;
-                               ctrl-module = <&am43xx_control_usb2phy2>;
+                               syscon-phy-power = <&scm_conf 0x628>;
                                clocks = <&usb_phy1_always_on_clk32k>,
                                         <&usb_otg_ss1_refclk960m>;
                                clock-names = "wkupclk", "refclk";

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 4ea9032..3d1426b 100644 (file)
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1173,14 +1173,6 @@
                        status = "disabled";
                };
 
-               omap_control_sata: control-phy@4a002374 {
-                       compatible = "ti,control-phy-pipe3";
-                       reg = <0x4a002374 0x4>;
-                       reg-names = "power";
-                       clocks = <&sys_clkin1>;
-                       clock-names = "sysclk";
-               };
-
                /* OCP2SCP3 */
                ocp2scp@4a090000 {
                        compatible = "ti,omap-ocp2scp";
@@ -1195,7 +1187,7 @@
                                      <0x4A096400 0x64>, /* phy_tx */
                                      <0x4A096800 0x40>; /* pll_ctrl */
                                reg-names = "phy_rx", "phy_tx", "pll_ctrl";
-                               ctrl-module = <&omap_control_sata>;
+                               syscon-phy-power = <&scm_conf 0x374>;
                                clocks = <&sys_clkin1>, <&sata_ref_clk>;
                                clock-names = "sysclk", "refclk";
                                syscon-pllreset = <&scm_conf 0x3fc>;
@@ -1263,24 +1255,6 @@
                        clocks = <&sys_32k_ck>;
                };
 
-               omap_control_usb2phy1: control-phy@4a002300 {
-                       compatible = "ti,control-phy-usb2";
-                       reg = <0x4a002300 0x4>;
-                       reg-names = "power";
-               };
-
-               omap_control_usb3phy1: control-phy@4a002370 {
-                       compatible = "ti,control-phy-pipe3";
-                       reg = <0x4a002370 0x4>;
-                       reg-names = "power";
-               };
-
-               omap_control_usb2phy2: control-phy@0x4a002e74 {
-                       compatible = "ti,control-phy-usb2-dra7";
-                       reg = <0x4a002e74 0x4>;
-                       reg-names = "power";
-               };
-
                /* OCP2SCP1 */
                ocp2scp@4a080000 {
                        compatible = "ti,omap-ocp2scp";
@@ -1293,7 +1267,7 @@
                        usb2_phy1: phy@4a084000 {
                                compatible = "ti,omap-usb2";
                                reg = <0x4a084000 0x400>;
-                               ctrl-module = <&omap_control_usb2phy1>;
+                               syscon-phy-power = <&scm_conf 0x300>;
                                clocks = <&usb_phy1_always_on_clk32k>,
                                         <&usb_otg_ss1_refclk960m>;
                                clock-names =   "wkupclk",
@@ -1305,7 +1279,7 @@
                                compatible = "ti,dra7x-usb2-phy2",
                                             "ti,omap-usb2";
                                reg = <0x4a085000 0x400>;
-                               ctrl-module = <&omap_control_usb2phy2>;
+                               syscon-phy-power = <&scm_conf 0xe74>;
                                clocks = <&usb_phy2_always_on_clk32k>,
                                         <&usb_otg_ss2_refclk960m>;
                                clock-names =   "wkupclk",
@@ -1319,7 +1293,7 @@
                                      <0x4a084800 0x64>,
                                      <0x4a084c00 0x40>;
                                reg-names = "phy_rx", "phy_tx", "pll_ctrl";
-                               ctrl-module = <&omap_control_usb3phy1>;
+                               syscon-phy-power = <&scm_conf 0x370>;
                                clocks = <&usb_phy3_always_on_clk32k>,
                                         <&sys_clkin1>,
                                         <&usb_otg_ss1_refclk960m>;

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index ca3c17f..b24f37e 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -852,18 +852,6 @@
                        hw-caps-temp-alert;
                };
 
-               omap_control_usb2phy: control-phy@4a002300 {
-                       compatible = "ti,control-phy-usb2";
-                       reg = <0x4a002300 0x4>;
-                       reg-names = "power";
-               };
-
-               omap_control_usb3phy: control-phy@4a002370 {
-                       compatible = "ti,control-phy-pipe3";
-                       reg = <0x4a002370 0x4>;
-                       reg-names = "power";
-               };
-
                usb3: omap_dwc3@4a020000 {
                        compatible = "ti,dwc3";
                        ti,hwmods = "usb_otg_ss";
@@ -899,7 +887,7 @@
                        usb2_phy: usb2phy@4a084000 {
                                compatible = "ti,omap-usb2";
                                reg = <0x4a084000 0x7c>;
-                               ctrl-module = <&omap_control_usb2phy>;
+                               syscon-phy-power = <&scm_conf 0x300>;
                                clocks = <&usb_phy_cm_clk32k>, <&usb_otg_ss_refclk960m>;
                                clock-names = "wkupclk", "refclk";
                                #phy-cells = <0>;
@@ -911,7 +899,7 @@
                                      <0x4a084800 0x64>,
                                      <0x4a084c00 0x40>;
                                reg-names = "phy_rx", "phy_tx", "pll_ctrl";
-                               ctrl-module = <&omap_control_usb3phy>;
+                               syscon-phy-power = <&scm_conf 0x370>;
                                clocks = <&usb_phy_cm_clk32k>,
                                         <&sys_clkin>,
                                         <&usb_otg_ss_refclk960m>;
@@ -967,14 +955,6 @@
                        #thermal-sensor-cells = <1>;
                };
 
-               omap_control_sata: control-phy@4a002374 {
-                       compatible = "ti,control-phy-pipe3";
-                       reg = <0x4a002374 0x4>;
-                       reg-names = "power";
-                       clocks = <&sys_clkin>;
-                       clock-names = "sysclk";
-               };
-
                /* OCP2SCP3 */
                ocp2scp@4a090000 {
                        compatible = "ti,omap-ocp2scp";
@@ -989,7 +969,7 @@
                                      <0x4A096400 0x64>, /* phy_tx */
                                      <0x4A096800 0x40>; /* pll_ctrl */
                                reg-names = "phy_rx", "phy_tx", "pll_ctrl";
-                               ctrl-module = <&omap_control_sata>;
+                               syscon-phy-power = <&scm_conf 0x374>;
                                clocks = <&sys_clkin>, <&sata_ref_clk>;
                                clock-names = "sysclk", "refclk";
                                #phy-cells = <0>;