* [PATCH RESEND] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi
@ 2014-08-07 15:44 Heiko Stübner
2014-08-09 15:22 ` Olof Johansson
0 siblings, 1 reply; 2+ messages in thread
From: Heiko Stübner @ 2014-08-07 15:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Doug Anderson <dianders@chromium.org>
The EHCI and HSIC device tree nodes were added in the wrong place.
Fix them.
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
Sorry for the double-post. I messed something up when sending the original
which made it look like it came from Doug instead of me.
Heiko
arch/arm/boot/dts/rk3288.dtsi | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index e7cb008..5950b0a 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -195,6 +195,26 @@
status = "disabled";
};
+ usb_host0_ehci: usb at ff500000 {
+ compatible = "generic-ehci";
+ reg = <0xff500000 0x100>;
+ interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru HCLK_USBHOST0>;
+ clock-names = "usbhost";
+ status = "disabled";
+ };
+
+ /* NOTE: ohci at ff520000 doesn't actually work on hardware */
+
+ usb_hsic: usb at ff5c0000 {
+ compatible = "generic-ehci";
+ reg = <0xff5c0000 0x100>;
+ interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru HCLK_HSIC>;
+ clock-names = "usbhost";
+ status = "disabled";
+ };
+
i2c0: i2c at ff650000 {
compatible = "rockchip,rk3288-i2c";
reg = <0xff650000 0x1000>;
@@ -251,26 +271,6 @@
status = "disabled";
};
- usb_host0_ehci: usb at ff500000 {
- compatible = "generic-ehci";
- reg = <0xff500000 0x100>;
- interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&cru HCLK_USBHOST0>;
- clock-names = "usbhost";
- status = "disabled";
- };
-
- /* NOTE: ohci at ff520000 doesn't actually work on hardware */
-
- usb_hsic: usb at ff5c0000 {
- compatible = "generic-ehci";
- reg = <0xff5c0000 0x100>;
- interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&cru HCLK_HSIC>;
- clock-names = "usbhost";
- status = "disabled";
- };
-
gic: interrupt-controller at ffc01000 {
compatible = "arm,gic-400";
interrupt-controller;
--
2.0.0.526.g5318336
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH RESEND] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi
2014-08-07 15:44 [PATCH RESEND] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi Heiko Stübner
@ 2014-08-09 15:22 ` Olof Johansson
0 siblings, 0 replies; 2+ messages in thread
From: Olof Johansson @ 2014-08-09 15:22 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Aug 07, 2014 at 05:44:19PM +0200, Heiko St?bner wrote:
> From: Doug Anderson <dianders@chromium.org>
>
> The EHCI and HSIC device tree nodes were added in the wrong place.
> Fix them.
>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
> Sorry for the double-post. I messed something up when sending the original
> which made it look like it came from Doug instead of me.
Applied, thanks.
-Olof
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-09 15:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-07 15:44 [PATCH RESEND] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi Heiko Stübner
2014-08-09 15:22 ` Olof Johansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.