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: 821169 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y6RNM2B9Vz9t2h for ; Wed, 4 Oct 2017 17:49:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Sm1belwD"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3y6RNL3pmkzDqlt for ; Wed, 4 Oct 2017 17:49:54 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Sm1belwD"; dkim-atps=neutral X-Original-To: linux-aspeed@lists.ozlabs.org Delivered-To: linux-aspeed@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c05::244; helo=mail-pg0-x244.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Sm1belwD"; dkim-atps=neutral Received: from mail-pg0-x244.google.com (mail-pg0-x244.google.com [IPv6:2607:f8b0:400e:c05::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3y6RNG2h03zDqlr for ; Wed, 4 Oct 2017 17:49:50 +1100 (AEDT) Received: by mail-pg0-x244.google.com with SMTP id b11so3321364pgn.0 for ; Tue, 03 Oct 2017 23:49:50 -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=fdYvN5maeyK0QOBn1FFQksqIsUTP/B0gAx3IG8srd2n8OdVUjn5ccjQeNqiYMAIIVt h2spftrlVHWHnhzlQnM8uhVkY1Gzauuo5nfbjrIqFlyK9BeR+MThWgD/vBCsLsEHoLyt AudFN+2dQFQSLN3X9CpoS2/d6VnYQ7HHpBuvxAqGuiB+ana/PvWBbyMjR4fsJ3s2Oyyp T8OW1icmrRX0QVr0l2DkJG8HMZUpNyZFv7ZXlppfLyUCUSdrLp8osG+5QCAOJOKDdGeZ LS0aWtqMRf690Ve/jF00W9bf7YSzTxOzevTpZhVG9Ur9KaXnjisSbwYAyGETx0yupojS OSGA== X-Gm-Message-State: AHPjjUhHHp7S3/NdNoCoWF0LWSGXwW4+piigsqN15vAjBL15zNe2lf9z W+qEwfxw3eAwOYhwjdwBTsc= 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-BeenThere: linux-aspeed@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux ASPEED SoC development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Brendan Higgins , Russell King , linux-kernel@vger.kernel.org, Rick Altherr , linux-arm-kernel@lists.infradead.org Errors-To: linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linux-aspeed" 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"; - }; }; }; };