Commit 975d963e authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Greg Kroah-Hartman

ARM: dts: omap: update usb_otg_hs data

Updated the usb_otg_hs dt data to include the *phy* and *phy-names*
binding in order for the driver to use the new generic PHY framework.
Also updated the Documentation to include the binding information.
The PHY binding information can be found at
Documentation/devicetree/bindings/phy/phy-bindings.txt
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c27f939
...@@ -19,6 +19,9 @@ OMAP MUSB GLUE ...@@ -19,6 +19,9 @@ OMAP MUSB GLUE
- power : Should be "50". This signifies the controller can supply up to - power : Should be "50". This signifies the controller can supply up to
100mA when operating in host mode. 100mA when operating in host mode.
- usb-phy : the phandle for the PHY device - usb-phy : the phandle for the PHY device
- phys : the phandle for the PHY device (used by generic PHY framework)
- phy-names : the names of the PHY corresponding to the PHYs present in the
*phy* phandle.
Optional properties: Optional properties:
- ctrl-module : phandle of the control module this glue uses to write to - ctrl-module : phandle of the control module this glue uses to write to
...@@ -33,6 +36,8 @@ usb_otg_hs: usb_otg_hs@4a0ab000 { ...@@ -33,6 +36,8 @@ usb_otg_hs: usb_otg_hs@4a0ab000 {
num-eps = <16>; num-eps = <16>;
ram-bits = <12>; ram-bits = <12>;
ctrl-module = <&omap_control_usb>; ctrl-module = <&omap_control_usb>;
phys = <&usb2_phy>;
phy-names = "usb2-phy";
}; };
Board specific device node entry Board specific device node entry
......
...@@ -5,6 +5,8 @@ OMAP USB2 PHY ...@@ -5,6 +5,8 @@ OMAP USB2 PHY
Required properties: Required properties:
- compatible: Should be "ti,omap-usb2" - compatible: Should be "ti,omap-usb2"
- reg : Address and length of the register set for the device. - reg : Address and length of the register set for the device.
- #phy-cells: determine the number of cells that should be given in the
phandle while referencing this phy.
Optional properties: Optional properties:
- ctrl-module : phandle of the control module used by PHY driver to power on - ctrl-module : phandle of the control module used by PHY driver to power on
...@@ -16,6 +18,7 @@ usb2phy@4a0ad080 { ...@@ -16,6 +18,7 @@ usb2phy@4a0ad080 {
compatible = "ti,omap-usb2"; compatible = "ti,omap-usb2";
reg = <0x4a0ad080 0x58>; reg = <0x4a0ad080 0x58>;
ctrl-module = <&omap_control_usb>; ctrl-module = <&omap_control_usb>;
#phy-cells = <0>;
}; };
OMAP USB3 PHY OMAP USB3 PHY
...@@ -25,6 +28,8 @@ Required properties: ...@@ -25,6 +28,8 @@ Required properties:
- reg : Address and length of the register set for the device. - reg : Address and length of the register set for the device.
- reg-names: The names of the register addresses corresponding to the registers - reg-names: The names of the register addresses corresponding to the registers
filled in "reg". filled in "reg".
- #phy-cells: determine the number of cells that should be given in the
phandle while referencing this phy.
Optional properties: Optional properties:
- ctrl-module : phandle of the control module used by PHY driver to power on - ctrl-module : phandle of the control module used by PHY driver to power on
...@@ -39,4 +44,5 @@ usb3phy@4a084400 { ...@@ -39,4 +44,5 @@ usb3phy@4a084400 {
<0x4a084c00 0x40>; <0x4a084c00 0x40>;
reg-names = "phy_rx", "phy_tx", "pll_ctrl"; reg-names = "phy_rx", "phy_tx", "pll_ctrl";
ctrl-module = <&omap_control_usb>; ctrl-module = <&omap_control_usb>;
#phy-cells = <0>;
}; };
...@@ -144,6 +144,8 @@ &twl_gpio { ...@@ -144,6 +144,8 @@ &twl_gpio {
&usb_otg_hs { &usb_otg_hs {
interface-type = <0>; interface-type = <0>;
usb-phy = <&usb2_phy>; usb-phy = <&usb2_phy>;
phys = <&usb2_phy>;
phy-names = "usb2-phy";
mode = <3>; mode = <3>;
power = <50>; power = <50>;
}; };
......
...@@ -70,6 +70,8 @@ &twl_gpio { ...@@ -70,6 +70,8 @@ &twl_gpio {
&usb_otg_hs { &usb_otg_hs {
interface-type = <0>; interface-type = <0>;
usb-phy = <&usb2_phy>; usb-phy = <&usb2_phy>;
phys = <&usb2_phy>;
phy-names = "usb2-phy";
mode = <3>; mode = <3>;
power = <50>; power = <50>;
}; };
...@@ -76,6 +76,8 @@ &twl_gpio { ...@@ -76,6 +76,8 @@ &twl_gpio {
&usb_otg_hs { &usb_otg_hs {
interface-type = <0>; interface-type = <0>;
usb-phy = <&usb2_phy>; usb-phy = <&usb2_phy>;
phys = <&usb2_phy>;
phy-names = "usb2-phy";
mode = <3>; mode = <3>;
power = <50>; power = <50>;
}; };
......
...@@ -520,6 +520,7 @@ usb2_phy: usb2phy@4a0ad080 { ...@@ -520,6 +520,7 @@ usb2_phy: usb2phy@4a0ad080 {
compatible = "ti,omap-usb2"; compatible = "ti,omap-usb2";
reg = <0x4a0ad080 0x58>; reg = <0x4a0ad080 0x58>;
ctrl-module = <&omap_control_usb>; ctrl-module = <&omap_control_usb>;
#phy-cells = <0>;
}; };
}; };
...@@ -658,6 +659,8 @@ usb_otg_hs: usb_otg_hs@4a0ab000 { ...@@ -658,6 +659,8 @@ usb_otg_hs: usb_otg_hs@4a0ab000 {
interrupt-names = "mc", "dma"; interrupt-names = "mc", "dma";
ti,hwmods = "usb_otg_hs"; ti,hwmods = "usb_otg_hs";
usb-phy = <&usb2_phy>; usb-phy = <&usb2_phy>;
phys = <&usb2_phy>;
phy-names = "usb2-phy";
multipoint = <1>; multipoint = <1>;
num-eps = <16>; num-eps = <16>;
ram-bits = <12>; ram-bits = <12>;
......
...@@ -86,6 +86,7 @@ usb2_phy: twl4030-usb { ...@@ -86,6 +86,7 @@ usb2_phy: twl4030-usb {
usb1v8-supply = <&vusb1v8>; usb1v8-supply = <&vusb1v8>;
usb3v1-supply = <&vusb3v1>; usb3v1-supply = <&vusb3v1>;
usb_mode = <1>; usb_mode = <1>;
#phy-cells = <0>;
}; };
twl_pwm: pwm { twl_pwm: pwm {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment