From patchwork Thu Jul 31 21:26:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 4659081 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 6AFEEC0338 for ; Thu, 31 Jul 2014 21:29:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8F9072015E for ; Thu, 31 Jul 2014 21:29:49 +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 B5525200FF for ; Thu, 31 Jul 2014 21:29:48 +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 1XCxss-0007Ba-05; Thu, 31 Jul 2014 21:27:34 +0000 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCxsT-0006xx-If for linux-arm-kernel@lists.infradead.org; Thu, 31 Jul 2014 21:27:10 +0000 Received: by mail-pa0-f65.google.com with SMTP id kx10so2425783pab.8 for ; Thu, 31 Jul 2014 14:26:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=VicR98GX8xkxyky4jZZLy/PaBsxVwAaa/88J9xRHLs0=; b=W6VXzMVlhUqKj2omlT9N2Y62tffvY7ncqAqsn8UcY0EuU+Fmbyo+DS9m885I6lY4XQ QF9RsIGEXIGhkpGLraiNL31vvmhWygShFiMORtfEn5Dom9OB3HPhnJ+OweI3pt5bdCPR BE5KSMAk9Ho+jXHoUG/yT8KLCBlyniXOgnqKUaZzOuq/mPR+5J5Xv+ZGbBf/OHv/zZYA u5jaAKXxUOxKpYmsTipNu/MQ9vDsavF0Y19NnGwigQTrYOQZ3ZX2yfec2fGWG3cKuXC0 ZGG5H67uGz7HqvUtK1PieGHp7TCJDpT/YbXPuPCsgy/HVhpudPOCq7bMAvFqCY/jXGyj F6PA== X-Received: by 10.68.69.8 with SMTP id a8mr900871pbu.165.1406842008331; Thu, 31 Jul 2014 14:26:48 -0700 (PDT) Received: from lab2000-1.corp.google.com (dhcp-172-22-52-196.mtv.corp.google.com [172.22.52.196]) by mx.google.com with ESMTPSA id ri2sm9829277pdb.25.2014.07.31.14.26.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 14:26:47 -0700 (PDT) From: Kever Yang To: Paul Zimmerman , heiko@sntech.de Subject: [REPOST PATCH v3 4/5] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi Date: Thu, 31 Jul 2014 14:26:24 -0700 Message-Id: <1406841985-15790-5-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1406841985-15790-1-git-send-email-kever.yang@rock-chips.com> References: <1406841985-15790-1-git-send-email-kever.yang@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140731_142709_649547_AFB4B0EF X-CRM114-Status: GOOD ( 12.07 ) X-Spam-Score: 1.0 (+) Cc: huangtao@rock-chips.com, Mark Rutland , addy.ke@rock-chips.com, Russell King , Pawel Moll , Ian Campbell , linux-kernel@vger.kernel.org, dianders@chromium.org, Rob Herring , Kever Yang , cf@rock-chips.com, devicetree@vger.kernel.org, xjq@rock-chips.com, lyz@rock-chips.com, Kumar Gala , olof@lixom.net, wulf@rock-chips.com, hj@rock-chips.com, sonnyrao@chromium.org, 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Doug Anderson 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 v3: - EHCI and HSIC move new for version 3. Changes in v2: None 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 a5607a1..673dee3 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -205,6 +205,17 @@ status = "disabled"; }; + usb_host0_ehci: ehci@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"; @@ -225,6 +236,15 @@ status = "disabled"; }; + usb_hsic: ehci@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>; @@ -319,27 +339,6 @@ interrupts = ; status = "disabled"; }; - - usb_host0_ehci: ehci@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: ehci@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;