[U-Boot] [PATCH 1/2] ARM: dts: uniphier: fix interrupt number of USB core for PH1-Pro4
The IRQ is not used in U-boot, but this would be useful to sync device trees between Linux and U-boot.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/dts/uniphier-ph1-pro4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/uniphier-ph1-pro4.dtsi b/arch/arm/dts/uniphier-ph1-pro4.dtsi index a57f8ae..a11b628 100644 --- a/arch/arm/dts/uniphier-ph1-pro4.dtsi +++ b/arch/arm/dts/uniphier-ph1-pro4.dtsi @@ -221,7 +221,7 @@ reg = <0x65c00000 0x100>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1>; - interrupts = <0 135 4>; + interrupts = <0 137 4>; };
pinctrl: pinctrl@5f801000 {
This makes USB3.0 available on new SoCs/boards.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 8 ++++++++ arch/arm/dts/uniphier-ph1-pro5-4kbox.dts | 4 ++++ arch/arm/dts/uniphier-ph1-pro5.dtsi | 18 ++++++++++++++++++ arch/arm/dts/uniphier-proxstream2-gentil.dts | 8 ++++++++ arch/arm/dts/uniphier-proxstream2-vodka.dts | 4 ++++ arch/arm/dts/uniphier-proxstream2.dtsi | 18 ++++++++++++++++++ 6 files changed, 60 insertions(+)
diff --git a/arch/arm/dts/uniphier-ph1-ld6b-ref.dts b/arch/arm/dts/uniphier-ph1-ld6b-ref.dts index bd86f09..ccadd81 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 912bc27..52dd1f9 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 a15c7b2..6f19bf8 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 81d2385..d0af8ac 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 fba7b74..92d7404 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 8b496a7..cd0cf4e 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>; + }; }; };
On 4 November 2015 at 05:56, Masahiro Yamada yamada.masahiro@socionext.com wrote:
This makes USB3.0 available on new SoCs/boards.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 8 ++++++++ arch/arm/dts/uniphier-ph1-pro5-4kbox.dts | 4 ++++ arch/arm/dts/uniphier-ph1-pro5.dtsi | 18 ++++++++++++++++++ arch/arm/dts/uniphier-proxstream2-gentil.dts | 8 ++++++++ arch/arm/dts/uniphier-proxstream2-vodka.dts | 4 ++++ arch/arm/dts/uniphier-proxstream2.dtsi | 18 ++++++++++++++++++ 6 files changed, 60 insertions(+)
Reviewed-by: Simon Glass sjg@chromium.org
2015-11-04 21:56 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
This makes USB3.0 available on new SoCs/boards.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 8 ++++++++ arch/arm/dts/uniphier-ph1-pro5-4kbox.dts | 4 ++++ arch/arm/dts/uniphier-ph1-pro5.dtsi | 18 ++++++++++++++++++ arch/arm/dts/uniphier-proxstream2-gentil.dts | 8 ++++++++ arch/arm/dts/uniphier-proxstream2-vodka.dts | 4 ++++ arch/arm/dts/uniphier-proxstream2.dtsi | 18 ++++++++++++++++++ 6 files changed, 60 insertions(+)
Applied to u-boot-uniphier.
Hi Masahiro,
On Wed, Nov 4, 2015 at 8:56 PM, Masahiro Yamada yamada.masahiro@socionext.com wrote:
The IRQ is not used in U-boot, but this would be useful to sync device trees between Linux and U-boot.
Nits: U-boot -> U-Boot
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
arch/arm/dts/uniphier-ph1-pro4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/uniphier-ph1-pro4.dtsi b/arch/arm/dts/uniphier-ph1-pro4.dtsi index a57f8ae..a11b628 100644 --- a/arch/arm/dts/uniphier-ph1-pro4.dtsi +++ b/arch/arm/dts/uniphier-ph1-pro4.dtsi @@ -221,7 +221,7 @@ reg = <0x65c00000 0x100>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1>;
interrupts = <0 135 4>;
interrupts = <0 137 4>; }; pinctrl: pinctrl@5f801000 {--
Regards, Bin
Hi Bin,
2015-11-04 22:03 GMT+09:00 Bin Meng bmeng.cn@gmail.com:
Hi Masahiro,
On Wed, Nov 4, 2015 at 8:56 PM, Masahiro Yamada yamada.masahiro@socionext.com wrote:
The IRQ is not used in U-boot, but this would be useful to sync device trees between Linux and U-boot.
Nits: U-boot -> U-Boot
Thanks.
I will fix it when I apply this patch.
2015-11-05 0:32 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
Hi Bin,
2015-11-04 22:03 GMT+09:00 Bin Meng bmeng.cn@gmail.com:
Hi Masahiro,
On Wed, Nov 4, 2015 at 8:56 PM, Masahiro Yamada yamada.masahiro@socionext.com wrote:
The IRQ is not used in U-boot, but this would be useful to sync device trees between Linux and U-boot.
Nits: U-boot -> U-Boot
Thanks.
I will fix it when I apply this patch.
Applied to u-boot-uniphier/master, fixing U-boot -> U-Boot.
participants (3)
-
Bin Meng -
Masahiro Yamada -
Simon Glass