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

[linux-2.6-microblaze.git] / arch / arm / boot / dts / omap5.dtsi

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 4c04389..b24f37e 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -391,6 +391,8 @@
                        #address-cells = <2>;
                        #size-cells = <1>;
                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                       dmas = <&sdma 4>;
+                       dma-names = "rxtx";
                        gpmc,num-cs = <8>;
                        gpmc,num-waitpins = <4>;
                        ti,hwmods = "gpmc";
@@ -850,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";
@@ -897,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>;
@@ -909,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>;
@@ -965,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";
@@ -987,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>;