From patchwork Wed Jan 16 16:52:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 155728 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp880420jaa; Wed, 16 Jan 2019 08:52:51 -0800 (PST) X-Google-Smtp-Source: ALg8bN6soApzMsixQXmocfmr2c+zP2Vp4RAbiHKLz5X4HZjtVfGvHMDdtZOVX99VlbitNOVSyVmR X-Received: by 2002:a62:190e:: with SMTP id 14mr10709532pfz.70.1547657571493; Wed, 16 Jan 2019 08:52:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547657571; cv=none; d=google.com; s=arc-20160816; b=0FHBBTjFKNEG5xu4Y4TUYZwFa8z4FsazvZWfyISCXwSxn4me83fQYI2DNbRl3wGpkO 6SgrvzUW1afhQPS3yYQF3VPyR7senGUCc6wz4dNpjkcu5SvZDP3LFgOhKj0kDufcK1n8 nvxNeSvpUu0k7d+C081+dozu/XOW9V1Usp6ZLB3L37PSLbVzBWP5JhHr2OQu7z5Uzk7c 65Rgmr5aHCIhCq1PwEoUV+eUKxIfjMCZZmwgMEi0WLD6L1HFejfEqX9YTncSlqx8xk1n IPCIzASvo6v2T1JQMGIEDV7oc5j01FZFZK9w8SjJbmW5QDGCiar8BkzvnfH8ppVEpLzB pVpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=dUNj70748HNnwQMeBYqdWeK5DbMKqYQpIgSDSRP1d7Y=; b=BE+Zb1QKKrTmzqXKsbMLi6qdr/CFHZz4AGx6MCtyYOPQ5fVcey1QgavhjJG+KI1tfA gSVzDqxwVXIebvv7WvgjQIKeSo/Rii8DdszGU75fyrRzkF9YudDhIExMpx+vIyOFr3wb 2h7UbeCu6LmJx3OxDXntEM/ImcjliMKRaMdC+pDvqJHbA8vgzIlooQuFYI/YC1p7Nzhb V4jsD2UjTQNGguGU2fP7rGUS84FVYnbs7cZ2wnLghKvPOYH8nxGtfv5ewv25NYiKyEov awXtmrN4D2P5ujj7yeR8zZ3L1s4fpBIiqfdIhSDjpWIfMthR1fDwHWa3cLTYBJtsP5hX xtpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=xtzWHJB5; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 43si6854071plb.176.2019.01.16.08.52.50; Wed, 16 Jan 2019 08:52:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=xtzWHJB5; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731293AbfAPQwu (ORCPT + 7 others); Wed, 16 Jan 2019 11:52:50 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46075 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731286AbfAPQwu (ORCPT ); Wed, 16 Jan 2019 11:52:50 -0500 Received: by mail-wr1-f67.google.com with SMTP id t6so7679275wrr.12 for ; Wed, 16 Jan 2019 08:52:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dUNj70748HNnwQMeBYqdWeK5DbMKqYQpIgSDSRP1d7Y=; b=xtzWHJB5UEMKRrAmCfxZB/aeiqtD9KVgCKGMg2KnAYSp7ooLd3kQROL/ZMpcKcSiZx JoIf5TUz4ls8RjN4RTKRB6fCzg8XIgF2Ibg9FUcADrm5g9MVhn+txknwXWhPA8NARNFD wi1/4NjHP2VS4QrYXKgBzDIlJ/DYDhwRC9bFxPk8YhCck6z+QvinmJ2+v+TBnJXPROdy SChfcT9vGDA448hadUOEMc+khus9pFpdDC+XJOpR8oSoNO3yjLEGOySlqpEOs31SXUUo VJZAguJKxDTpJLgKMgc+sphN1DjOknhs5bw4pRcRQI0JhAKEgcKiuU++fodpQCPfMm0K ZRfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dUNj70748HNnwQMeBYqdWeK5DbMKqYQpIgSDSRP1d7Y=; b=WoPoQe5VmJlaCX3zf2EiycD+o2lopKIQGi8smXqFGwJpS361ujs+his9wtqR3ssBcM 1cuTX2umLxgQSsgVOVZFJUJaG7TjvmOsJDYXA2WN2YFp/gC9PjMGguot8rRaoyw5B/tf cZhk8FAJj4WHdra7cQV4BiQEW5jwCYK6DDH9J7YFhA+6StPeVuoNbH/ImW3TWjvP16Dy 2WrqugIJ23dB4st6SlvQHUny2X/UQZCCTcSiwdOxEaQIJacRMEIV133QIQ+skU9mYI9W onI3aqsRLwWEbqMMPi3WI9KK/WM9Legv+mrYY/kBPmL5GzwV8gB4W1pHfRsYFBZ0L7rT Vo/A== X-Gm-Message-State: AJcUukd7l2X/un+e1Oz34VNUAuB76Q11fRKWUVFVGrz/VCZzsw9TQqac TZ4KcGIyG4fyY+C4Xx6VhyZPpg== X-Received: by 2002:adf:e284:: with SMTP id v4mr8067611wri.26.1547657568223; Wed, 16 Jan 2019 08:52:48 -0800 (PST) Received: from boomer.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id a132sm46318997wmh.5.2019.01.16.08.52.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Jan 2019 08:52:47 -0800 (PST) From: Jerome Brunet To: Kevin Hilman Cc: Jerome Brunet , linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: meson: fix g12a buses Date: Wed, 16 Jan 2019 17:52:36 +0100 Message-Id: <20190116165236.8330-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org periph and hiu bus addresses/size are wrong. cbus, aobus and apb just don't exist in the memory map so remove them. Fixes: 9c8c52f7cb4f ("arm64: dts: meson-g12a: add initial g12a s905d2 SoC DT support") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 70 +++++++-------------- 1 file changed, 24 insertions(+), 46 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 3b82a975c663..2aea5ba62fee 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -78,46 +78,40 @@ #size-cells = <2>; ranges; - periphs: periphs@ff634000 { + periphs: bus@ff634400 { compatible = "simple-bus"; - reg = <0x0 0xff634000 0x0 0x2000>; + reg = <0x0 0xff634400 0x0 0x400>; #address-cells = <2>; #size-cells = <2>; - ranges = <0x0 0x0 0x0 0xff634000 0x0 0x2000>; + ranges = <0x0 0x0 0x0 0xff634400 0x0 0x400>; }; - hiubus: bus@ff63c000 { + hiu: bus@ff63c000 { compatible = "simple-bus"; - reg = <0x0 0xff63c000 0x0 0x1c00>; + reg = <0x0 0xff63c000 0x0 0x1400>; #address-cells = <2>; #size-cells = <2>; - ranges = <0x0 0x0 0x0 0xff63c000 0x0 0x1c00>; + ranges = <0x0 0x0 0x0 0xff63c000 0x0 0x1400>; }; - aobus: bus@ff800000 { - compatible = "simple-bus"; - reg = <0x0 0xff800000 0x0 0x100000>; - #address-cells = <2>; - #size-cells = <2>; - ranges = <0x0 0x0 0x0 0xff800000 0x0 0x100000>; - - uart_AO: serial@3000 { - compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; - reg = <0x0 0x3000 0x0 0x18>; - interrupts = ; - clocks = <&xtal>, <&xtal>, <&xtal>; - clock-names = "xtal", "pclk", "baud"; - status = "disabled"; - }; - - uart_AO_B: serial@4000 { - compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; - reg = <0x0 0x4000 0x0 0x18>; - interrupts = ; - clocks = <&xtal>, <&xtal>, <&xtal>; - clock-names = "xtal", "pclk", "baud"; - status = "disabled"; - }; + uart_AO: serial@ff803000 { + compatible = "amlogic,meson-gx-uart", + "amlogic,meson-ao-uart"; + reg = <0x0 0xff803000 0x0 0x18>; + interrupts = ; + clocks = <&xtal>, <&xtal>, <&xtal>; + clock-names = "xtal", "pclk", "baud"; + status = "disabled"; + }; + + uart_AO_B: serial@ff804000 { + compatible = "amlogic,meson-gx-uart", + "amlogic,meson-ao-uart"; + reg = <0x0 0xff804000 0x0 0x18>; + interrupts = ; + clocks = <&xtal>, <&xtal>, <&xtal>; + clock-names = "xtal", "pclk", "baud"; + status = "disabled"; }; gic: interrupt-controller@ffc01000 { @@ -132,22 +126,6 @@ #interrupt-cells = <3>; #address-cells = <0>; }; - - cbus: bus@ffd00000 { - compatible = "simple-bus"; - reg = <0x0 0xffd00000 0x0 0x25000>; - #address-cells = <2>; - #size-cells = <2>; - ranges = <0x0 0x0 0x0 0xffd00000 0x0 0x25000>; - }; - - apb: apb@ffe00000 { - compatible = "simple-bus"; - reg = <0x0 0xffe00000 0x0 0x200000>; - #address-cells = <2>; - #size-cells = <2>; - ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x200000>; - }; }; timer {