From patchwork Wed Oct 4 06:49:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 9983951 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 C369A60365 for ; Wed, 4 Oct 2017 06:59:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B537128A8A for ; Wed, 4 Oct 2017 06:59:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A930928A8C; Wed, 4 Oct 2017 06:59:52 +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 3924828A8A for ; Wed, 4 Oct 2017 06:59:52 +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=vb2wqIVPnJSEtbMWPkguiH66GQkcHQEmBbNiUwJBJuY=; b=nHDb8j6xI+ctLLcP/8Fct9Uh8y dx/Ij1iqUiZx0B4vXymjFNzFvEyqqo3suax+KYAwxvDE18jFWRbm/YZPOXz9s9dohQ4W5K8vahX6G 2j0JIte/nNM+MUqe7P39NP677WpzHXL5BP4NuCRV16rd+yLlLyIO5DwNeZzUtkjOzwE29TX2cKyVU cPZaAbamiq0UUOu8b4+2FgYymMIns4xj1nTmtWoNmPPnwiwr2KAsbbQIddcxuQtDcu4bSsHQTE7jO qUFK4JpTNwAerXPqAUAY9btPuYoUBUjQLe1La44/OkV1F79G9cr7EVYHePrBLG1WuEN8lsACcCcT2 +cpMDukA==; 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 1dzdep-0002Qu-1z; Wed, 04 Oct 2017 06:59:51 +0000 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzdVR-0003Qp-Hf for linux-arm-kernel@lists.infradead.org; Wed, 04 Oct 2017 06:50:12 +0000 Received: by mail-pg0-x242.google.com with SMTP id u27so12258170pgn.1 for ; Tue, 03 Oct 2017 23:49:49 -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=/r+CZHrcGcz1sIRYjkzpBoXRg5PnBXIpZ9/PvxUgExc=; b=Sm1belwDDpSq+eNgW2Mf6nDYXO/xn0NXdcs4sidGYfegzHRREptPDqY9vuRhAeJeJu Mj2cXpOkHRHtjChNWbxnM714If7iTUwpRAhW5ywAATUM+AMm/A0tjKhX4mcPpCYQGSqx ijzM3z8tyjJr64aRXp2sjIXpDAFspVFFJJhd8c14fr42R4Xv4Owjffn9VtSM3vIptbsV ZHuCuTtRuBbZ11cTDUZN7pFuhco44GGz8vBRhcGKJtgRvITdBijXrbsjshuFmr8WVqBi YKqrcq5GeC3znnVfWWNwTWeEH2GPql3gcfSkClYIDMYXifLMg8zude+QhT4o6g62hcxx vT+w== 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=/r+CZHrcGcz1sIRYjkzpBoXRg5PnBXIpZ9/PvxUgExc=; b=fHmLo6ScEjifTQtssIzP51tMq7DeRRYSenDuFymDcr2g+Z1klAx3FJ8OcNZ1Uo6njW Gu2nqJI9pWFaMp9g60nKocmZ958j6fI4OE5+k4JCcm2d+8cUCfCoWWi07gIn7EVeC+P5 ejPoSmZ5gDbFwlezxPo8Ha7yvcDKVYxFwHMIS3pQGY2y2xCp4/UwbJQHzaP4IgpId4sK MFxG79+o/LaatpUOAi0lVVCB3HotQ5AnxUvEkHRv7zbem+HN54q2vp3TW6DGVClhXsVl gshcnJuz75dQE/+SYUhNgxUttcbtCxo4QpMgxrpdeqqkWo9DCgL3pUndKnBH2GOIOynw L6xQ== X-Gm-Message-State: AHPjjUg46gOA9+LFC8dpg0p+Li/qxD1v0c0HLtsnlc9u4jBLPOeNKpD5 ub2iKp/1nykfVTaEA4NjJ3o= X-Google-Smtp-Source: AOwi7QB0DDHvRYcwgn4Dh6mhOwjf9t3RVxn1D5YoNMV5HlgYjvB9poElJoTaG7YL6P6fMgA/5kDFDQ== X-Received: by 10.98.29.74 with SMTP id d71mr19735282pfd.141.1507099788365; Tue, 03 Oct 2017 23:49:48 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id t87sm1726431pfi.180.2017.10.03.23.49.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Oct 2017 23:49:47 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Wed, 04 Oct 2017 17:19:39 +1030 From: Joel Stanley To: Joel Stanley , Rob Herring , Mark Rutland Subject: [PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node Date: Wed, 4 Oct 2017 17:19:10 +1030 Message-Id: <20171004064917.2498-3-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171004064917.2498-1-joel@jms.id.au> References: <20171004064917.2498-1-joel@jms.id.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171003_235009_746415_60F91741 X-CRM114-Status: GOOD ( 10.48 ) 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 Reviewed-by: Andrew Jeffery --- v2: - Don't introduce new clk bindings --- 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..c2d96b8a5065 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 = <&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..9e71c2dac0ba 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 = <&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"; - }; }; }; };