target/linux/sunxi/patches-3.14/163-dt-sun4i-add-usb-host-to-boards.patch

   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
   5
   6 Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.
   7
   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>
  10
  11 Which also clashes with usbc0, which has:
  12 usb_drv_vbus_gpio = port:PB09<1><0><default><0>
  13
  14 So if usb does not work properly we need someone with a hackberry to look
  15 closer into this.
  16
  17 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  18 ---
  19  arch/arm/boot/dts/sun4i-a10-hackberry.dts | 40 +++++++++++++++++++++++++++++++
  20  1 file changed, 40 insertions(+)
  21
  22 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
  23 +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
  24 @@ -13,6 +13,7 @@
  25
  26  /dts-v1/;
  27  /include/ "sun4i-a10.dtsi"
  28 +/include/ "sunxi-common-regulators.dtsi"
  29
  30  / {
  31         model = "Miniand Hackberry";
  32 @@ -35,6 +36,28 @@
  33                         };
  34                 };
  35
  36 +               usbphy: phy@01c13400 {
  37 +                       usb1_vbus-supply = <&reg_usb1_vbus>;
  38 +                       usb2_vbus-supply = <&reg_usb2_vbus>;
  39 +                       status = "okay";
  40 +               };
  41 +
  42 +               ehci0: usb@01c14000 {
  43 +                       status = "okay";
  44 +               };
  45 +
  46 +               ohci0: usb@01c14400 {
  47 +                       status = "okay";
  48 +               };
  49 +
  50 +               ehci1: usb@01c1c000 {
  51 +                       status = "okay";
  52 +               };
  53 +
  54 +               ohci1: usb@01c1c400 {
  55 +                       status = "okay";
  56 +               };
  57 +
  58                 pio: pinctrl@01c20800 {
  59                         pinctrl-names = "default";
  60                         pinctrl-0 = <&hackberry_hogs>;
  61 @@ -45,6 +68,13 @@
  62                                 allwinner,drive = <0>;
  63                                 allwinner,pull = <0>;
  64                         };
  65 +
  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>;
  71 +                       };
  72                 };
  73
  74                 uart0: serial@01c28000 {
  75 @@ -66,4 +96,14 @@
  76                         gpio = <&pio 7 19 0>;
  77                 };
  78         };
  79 +
  80 +       reg_usb1_vbus: usb1-vbus {
  81 +               status = "okay";
  82 +       };
  83 +
  84 +       reg_usb2_vbus: usb2-vbus {
  85 +               pinctrl-0 = <&usb2_vbus_pin_hackberry>;
  86 +               gpio = <&pio 7 12 0>;
  87 +               status = "okay";
  88 +       };
  89  };
  90 --- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
  91 +++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
  92 @@ -13,16 +13,47 @@
  93
  94  /dts-v1/;
  95  /include/ "sun4i-a10.dtsi"
  96 +/include/ "sunxi-common-regulators.dtsi"
  97
  98  / {
  99         model = "PineRiver Mini X-Plus";
 100         compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10";
 101
 102         soc@01c00000 {
 103 +               usbphy: phy@01c13400 {
 104 +                       usb1_vbus-supply = <&reg_usb1_vbus>;
 105 +                       usb2_vbus-supply = <&reg_usb2_vbus>;
 106 +                       status = "okay";
 107 +               };
 108 +
 109 +               ehci0: usb@01c14000 {
 110 +                       status = "okay";
 111 +               };
 112 +
 113 +               ohci0: usb@01c14400 {
 114 +                       status = "okay";
 115 +               };
 116 +
 117 +               ehci1: usb@01c1c000 {
 118 +                       status = "okay";
 119 +               };
 120 +
 121 +               ohci1: usb@01c1c400 {
 122 +                       status = "okay";
 123 +               };
 124 +
 125                 uart0: serial@01c28000 {
 126                         pinctrl-names = "default";
 127                         pinctrl-0 = <&uart0_pins_a>;
 128                         status = "okay";
 129                 };
 130         };
 131 +
 132 +       reg_usb1_vbus: usb1-vbus {
 133 +               status = "okay";
 134 +       };
 135 +
 136 +       reg_usb2_vbus: usb2-vbus {
 137 +               status = "okay";
 138 +       };
 139  };
 140 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
 141 +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
 142 @@ -12,6 +12,7 @@
 143
 144  /dts-v1/;
 145  /include/ "sun4i-a10.dtsi"
 146 +/include/ "sunxi-common-regulators.dtsi"
 147
 148  / {
 149         model = "LinkSprite pcDuino";
 150 @@ -33,6 +34,28 @@
 151                         };
 152                 };
 153
 154 +               usbphy: phy@01c13400 {
 155 +                       usb1_vbus-supply = <&reg_usb1_vbus>;
 156 +                       usb2_vbus-supply = <&reg_usb2_vbus>;
 157 +                       status = "okay";
 158 +               };
 159 +
 160 +               ehci0: usb@01c14000 {
 161 +                       status = "okay";
 162 +               };
 163 +
 164 +               ohci0: usb@01c14400 {
 165 +                       status = "okay";
 166 +               };
 167 +
 168 +               ehci1: usb@01c1c000 {
 169 +                       status = "okay";
 170 +               };
 171 +
 172 +               ohci1: usb@01c1c400 {
 173 +                       status = "okay";
 174 +               };
 175 +
 176                 uart0: serial@01c28000 {
 177                         pinctrl-names = "default";
 178                         pinctrl-0 = <&uart0_pins_a>;
 179 @@ -45,4 +68,12 @@
 180                         status = "okay";
 181                 };
 182         };
 183 +
 184 +       reg_usb1_vbus: usb1-vbus {
 185 +               status = "okay";
 186 +       };
 187 +
 188 +       reg_usb2_vbus: usb2-vbus {
 189 +               status = "okay";
 190 +       };
 191  };
 192 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
 193 +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
 194 @@ -34,11 +34,33 @@
 195                         };
 196                 };
 197
 198 +               usbphy: phy@01c13400 {
 199 +                       usb1_vbus-supply = <&reg_usb1_vbus>;
 200 +                       usb2_vbus-supply = <&reg_usb2_vbus>;
 201 +                       status = "okay";
 202 +               };
 203 +
 204 +               ehci0: usb@01c14000 {
 205 +                       status = "okay";
 206 +               };
 207 +
 208 +               ohci0: usb@01c14400 {
 209 +                       status = "okay";
 210 +               };
 211 +
 212                 ahci: sata@01c18000 {
 213                         target-supply = <&reg_ahci_5v>;
 214                         status = "okay";
 215                 };
 216
 217 +               ehci1: usb@01c1c000 {
 218 +                       status = "okay";
 219 +               };
 220 +
 221 +               ohci1: usb@01c1c400 {
 222 +                       status = "okay";
 223 +               };
 224 +
 225                 pinctrl@01c20800 {
 226                         led_pins_cubieboard: led_pins@0 {
 227                                 allwinner,pins = "PH20", "PH21";
 228 @@ -87,4 +109,12 @@
 229         reg_ahci_5v: ahci-5v {
 230                 status = "okay";
 231         };
 232 +
 233 +       reg_usb1_vbus: usb1-vbus {
 234 +               status = "okay";
 235 +       };
 236 +
 237 +       reg_usb2_vbus: usb2-vbus {
 238 +               status = "okay";
 239 +       };
 240  };