1 From f2509ec45a09013e300460a967f694561d169b98 Mon Sep 17 00:00:00 2001
2 From: Hans de Goede <hdegoede@redhat.com>
3 Date: Sat, 11 Jan 2014 04:47:38 +0100
4 Subject: [PATCH] ARM: sun4i: dt: Add USB host nodes to hackberry dts
6 Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.
8 Based on fex file settings, the fex file also contains a mysterious line:
9 usb_hub_vcc_en_gpio = port:PB09<1><0><default><0>
11 Which also clashes with usbc0, which has:
12 usb_drv_vbus_gpio = port:PB09<1><0><default><0>
14 So if usb does not work properly we need someone with a hackberry to look
17 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
19 arch/arm/boot/dts/sun4i-a10-hackberry.dts | 40 +++++++++++++++++++++++++++++++
20 1 file changed, 40 insertions(+)
22 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
23 +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
27 /include/ "sun4i-a10.dtsi"
28 +/include/ "sunxi-common-regulators.dtsi"
31 model = "Miniand Hackberry";
36 + usbphy: phy@01c13400 {
37 + usb1_vbus-supply = <®_usb1_vbus>;
38 + usb2_vbus-supply = <®_usb2_vbus>;
42 + ehci0: usb@01c14000 {
46 + ohci0: usb@01c14400 {
50 + ehci1: usb@01c1c000 {
54 + ohci1: usb@01c1c400 {
58 pio: pinctrl@01c20800 {
59 pinctrl-names = "default";
60 pinctrl-0 = <&hackberry_hogs>;
62 allwinner,drive = <0>;
66 + usb2_vbus_pin_hackberry: usb2_vbus_pin@0 {
67 + allwinner,pins = "PH12";
68 + allwinner,function = "gpio_out";
69 + allwinner,drive = <0>;
70 + allwinner,pull = <0>;
74 uart0: serial@01c28000 {
80 + reg_usb1_vbus: usb1-vbus {
84 + reg_usb2_vbus: usb2-vbus {
85 + pinctrl-0 = <&usb2_vbus_pin_hackberry>;
86 + gpio = <&pio 7 12 0>;
90 --- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
91 +++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
95 /include/ "sun4i-a10.dtsi"
96 +/include/ "sunxi-common-regulators.dtsi"
99 model = "PineRiver Mini X-Plus";
100 compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10";
103 + usbphy: phy@01c13400 {
104 + usb1_vbus-supply = <®_usb1_vbus>;
105 + usb2_vbus-supply = <®_usb2_vbus>;
109 + ehci0: usb@01c14000 {
113 + ohci0: usb@01c14400 {
117 + ehci1: usb@01c1c000 {
121 + ohci1: usb@01c1c400 {
125 uart0: serial@01c28000 {
126 pinctrl-names = "default";
127 pinctrl-0 = <&uart0_pins_a>;
132 + reg_usb1_vbus: usb1-vbus {
136 + reg_usb2_vbus: usb2-vbus {
140 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
141 +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
145 /include/ "sun4i-a10.dtsi"
146 +/include/ "sunxi-common-regulators.dtsi"
149 model = "LinkSprite pcDuino";
154 + usbphy: phy@01c13400 {
155 + usb1_vbus-supply = <®_usb1_vbus>;
156 + usb2_vbus-supply = <®_usb2_vbus>;
160 + ehci0: usb@01c14000 {
164 + ohci0: usb@01c14400 {
168 + ehci1: usb@01c1c000 {
172 + ohci1: usb@01c1c400 {
176 uart0: serial@01c28000 {
177 pinctrl-names = "default";
178 pinctrl-0 = <&uart0_pins_a>;
184 + reg_usb1_vbus: usb1-vbus {
188 + reg_usb2_vbus: usb2-vbus {
192 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
193 +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
198 + usbphy: phy@01c13400 {
199 + usb1_vbus-supply = <®_usb1_vbus>;
200 + usb2_vbus-supply = <®_usb2_vbus>;
204 + ehci0: usb@01c14000 {
208 + ohci0: usb@01c14400 {
212 ahci: sata@01c18000 {
213 target-supply = <®_ahci_5v>;
217 + ehci1: usb@01c1c000 {
221 + ohci1: usb@01c1c400 {
226 led_pins_cubieboard: led_pins@0 {
227 allwinner,pins = "PH20", "PH21";
229 reg_ahci_5v: ahci-5v {
233 + reg_usb1_vbus: usb1-vbus {
237 + reg_usb2_vbus: usb2-vbus {