From patchwork Thu Jul 26 14:13:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10545965 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 DE29714E0 for ; Thu, 26 Jul 2018 14:14:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8F2B2B3CB for ; Thu, 26 Jul 2018 14:14:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD3122B3CD; Thu, 26 Jul 2018 14:14:31 +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 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 C96DF2B3CB for ; Thu, 26 Jul 2018 14:14:30 +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=E0UMDueHU5m8SFaQSggdGDcJDnK01AN3TxbHZvDhH8Y=; b=VjB +P3N8E7u0j+++wl4Bp3YYutEOuRVXkpjbGfYnZSdCoRWcnRnbRVw3tiC7o8QcG+qQJVb2P9Ha2W9/ If/82CwMuW+Ijrx7Y82jfz87V9rFjxR/CDf/a4PDh+O+dnWuf6A2shor+9vcJKAHVJ2lTpAmPYgbV Z7y/WvpKGuIfQYEZqpPf1HoP69BQsx13pBqK1xh2EIGVD17ViVCwJofi7g1H2vBH+yis3a+nw++VP 73UrSZK3dedaOuK1Wc1bsE2EokP7JzjJQUuTVt1P8bz1LGCV6+N8UGfFlehPQpdTacVGipN4+YBCy QCu7QY4gMxLW6eJrE/54NHpjiDBPwfA==; 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 1fih29-0004Ps-Du; Thu, 26 Jul 2018 14:14:25 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fih1x-00045K-BJ for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2018 14:14:17 +0000 Received: by mail-wr1-x441.google.com with SMTP id e7-v6so1871859wrs.9 for ; Thu, 26 Jul 2018 07:14:02 -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=q1bbeBlbA5yGzCz3LYX30EBNKRjem+abrzOXES8zWXI=; b=ELKUZomUJ2W+Gkf92t2sb8t4JHUOvuFi2hXV1O60cjJvOt6f73EJtjj/+6WQetDynE WhPB/bCR4V8Yfxv9fkFOOIROaZx1NjYfuo/wFbDwacuI6/K1Ku7mVaKLW/SG9q1NzIHm MufFfhtUAQk8uDrXI0nSRQ3xX+bumZgz+1ly/3/iFhFCtlBjpL5geWKroA/xeYQqLqzm hfpf/CVK+Bhbsp5OyaaJuE4wOzlkeYRlunZpPh59jBLL8bweNPNmaSwUgECfYteqFe4e 8NjG7f7GGOfdMlumUgQjlQueswxQ5EoDAmMiNLCetMv1d1CBZqW6tE5SCreiuZc507yq sGbg== 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=q1bbeBlbA5yGzCz3LYX30EBNKRjem+abrzOXES8zWXI=; b=S2UW/F/6KHdmVyeLyDCsUoFbPSy0GLviudFCDq+yt9UB10D2ZB0szEnGeuOy9OYDgj DkHN4a9yCCFTlxbaiANpXspS/2/fK7lVznSI1sf3543I33T0Vrf6Jf9yO8wnQI+xm3vX 6hNMYhwDzIgdnK/ANK3eRWz/PaHwP6wQmuam4BInHCugOlNd3sEGA5da9o/H01VSSP+0 cTqDOYNmoiQfwRShJBR91VCNdG05o/1IIoF1bqJAZFGeTPXgQl5LijG46sJOp7J4esht 6dZ2DXdUgwtZPW1Zh2yKtf76MU1Xm7lmaX1XTRpODOryxdi2+ec5FYZLoHnEF69nwrrm MmAA== X-Gm-Message-State: AOUpUlGZg8mgcDi0D0GX7GxCvfDsTWfdwJm04PgUXDPwp8TIg3fQebVb aJzarvEfuN5eEQ0qEQ1nlsuqFQ== X-Google-Smtp-Source: AAOMgpe93TLLgQwrspDx2cZNGsFdcQgZgKHP2X5DwtPFX+IvCEGOM5lASYCFgL6auT9Ok4MFbst98w== X-Received: by 2002:adf:b2a7:: with SMTP id g36-v6mr1725501wrd.218.1532614441450; Thu, 26 Jul 2018 07:14:01 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id j9-v6sm3558062wrv.5.2018.07.26.07.14.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 07:14:00 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH] arm64: dts: meson: Switch simple-mfd and syscon order Date: Thu, 26 Jul 2018 16:13:58 +0200 Message-Id: <1532614438-7207-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-20180726_071413_758930_09EF94F4 X-CRM114-Status: GOOD ( 12.74 ) 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 --- This also has a consequence for U-Boot since the U-Boot DM is much simpler and can only associate a single device to a node, thus here we want these nodes to be an mfd bus to be able to probe the sub-nodes. 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 6adc8d3..3f0de9d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -342,7 +342,7 @@ ranges = <0x0 0x0 0x0 0xff63c000 0x0 0x1c00>; sysctrl: system-controller@0 { - compatible = "amlogic,meson-axg-hhi-sysctrl", "syscon", "simple-mfd"; + compatible = "amlogic,meson-axg-hhi-sysctrl", "simple-mfd", "syscon"; reg = <0 0 0 0x400>; clkc: clock-controller { @@ -1180,7 +1180,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 b8dc4db..d88699f 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 { @@ -431,7 +431,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>; };