From patchwork Thu Jul 31 22:49:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4659501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E8EB5C0338 for ; Thu, 31 Jul 2014 22:52:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 086A720149 for ; Thu, 31 Jul 2014 22:52:09 +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 405BF2012E for ; Thu, 31 Jul 2014 22:52:08 +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 1XCzAq-0002oh-39; Thu, 31 Jul 2014 22:50:12 +0000 Received: from mail-oa0-f74.google.com ([209.85.219.74]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCzAn-0001hg-7t for linux-arm-kernel@lists.infradead.org; Thu, 31 Jul 2014 22:50:09 +0000 Received: by mail-oa0-f74.google.com with SMTP id eb12so991717oac.1 for ; Thu, 31 Jul 2014 15:49:46 -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=MjPm6qT+6B6gb11cogtTpcddU0gO6XTlsGsVhKFTIoc=; b=KWgox8ufKMLQtT/4m1Udig31bkjk3h7P90BJJg3Zz8HV5EgJUW+MagNF/iqI+DVM6I GuDQRM9hjQD04e7bTYIJBcMuNyEf5SGGLE758X5oMFIYAvrHe6MKmGUBZsMyfoIyKa7h aF25VoRMhT8+baTy2hhbi8+5xN+KZe0nmy1yHILE0IGh7rcKWH/Odr6YNNEtsUOGFfJ/ HTScn0IJb2SN2R4vUQNsUaIcW7+HGfKez1te91G4ZtmAO59KEFgtyHQAL57zgIeUkekB nls1lNCuz/pHSZGDF3xL9n5PIudbHklicWU8OjRszwe+/YLnMa7Tz1cgAqGR5rgxl+lo LZGA== X-Gm-Message-State: ALoCoQmO6iFX+W7ojZ9W/iHlaue/Se70yz1FhoFx0UyGEb39UEvU3DEiPqWr7yCpmVp2Ed/up9w4 X-Received: by 10.182.123.163 with SMTP id mb3mr621072obb.32.1406846986360; Thu, 31 Jul 2014 15:49:46 -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 v20si434271yhe.2.2014.07.31.15.49.46 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Jul 2014 15:49:46 -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 A965531C544; Thu, 31 Jul 2014 15:49:45 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 47122808E3; Thu, 31 Jul 2014 15:49:45 -0700 (PDT) From: Doug Anderson To: heiko@sntech.de, Paul Zimmerman , kever.yang@rock-chips.com Subject: [PATCH v4 4/5] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi Date: Thu, 31 Jul 2014 15:49:35 -0700 Message-Id: <1406846976-23127-4-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-20140731_155009_339483_96151B72 X-CRM114-Status: GOOD ( 11.32 ) 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, Doug Anderson , linux-kernel@vger.kernel.org, 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 --- Changes in v4: - Based on the proper patch Changes in v3: - EHCI and HSIC move new for version 3. arch/arm/boot/dts/rk3288.dtsi | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 9713054..49c99f2 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -156,6 +156,17 @@ 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_host1: usb@ff540000 { compatible = "rockchip,rk3288-usb", "rockchip,rk3066-usb", "snps,dwc2"; @@ -176,6 +187,15 @@ status = "disabled"; }; + usb_hsic: usb@ff5c0000 { + compatible = "generic-ehci"; + reg = <0xff5c0000 0x100>; + interrupts = ; + clocks = <&cru HCLK_HSIC>; + clock-names = "usbhost"; + status = "disabled"; + }; + uart2: serial@ff690000 { compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart"; reg = <0xff690000 0x100>; @@ -270,27 +290,6 @@ interrupts = ; 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;