Commit a9465b58 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'sunxi-dt-h3-for-4.12' of...

Merge tag 'sunxi-dt-h3-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner H3 DT changes for 4.12

H3 patches for 4.12, which are mostly related to reworking the H3 DTSI to
be usable on the arm64 H5 DTSI, that shares almost everything with the H3
but the CPU cores.

We also have some new device addition (USB, mostly) that would conflict
otherwise.

* tag 'sunxi-dt-h3-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: sun8i: h2+: enable USB OTG for Orange Pi Zero board
  ARM: sun8i: h3: enable USB OTG on Orange Pi One
  ARM: sunxi: h3/h5: add usb_otg and OHCI/EHCI for usbc0 on H3/H5
  arm: sun8i: h3: split Allwinner H3 .dtsi
  arm: sun8i: h3: correct the GIC compatible in H3 to gic-400
  arm: sun8i: h3: drop pinctrl-a10.h inclusion for H3 DTSI
  arm: sun8i: h3: drop skeleton.dtsi inclusion in H3 DTSI
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ec4c22e7 72897fa3
...@@ -95,6 +95,10 @@ wifi_pwrseq: wifi_pwrseq { ...@@ -95,6 +95,10 @@ wifi_pwrseq: wifi_pwrseq {
}; };
}; };
&ehci0 {
status = "okay";
};
&ehci1 { &ehci1 {
status = "okay"; status = "okay";
}; };
...@@ -131,6 +135,10 @@ &mmc1_pins_a { ...@@ -131,6 +135,10 @@ &mmc1_pins_a {
bias-pull-up; bias-pull-up;
}; };
&ohci0 {
status = "okay";
};
&ohci1 { &ohci1 {
status = "okay"; status = "okay";
}; };
...@@ -153,7 +161,17 @@ &uart2 { ...@@ -153,7 +161,17 @@ &uart2 {
status = "disabled"; status = "disabled";
}; };
&usb_otg {
dr_mode = "peripheral";
status = "okay";
};
&usbphy { &usbphy {
/* USB VBUS is always on */ /*
* USB Type-A port VBUS is always on. However, MicroUSB VBUS can only
* power up the board; when it's used as OTG port, this VBUS is
* always off even if the board is powered via GPIO pins.
*/
status = "okay"; status = "okay";
usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
}; };
...@@ -89,6 +89,10 @@ sw4 { ...@@ -89,6 +89,10 @@ sw4 {
}; };
}; };
&ehci0 {
status = "okay";
};
&ehci1 { &ehci1 {
status = "okay"; status = "okay";
}; };
...@@ -103,6 +107,10 @@ &mmc0 { ...@@ -103,6 +107,10 @@ &mmc0 {
status = "okay"; status = "okay";
}; };
&ohci0 {
status = "okay";
};
&ohci1 { &ohci1 {
status = "okay"; status = "okay";
}; };
...@@ -126,6 +134,11 @@ sw_r_opc: key_pins@0 { ...@@ -126,6 +134,11 @@ sw_r_opc: key_pins@0 {
}; };
}; };
&reg_usb0_vbus {
gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */
status = "okay";
};
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pins_a>;
...@@ -150,7 +163,14 @@ &uart3 { ...@@ -150,7 +163,14 @@ &uart3 {
status = "disabled"; status = "disabled";
}; };
&usb_otg {
dr_mode = "otg";
status = "okay";
};
&usbphy { &usbphy {
/* USB VBUS is always on */ /* USB Type-A port's VBUS is always on */
usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
usb0_vbus-supply = <&reg_usb0_vbus>;
status = "okay"; status = "okay";
}; };
This diff is collapsed.
This diff is collapsed.
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