From patchwork Tue Sep 1 20:28:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WingMan Kwok X-Patchwork-Id: 7106811 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2F7A49F372 for ; Tue, 1 Sep 2015 20:35:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3BAD62054C for ; Tue, 1 Sep 2015 20:35:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 516FB2052C for ; Tue, 1 Sep 2015 20:35:15 +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 1ZWsC9-0000ga-56; Tue, 01 Sep 2015 20:30:17 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZWsC6-0007rl-8j for linux-arm-kernel@lists.infradead.org; Tue, 01 Sep 2015 20:30:15 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t81KSvK4008440; Tue, 1 Sep 2015 15:28:57 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t81KSvNX006306; Tue, 1 Sep 2015 15:28:57 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.224.2; Tue, 1 Sep 2015 15:28:56 -0500 Received: from udb0216549.am.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t81KSukl030960; Tue, 1 Sep 2015 15:28:56 -0500 Received: from a0216549local by udb0216549.am.dhcp.ti.com with local (Exim 4.76) (envelope-from ) id 1ZWsAq-0007d6-62; Tue, 01 Sep 2015 16:28:56 -0400 From: WingMan Kwok To: , , , , , , , , , Subject: [PATCH] ARM: dts: keystone: use one to one address translations under netcp Date: Tue, 1 Sep 2015 16:28:44 -0400 Message-ID: <1441139324-29296-1-git-send-email-w-kwok2@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150901_133014_403577_206D57D8 X-CRM114-Status: UNSURE ( 9.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: WingMan Kwok , m-karicheri2@ti.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Network subsystem NetCP in Keystone-2 devices includes some HW blocks that are memory mapped to ranges outside that of the NetCP itself. Thus address space of a child node of the NetCP node needs to be mapped 1:1 onto the parent address space. Hence empty ranges should be used under the NetCP node. Signed-off-by: WingMan Kwok --- arch/arm/boot/dts/k2e-netcp.dtsi | 8 +++----- arch/arm/boot/dts/k2hk-netcp.dtsi | 14 ++++++-------- arch/arm/boot/dts/k2l-netcp.dtsi | 8 +++----- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/k2e-netcp.dtsi b/arch/arm/boot/dts/k2e-netcp.dtsi index b13b3c9..e103ed9 100644 --- a/arch/arm/boot/dts/k2e-netcp.dtsi +++ b/arch/arm/boot/dts/k2e-netcp.dtsi @@ -111,9 +111,7 @@ netcp: netcp@24000000 { compatible = "ti,netcp-1.0"; #address-cells = <1>; #size-cells = <1>; - - /* NetCP address range */ - ranges = <0 0x24000000 0x1000000>; + ranges; clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>; dma-coherent; @@ -127,10 +125,10 @@ netcp: netcp@24000000 { #address-cells = <1>; #size-cells = <1>; ranges; - gbe@200000 { /* ETHSS */ + gbe@24200000 { /* ETHSS */ label = "netcp-gbe"; compatible = "ti,netcp-gbe-9"; - reg = <0x200000 0x900>, <0x220000 0x20000>; + reg = <0x24200000 0x900>, <0x24220000 0x20000>; /* enable-ale; */ tx-queue = <896>; tx-channel = "nettx"; diff --git a/arch/arm/boot/dts/k2hk-netcp.dtsi b/arch/arm/boot/dts/k2hk-netcp.dtsi index 77a32c3..3b885f5 100644 --- a/arch/arm/boot/dts/k2hk-netcp.dtsi +++ b/arch/arm/boot/dts/k2hk-netcp.dtsi @@ -127,9 +127,7 @@ netcp: netcp@2000000 { compatible = "ti,netcp-1.0"; #address-cells = <1>; #size-cells = <1>; - - /* NetCP address range */ - ranges = <0 0x2000000 0x100000>; + ranges; clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>; dma-coherent; @@ -140,15 +138,15 @@ netcp: netcp@2000000 { ti,navigator-dma-names = "netrx0", "netrx1", "nettx"; netcp-devices { - ranges; #address-cells = <1>; #size-cells = <1>; - gbe@90000 { /* ETHSS */ - #address-cells = <1>; - #size-cells = <1>; + ranges; + gbe@2090000 { /* ETHSS */ label = "netcp-gbe"; compatible = "ti,netcp-gbe"; - reg = <0x90000 0x300>, <0x90400 0x400>, <0x90800 0x700>; + reg = <0x02090000 0x300>, + <0x02090400 0x400>, + <0x02090800 0x700>; /* enable-ale; */ tx-queue = <648>; tx-channel = "nettx"; diff --git a/arch/arm/boot/dts/k2l-netcp.dtsi b/arch/arm/boot/dts/k2l-netcp.dtsi index 6b95284..97ae805 100644 --- a/arch/arm/boot/dts/k2l-netcp.dtsi +++ b/arch/arm/boot/dts/k2l-netcp.dtsi @@ -110,9 +110,7 @@ netcp: netcp@26000000 { compatible = "ti,netcp-1.0"; #address-cells = <1>; #size-cells = <1>; - - /* NetCP address range */ - ranges = <0 0x26000000 0x1000000>; + ranges; clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>; dma-coherent; @@ -126,10 +124,10 @@ netcp: netcp@26000000 { #address-cells = <1>; #size-cells = <1>; ranges; - gbe@200000 { /* ETHSS */ + gbe@26200000 { /* ETHSS */ label = "netcp-gbe"; compatible = "ti,netcp-gbe-5"; - reg = <0x200000 0x900>, <0x220000 0x20000>; + reg = <0x26200000 0x900>, <0x26220000 0x20000>; /* enable-ale; */ tx-queue = <896>; tx-channel = "nettx";