From patchwork Thu Sep 28 07:51:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 9975459 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 273F1603F2 for ; Thu, 28 Sep 2017 08:04:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17BC11FFD6 for ; Thu, 28 Sep 2017 08:04:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B0EC294E9; Thu, 28 Sep 2017 08:04:38 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 D7E691FFD6 for ; Thu, 28 Sep 2017 08:04:36 +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: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=2LqQM9BJo1Gvr+ndw2XwODXFBxG4RCeX25xnL9i/KsI=; b=g4lkFPP5jOUiE/iEL8iXUhdGY2 Bj8izmFYIqUEIOzMfRy4hNuPe7iriO0tXVFE7O0LWlRG/TUt+5HIU0ub7jC64gsusewrpC3z8Gsr5 /LFqHE6dyNqnzIfxfpCKvcmJ8Qy4S/eneeme7PQWpkSZ9uQaGmjq5gDqOzsuONz2h6aYtfi3qB+X5 kpk4VcO982AOkmtdj2bJCtKaNjww06awALxEcwXj11RDUbUJWkhix4HvaKniqb3edtPUXeuS77lzb IgHuZOcKxlF78xJRohSiVQUfwqrYQCOsZVllnzoLMPp8OYxopdqdUsU65kdlS9gixqHmfmcvasyL3 AeXwc2Jg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dxTnx-0001X4-6m; Thu, 28 Sep 2017 08:04:21 +0000 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dxTcn-0006cr-00 for linux-arm-kernel@lists.infradead.org; Thu, 28 Sep 2017 07:52:53 +0000 Received: by mail-pf0-x243.google.com with SMTP id e69so787973pfg.4 for ; Thu, 28 Sep 2017 00:52:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=AyibVerVCALmO7Ektl889eo/TUfKVAXFZxlYfaGIpVw=; b=H9zvZ8X/lH4Pe7atVOrMnswRC3/bfCDadPJG0xvAyZpun7t72+vWvNjcNxKEkatlMF FCIIrhDRrRi/Zgy9hMS54+XRfTsktrXfSL1vIiB7yHOq76OVtBsYgkY1MoXJfRfcrotJ /UpsyClu4zxYyLX4qD5Mat9ZkXiYO9IW4KmY9M4ACqHJH7JldGhv3IZndDbBCK9OW/2K G5A8AwmUB0gysHQZKx6quv3GaA/AQL3n8MC6KxNLIXFx8UfIIOSXaxpgiaOQPB1bz2oq r37KTDnRvd90D1FLhTkYI5/hUcTERxsOdpE0XiMSadPVwOQHzRJwzCvAOrupelwThoSD 4jog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=AyibVerVCALmO7Ektl889eo/TUfKVAXFZxlYfaGIpVw=; b=qAPrtKzhKXkrT6kVpAuxYe04F+hYrOl2CGSzfVsZ8XkFVJWkuHRvmns+6RIlx+uqRt YINSIFCmCyXJrvDaqpIacygFBglNe+tQlZ2o5G0i0OqSRfdvZVtdtrI2UFUjynEsVZDG JkNXqpWuscVoHBywq/CBVETZUbcVjN2T/P6jXZq1dft/MCtpxX5FiZTQXFetdHqemi3S h0ttjiBYUleSgMpZxJeTcgdv8/BrJPS1D62wQNkAh2TBJa9el8mSLErp15cV1A36oW4C Pq9V4EVE764FIABEEajersdrPxJbWgP+zSGmFTtJMs0NE8j3erkP1DKoXs82DUvdGD9D 3IJg== X-Gm-Message-State: AHPjjUh2cpLo9hGXWyl4b3qYZHj4bGgxUz07A9G0vqYCnG0a6KenYYF0 //oZA8mPFxP4GCIlNdGFh14= X-Google-Smtp-Source: AOwi7QBk11fxiN90MdVBHfYQzVi8LLVONT8AHO30r17MvNDS55LVKwx3kLPj/YMWP8kH0aOxfzBU8A== X-Received: by 10.98.163.153 with SMTP id q25mr3524214pfl.183.1506585147725; Thu, 28 Sep 2017 00:52:27 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id r66sm1728992pfl.15.2017.09.28.00.52.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Sep 2017 00:52:26 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Thu, 28 Sep 2017 17:22:18 +0930 From: Joel Stanley To: Joel Stanley , Rob Herring , Mark Rutland Subject: [PATCH 2/8] ARM: dts: aspeed: Reorder ADC node Date: Thu, 28 Sep 2017 17:21:43 +0930 Message-Id: <20170928075149.8154-3-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170928075149.8154-1-joel@jms.id.au> References: <20170928075149.8154-1-joel@jms.id.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170928_005249_598632_E996744A X-CRM114-Status: GOOD ( 10.99 ) 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: devicetree@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Andrew Jeffery , Brendan Higgins , Russell King , linux-kernel@vger.kernel.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Rick Altherr , linux-arm-kernel@lists.infradead.org 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 We try to keep the nodes in address order. The ADC node was out of place. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 16 ++++++++-------- arch/arm/boot/dts/aspeed-g5.dtsi | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 1edd0cee6221..a4579498fc25 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -129,6 +129,14 @@ }; }; + adc: adc@1e6e9000 { + compatible = "aspeed,ast2400-adc"; + reg = <0x1e6e9000 0xb0>; + clocks = <&syscon ASPEED_CLK_APB>; + #io-channel-cells = <1>; + status = "disabled"; + }; + sram@1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x8000>; // 32K @@ -227,14 +235,6 @@ no-loopback-test; status = "disabled"; }; - - adc: adc@1e6e9000 { - compatible = "aspeed,ast2400-adc"; - reg = <0x1e6e9000 0xb0>; - clocks = <&clk_apb>; - #io-channel-cells = <1>; - status = "disabled"; - }; }; }; }; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index f56dd67efa50..f6430b313f90 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -173,6 +173,14 @@ reg-io-width = <4>; }; + adc: adc@1e6e9000 { + compatible = "aspeed,ast2500-adc"; + reg = <0x1e6e9000 0xb0>; + clocks = <&syscon ASPEED_CLK_APB>; + #io-channel-cells = <1>; + status = "disabled"; + }; + sram@1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x9000>; // 36K @@ -307,14 +315,6 @@ no-loopback-test; status = "disabled"; }; - - adc: adc@1e6e9000 { - compatible = "aspeed,ast2500-adc"; - reg = <0x1e6e9000 0xb0>; - clocks = <&clk_apb>; - #io-channel-cells = <1>; - status = "disabled"; - }; }; }; };