From patchwork Mon Aug 4 20:24:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4673721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4E1239F373 for ; Mon, 4 Aug 2014 20:26:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 807702013A for ; Mon, 4 Aug 2014 20:26:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A4F512012D for ; Mon, 4 Aug 2014 20:26:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XEOof-0004Da-PA; Mon, 04 Aug 2014 20:25:09 +0000 Received: from mail-ob0-f202.google.com ([209.85.214.202]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XEOoc-00031H-JI for linux-arm-kernel@lists.infradead.org; Mon, 04 Aug 2014 20:25:07 +0000 Received: by mail-ob0-f202.google.com with SMTP id wp18so2038874obc.1 for ; Mon, 04 Aug 2014 13:24:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Mjtb2/WwXYcOP5fkWjh2T/XD4XzJ0jic5ag6CJg5rlk=; b=RSQl2SLLTeykXib0zqhzjqbueNZfAF0NtOZXi5LhNeoxhAe78N0hhb88lZ4cENCq96 shSkbbSuJkBjzDFNVJWvq5xCGn7rpMosxEngC2NPsmFwzVnc72OAF3ofk0+FVFLY5rxE j7xFyuAzwNunCRqo+/bdnVKIEcqOS+6sPDDvuZwBe5U4nG/Lo2RPji5hd8/uWFT80Bwz W8qLl4EUuOqZ0htx7QdS2jYzLQTvDSV6e8nquJGUCHjRXEojWTlKyUH+okuNebRXzxr7 r//HNTkYuaI594oV3GSQOA5et3rDhF9e404EP7Yhe77pQHHf//Msq6ViVsOKWjV9Vr9L 2AAg== X-Gm-Message-State: ALoCoQk02/mixTLisoYD/aNiUVYBMXkZdUgFKSMJsmQGS1JTRMYqeecpPfz3CmIz8nuB0P6H7VGt X-Received: by 10.182.105.230 with SMTP id gp6mr10649947obb.18.1407183883969; Mon, 04 Aug 2014 13:24:43 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id v44si1102130yhv.0.2014.08.04.13.24.43 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Aug 2014 13:24:43 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.15]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id C905C31C1A0; Mon, 4 Aug 2014 13:24:43 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 64C0580539; Mon, 4 Aug 2014 13:24:43 -0700 (PDT) From: Doug Anderson To: heiko@sntech.de Subject: [PATCH] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi Date: Mon, 4 Aug 2014 13:24:38 -0700 Message-Id: <1407183878-17734-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140804_132506_696008_89421FC2 X-CRM114-Status: GOOD ( 12.70 ) X-Spam-Score: 0.3 (/) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux@arm.linux.org.uk, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, linux-kernel@vger.kernel.org, kever.yang@rock-chips.com, Doug Anderson , robh+dt@kernel.org, galak@codeaurora.org, olof@lixom.net, Sonny Rao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY,URIBL_BLACK autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The EHCI and HSIC device tree nodes were added in the wrong place. Fix them. Signed-off-by: Doug Anderson Signed-off-by: Kever Yang --- I split this out from Kever's series so it can land. The merge conflict with his patch shouldn't be too hard to resolve. Sorry for messing up the sort order when I originally sent out the USB patches. :( 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@ff500000 { + compatible = "generic-ehci"; + reg = <0xff500000 0x100>; + interrupts = ; + clocks = <&cru HCLK_USBHOST0>; + clock-names = "usbhost"; + status = "disabled"; + }; + + /* NOTE: ohci@ff520000 doesn't actually work on hardware */ + + usb_hsic: usb@ff5c0000 { + compatible = "generic-ehci"; + reg = <0xff5c0000 0x100>; + interrupts = ; + clocks = <&cru HCLK_HSIC>; + clock-names = "usbhost"; + status = "disabled"; + }; + i2c0: i2c@ff650000 { compatible = "rockchip,rk3288-i2c"; reg = <0xff650000 0x1000>; @@ -251,26 +271,6 @@ status = "disabled"; }; - usb_host0_ehci: usb@ff500000 { - compatible = "generic-ehci"; - reg = <0xff500000 0x100>; - interrupts = ; - clocks = <&cru HCLK_USBHOST0>; - clock-names = "usbhost"; - status = "disabled"; - }; - - /* NOTE: ohci@ff520000 doesn't actually work on hardware */ - - usb_hsic: usb@ff5c0000 { - compatible = "generic-ehci"; - reg = <0xff5c0000 0x100>; - interrupts = ; - clocks = <&cru HCLK_HSIC>; - clock-names = "usbhost"; - status = "disabled"; - }; - gic: interrupt-controller@ffc01000 { compatible = "arm,gic-400"; interrupt-controller;