From patchwork Thu Sep 13 07:12:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10598745 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 169BD14E5 for ; Thu, 13 Sep 2018 07:13:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 008562A5B2 for ; Thu, 13 Sep 2018 07:13:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4E1B2A5BF; Thu, 13 Sep 2018 07:13:27 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 72E082A5B2 for ; Thu, 13 Sep 2018 07:13:27 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To: References:List-Owner; bh=ZtS2vdoEtBd9wPw4yz8s0JStNSPkzhBMszlBiupffFY=; b=hcb dS8aUG+GpaXkfGAlzSd4vYB6doB+7/OoJVyrIYq8ArMRyqw3cXrMt3WKugRMszdFjykCqrFtxjZ9A mCsiQwI/Fv4CeZbyRG+0NVio8WiPrOoD+Ejfv92qItaP3Gl02IODBVmuxy8LcrDR4LBD/50NqzA6H ACzsmPNJdk2YjDy+0AXgXp5/+YIBCbF6h6N9xxYTGSQHItdIHxsvaL9W27OcrmtPATtOVmljLd783 6WlxQJWDXRig4FeCMnUucjo2Z36BK26hoFvq4rSQFJAw/em/UK9kTApfjUFtTZofREMDOTXl2e/PF Phd074YFAfdl5ytyH5+ePOSNJG5lR3w==; 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 1g0LoO-0002fj-3K; Thu, 13 Sep 2018 07:13:12 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0Lnt-0002EB-Qr for linux-arm-kernel@lists.infradead.org; Thu, 13 Sep 2018 07:12:43 +0000 Received: by mail-wr1-x443.google.com with SMTP id a108-v6so4426348wrc.13 for ; Thu, 13 Sep 2018 00:12:31 -0700 (PDT) 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; bh=xefkRwVwK694SBCVhjwZZgQkRxdmtQDKiXGOuG46uGw=; b=W5AqyHJyaYnhpBi1DnN2m+4+D+6G2JXmYIu/3zVNN+rAuh4f4eC2fmMKhfw3kodGV8 oas+QsqWiPCNPPQBGYLMOBr0ONvWHxFVE7Q4y0vXyhEomXa8Z3adxF2734L8sZSqFClR yBJPDSzinM7n+X82kee7BT8OdnNwOlQVz3LPi3TFfdC85ujdvriY9WfQSxs1NP5l9Sht TzdXEvDgF7j75TBqQYTYyOAJcVIQCajw0IQ/m4wFZZsT/tQhYW4xYlB5W7/RAyhSRJP7 /iKhf338rRODDA0XnJ/3uWRUkRrmz5Q1c3hczvRJ+8aDwnw1JvtzXEr5/2V1RzbI08QI +KzQ== 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; bh=xefkRwVwK694SBCVhjwZZgQkRxdmtQDKiXGOuG46uGw=; b=H98DtPX2V6mfib95qjon6KiFyOLVJPaaWgXLyw0Z5obQmLCQiQ3IPCMFMX5GxgGxWF 1C3byNmfJQByUtlRZZRe8h6gEb717utIbtEda3W0n/KZuWvTvfO3dJNR6wzFsLmSG6n0 11rUSX/SWXXErcyZlLLID+VLBC8mb1WP0dmMI3HanS+ev/E8gcZq1y3gsYYGxVG1fOfJ CfbvB8v51vP+ANe1zOVRTudB2UCQHTTsSsjA0nIcNgPA5/HPJ/TlTYHnHI0IQNn7ipa/ Y/bmD7QKv13woJsqJEQFfwBOzYvfwqayQjipeqx4cmyydcVf5rtYl3ylUzBdLRZYRfVm WSmQ== X-Gm-Message-State: APzg51A9ojPtHY1UU0D+J1KEXpKTBwFsVRJxzpuBFWJybnZckzcaQJd9 EM8Ykrw2K7TGxYsuHHGWVLB+GPaqtXU= X-Google-Smtp-Source: ANB0Vdap7yMkLS9l8TH1bISSZN/iBqjdlmB+Fo8Yvri/QysyRVYAhXEponf5GTxHuC2eBw2owzW9rg== X-Received: by 2002:adf:9d81:: with SMTP id p1-v6mr4070610wre.12.1536822749983; Thu, 13 Sep 2018 00:12:29 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id u40-v6sm5375606wrc.43.2018.09.13.00.12.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Sep 2018 00:12:29 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH RESEND] arm64: dts: meson: Switch simple-mfd and syscon order Date: Thu, 13 Sep 2018 09:12:27 +0200 Message-Id: <1536822747-13918-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180913_001241_916675_C34758A0 X-CRM114-Status: GOOD ( 12.31 ) 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: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 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 order between "syscon" and "simple-mfd" is important because in these particular cases, the node needs to be first a "simple-mfd" to expose it's sub-nodes, and later on a "syscon" to permit other nodes to access this register space through the "syscon" mechanism. Signed-off-by: Neil Armstrong --- Hi Kevin, I rebased the patch on top of your v4.20/dt64 branch. Neil arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index 9f61407..df017db 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -965,7 +965,7 @@ sysctrl: system-controller@0 { compatible = "amlogic,meson-axg-hhi-sysctrl", - "syscon", "simple-mfd"; + "simple-mfd", "syscon"; reg = <0 0 0 0x400>; clkc: clock-controller { @@ -1209,7 +1209,7 @@ ranges = <0x0 0x0 0x0 0xff800000 0x0 0x100000>; sysctrl_AO: sys-ctrl@0 { - compatible = "amlogic,meson-axg-ao-sysctrl", "syscon", "simple-mfd"; + compatible = "amlogic,meson-axg-ao-sysctrl", "simple-mfd", "syscon"; reg = <0x0 0x0 0x0 0x100>; clkc_AO: clock-controller { diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 49c22f2..f1e5cdb 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -344,7 +344,7 @@ ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>; sysctrl_AO: sys-ctrl@0 { - compatible = "amlogic,meson-gx-ao-sysctrl", "syscon", "simple-mfd"; + compatible = "amlogic,meson-gx-ao-sysctrl", "simple-mfd", "syscon"; reg = <0x0 0x0 0x0 0x100>; pwrc_vpu: power-controller-vpu { @@ -444,7 +444,7 @@ ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>; sysctrl: system-controller@0 { - compatible = "amlogic,meson-gx-hhi-sysctrl", "syscon", "simple-mfd"; + compatible = "amlogic,meson-gx-hhi-sysctrl", "simple-mfd", "syscon"; reg = <0 0 0 0x400>; };