aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2013-10-03 11:12:37 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-03 18:47:31 -0400
commitb297c292900a78ca624d3bc30a7580565ae11def (patch)
tree606301cbe44ff6743787b0b04fda676cefaa4db7
parent470019a4c19f64626e336935114fe977b87eb99b (diff)
ARM: dts: omap5: update omap-control-usb node
Split USB2 PHY and USB3 PHY into separate omap-control-usb nodes. Get rid of "ti,type" property. CC: Benoit Cousson <bcousson@baylibre.com> Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/boot/dts/omap5.dtsi20
1 files changed, 12 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 7cdea1bfea09..c0ec6dce30fe 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -626,12 +626,16 @@
626 hw-caps-temp-alert; 626 hw-caps-temp-alert;
627 }; 627 };
628 628
629 omap_control_usb: omap-control-usb@4a002300 { 629 omap_control_usb2phy: control-phy@4a002300 {
630 compatible = "ti,omap-control-usb"; 630 compatible = "ti,control-phy-usb2";
631 reg = <0x4a002300 0x4>, 631 reg = <0x4a002300 0x4>;
632 <0x4a002370 0x4>; 632 reg-names = "power";
633 reg-names = "control_dev_conf", "phy_power_usb"; 633 };
634 ti,type = <2>; 634
635 omap_control_usb3phy: control-phy@4a002370 {
636 compatible = "ti,control-phy-pipe3";
637 reg = <0x4a002370 0x4>;
638 reg-names = "power";
635 }; 639 };
636 640
637 omap_dwc3@4a020000 { 641 omap_dwc3@4a020000 {
@@ -662,7 +666,7 @@
662 usb2_phy: usb2phy@4a084000 { 666 usb2_phy: usb2phy@4a084000 {
663 compatible = "ti,omap-usb2"; 667 compatible = "ti,omap-usb2";
664 reg = <0x4a084000 0x7c>; 668 reg = <0x4a084000 0x7c>;
665 ctrl-module = <&omap_control_usb>; 669 ctrl-module = <&omap_control_usb2phy>;
666 }; 670 };
667 671
668 usb3_phy: usb3phy@4a084400 { 672 usb3_phy: usb3phy@4a084400 {
@@ -671,7 +675,7 @@
671 <0x4a084800 0x64>, 675 <0x4a084800 0x64>,
672 <0x4a084c00 0x40>; 676 <0x4a084c00 0x40>;
673 reg-names = "phy_rx", "phy_tx", "pll_ctrl"; 677 reg-names = "phy_rx", "phy_tx", "pll_ctrl";
674 ctrl-module = <&omap_control_usb>; 678 ctrl-module = <&omap_control_usb3phy>;
675 }; 679 };
676 }; 680 };
677 681