From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Wed, 4 Nov 2015 12:56:07 +0000 (+0900)
Subject: ARM: dts: uniphier: add USB xHCI nodes for PH1-Pro5 and ProXstream2
X-Git-Tag: v2016.01-rc1~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2610b1362b7a6b7bb880d1aa4f7c960997305bc3;p=pandora-u-boot.git

ARM: dts: uniphier: add USB xHCI nodes for PH1-Pro5 and ProXstream2

This makes USB3.0 available on new SoCs/boards.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/arm/dts/uniphier-ph1-ld6b-ref.dts b/arch/arm/dts/uniphier-ph1-ld6b-ref.dts
index bd86f093264..ccadd817c06 100644
--- a/arch/arm/dts/uniphier-ph1-ld6b-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld6b-ref.dts
@@ -54,6 +54,14 @@
 	status = "okay";
 };
 
+&usb0 {
+	status = "okay";
+};
+
+&usb1 {
+	status = "okay";
+};
+
 /* for U-boot only */
 / {
 	soc {
diff --git a/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts b/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
index 912bc27beaa..52dd1f96b0c 100644
--- a/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
+++ b/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
@@ -44,6 +44,10 @@
 	status = "okay";
 };
 
+&usb1 {
+	status = "okay";
+};
+
 /* for U-boot only */
 / {
 	soc {
diff --git a/arch/arm/dts/uniphier-ph1-pro5.dtsi b/arch/arm/dts/uniphier-ph1-pro5.dtsi
index a15c7b21615..6f19bf81dce 100644
--- a/arch/arm/dts/uniphier-ph1-pro5.dtsi
+++ b/arch/arm/dts/uniphier-ph1-pro5.dtsi
@@ -210,6 +210,24 @@
 			reg = <0x60001000 0x1000>,
 			      <0x60000100 0x100>;
 		};
+
+		usb0: usb@65a00000 {
+			compatible = "socionext,uniphier-xhci", "generic-xhci";
+			status = "disabled";
+			reg = <0x65a00000 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb0>;
+			interrupts = <0 134 4>;
+		};
+
+		usb1: usb@65c00000 {
+			compatible = "socionext,uniphier-xhci", "generic-xhci";
+			status = "disabled";
+			reg = <0x65c00000 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb2>;
+			interrupts = <0 137 4>;
+		};
 	};
 };
 
diff --git a/arch/arm/dts/uniphier-proxstream2-gentil.dts b/arch/arm/dts/uniphier-proxstream2-gentil.dts
index 81d2385bf9a..d0af8acd370 100644
--- a/arch/arm/dts/uniphier-proxstream2-gentil.dts
+++ b/arch/arm/dts/uniphier-proxstream2-gentil.dts
@@ -42,6 +42,14 @@
 	status = "okay";
 };
 
+&usb0 {
+	status = "okay";
+};
+
+&usb1 {
+	status = "okay";
+};
+
 /* for U-boot only */
 / {
 	soc {
diff --git a/arch/arm/dts/uniphier-proxstream2-vodka.dts b/arch/arm/dts/uniphier-proxstream2-vodka.dts
index fba7b742ca6..92d74044c19 100644
--- a/arch/arm/dts/uniphier-proxstream2-vodka.dts
+++ b/arch/arm/dts/uniphier-proxstream2-vodka.dts
@@ -42,6 +42,10 @@
 	status = "okay";
 };
 
+&usb0 {
+	status = "okay";
+};
+
 /* for U-boot only */
 / {
 	soc {
diff --git a/arch/arm/dts/uniphier-proxstream2.dtsi b/arch/arm/dts/uniphier-proxstream2.dtsi
index 8b496a72107..cd0cf4e74bc 100644
--- a/arch/arm/dts/uniphier-proxstream2.dtsi
+++ b/arch/arm/dts/uniphier-proxstream2.dtsi
@@ -235,6 +235,24 @@
 			reg = <0x60001000 0x1000>,
 			      <0x60000100 0x100>;
 		};
+
+		usb0: usb@65a00000 {
+			compatible = "socionext,uniphier-xhci", "generic-xhci";
+			status = "disabled";
+			reg = <0x65a00000 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>;
+			interrupts = <0 134 4>;
+		};
+
+		usb1: usb@65c00000 {
+			compatible = "socionext,uniphier-xhci", "generic-xhci";
+			status = "disabled";
+			reg = <0x65c00000 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>;
+			interrupts = <0 137 4>;
+		};
 	};
 };