From patchwork Fri Nov 23 19:53:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10696353 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70C4714BD for ; Fri, 23 Nov 2018 20:00:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E053286AE for ; Fri, 23 Nov 2018 20:00:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51D7A2BF83; Fri, 23 Nov 2018 20:00:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 01911286AE for ; Fri, 23 Nov 2018 20:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=D0ZJzpbvpDeZGoT3C9C3xF5eKRT6MBV8geaAexOHmSk=; b=s7BVpAXH5AKax3 SNtZAzuhKpKQNZFXDzELHksl50Vx2STaNxYLe10cyvWlejsJgCVyAeOdCD6HPaV6gLsK0jBqOYFmh /UquD0DaEOK/ckzdamPjj1FYvpqA95S2NuroqM0gIQS8Ke3APqVVGO0vOPxAIG+wUaWxs+Qcd3RU0 LPgo0F1KKQIIdJC4R4m05FKzvyELwWYUFRgEAfUfBk69SkmlistVaIDXix9Keqleo1adTwnOy3p5s hlDE5UjotvDeHFc2NP9kPGOxjaV3XBnSdCKW6YxjssFTlBhQp+Y96Yxqh3pOe8dj4RDdlM398Tao2 znfjViD5fzvjl9Ol2OVg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gQHcy-0004Iw-PG; Fri, 23 Nov 2018 20:00:36 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gQHWE-0007dw-54; Fri, 23 Nov 2018 19:53:39 +0000 Received: by mail-wm1-x341.google.com with SMTP id u13-v6so12978588wmc.4; Fri, 23 Nov 2018 11:53:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Uk6NbW6xFFI/4/JJNngXdoHaDRPggf+bny1s89MRwTM=; b=MNgeUNvVGBLyaLH4ke0l9DdlneCQT5PmpstMQ74LIjJupfYPa8aINF+dRcYQktr59Y 4sY9NSG2VDwd6MGUrYWwgcixradfn8C4iWwv3A5tjOLx4Q2WjDaqgzCUQuLNv5h/exCY aNm1BasYP6Qui/wb7NNQvwPkHZX7T8djUFacnbDrBj/SVX5u7P5yZHmRT1CFBiklPf31 iaKa5qbEMdFPdSr0QoFO5TBgXPJqYQBQx+/twitijqf4CGv1PDCHCFjiYv3ebPYYJrlh CGkzBgdxFvKOEt2WrQFg99nvhc1xrpCWUIqSJIBcZi0cR/tCvtvNyShCwcxG4o7BACS8 dglQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Uk6NbW6xFFI/4/JJNngXdoHaDRPggf+bny1s89MRwTM=; b=LTy68Rv4cQ+HfmRCS09HTyIaALMOvibHGJEaANWlS2MhUGE9gxiiRBqdIdj8MN0CKF ACCz5TDKsB8pRf6tLhdA35O7zPZCVI6L0GrfoRFeNZHenZ8rF2eH1XK8AF+kynX8hqyW xg+5e6JO11Nq0IChwVhWvWS3xM9FFEGXjCSzW/VFywf21/w6gdkquG8qzDW5CQBIQ+6g dZ4lcN4V8HZMBYdDs/6kFYLO+DqtxoyJqahwM2x0wbH3sqGWp9btLIho6A/i90J8SwYF +/Qu7u/cMxrfFT3cqpgMipZMUPEOlJQPKDbMMNf1/+u202kDdNrvMy92WJ2rE1/TtU8G tQxg== X-Gm-Message-State: AA+aEWYr89ps64+JXOiwE4i4aBF6XKawd18JfaFf5/6mB5fmy/VJMgp3 AaGX1lEB5gzP4ULn+q/dCFz65k3+ X-Google-Smtp-Source: AFSGD/WjneB/cPaXtp4qCTMTg78oMJHAtgOSgrgtky6YR75WtV0VRog9ctb+PenzpvqXhMUIUyxBrQ== X-Received: by 2002:a1c:2d5:: with SMTP id 204mr11905221wmc.115.1543002806306; Fri, 23 Nov 2018 11:53:26 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD732F500597D16A631573221.dip0.t-ipconnect.de. [2003:dc:d732:f500:597d:16a6:3157:3221]) by smtp.googlemail.com with ESMTPSA id g198sm11495337wmd.23.2018.11.23.11.53.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 11:53:25 -0800 (PST) From: Martin Blumenstingl To: carlo@caione.org, khilman@baylibre.com, linux-amlogic@lists.infradead.org Subject: [PATCH 2/6] ARM: dts: meson: group the Cortex-A5 / Cortex-A9 peripherals Date: Fri, 23 Nov 2018 20:53:07 +0100 Message-Id: <20181123195311.4578-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181123195311.4578-1-martin.blumenstingl@googlemail.com> References: <20181123195311.4578-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181123_115338_191445_B5CCF0F0 X-CRM114-Status: GOOD ( 11.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The public Meson8b (S805) datasheet describes a memory region called "A9 Periph base" which starts at 0xC4300000 and ends at 0xC430FFFF. Add a simple-bus node and move all peripherals that are part of this memory region. This makes the .dts a bit easier to read. No functional changes. Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson.dtsi | 24 ++++++++++++++++-------- arch/arm/boot/dts/meson8.dtsi | 12 +++++++----- arch/arm/boot/dts/meson8b.dtsi | 12 +++++++----- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 0839da07a75c..e4645f612712 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -59,14 +59,6 @@ cache-level = <2>; }; - gic: interrupt-controller@c4301000 { - compatible = "arm,cortex-a9-gic"; - reg = <0xc4301000 0x1000>, - <0xc4300100 0x0100>; - interrupt-controller; - #interrupt-cells = <3>; - }; - soc { compatible = "simple-bus"; #address-cells = <1>; @@ -207,6 +199,22 @@ }; }; + periph: bus@c4300000 { + compatible = "simple-bus"; + reg = <0xc4300000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0xc4300000 0x10000>; + + gic: interrupt-controller@1000 { + compatible = "arm,cortex-a9-gic"; + reg = <0x1000 0x1000>, + <0x100 0x100>; + interrupt-controller; + #interrupt-cells = <3>; + }; + }; + aobus: aobus@c8100000 { compatible = "simple-bus"; reg = <0xc8100000 0x100000>; diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index 3be5fbd07997..28b9f6779993 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -129,11 +129,6 @@ no-map; }; }; - - scu@c4300000 { - compatible = "arm,cortex-a9-scu"; - reg = <0xc4300000 0x100>; - }; }; /* end of / */ &aobus { @@ -362,6 +357,13 @@ arm,shared-override; }; +&periph { + scu@0 { + compatible = "arm,cortex-a9-scu"; + reg = <0x0 0x100>; + }; +}; + &pwm_ab { compatible = "amlogic,meson8-pwm", "amlogic,meson8b-pwm"; }; diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 587a855f872b..6b097ab8637f 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -112,11 +112,6 @@ no-map; }; }; - - scu@c4300000 { - compatible = "arm,cortex-a5-scu"; - reg = <0xc4300000 0x100>; - }; }; /* end of / */ &aobus { @@ -349,6 +344,13 @@ arm,shared-override; }; +&periph { + scu@0 { + compatible = "arm,cortex-a5-scu"; + reg = <0x0 0x100>; + }; +}; + &pwm_ab { compatible = "amlogic,meson8b-pwm"; };