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: 819432 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 3y2n3P2dcNz9t5l for ; Thu, 28 Sep 2017 17:52:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H9zvZ8X/"; 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 3y2n3N71b2zDsPp for ; Thu, 28 Sep 2017 17:52:32 +1000 (AEST) 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="H9zvZ8X/"; 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:c00::244; helo=mail-pf0-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="H9zvZ8X/"; dkim-atps=neutral Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::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 3y2n3K6ZJ0zDsPp for ; Thu, 28 Sep 2017 17:52:29 +1000 (AEST) Received: by mail-pf0-x244.google.com with SMTP id h4so804639pfk.0 for ; Thu, 28 Sep 2017 00:52:29 -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=AR3q1sYeYc8qhc1VFTAt9EaAmCmTnTERHTqeaA/BjwtHUcIvDxZt6ijby8T03Nuc3S mzdA93PPFhZGzHuNIOFxeH3xSTMvLlnGrN0lUS5Ibgn8++5Sl35Pu6qcKFK19+q9yJFl pMhkKdq/e54kcoNL5CXYA0d25gpSf5PqmG4y1RTTLTXcodXoV8bbWmXDUinHejEvF6oJ 4h6ZZ5aIkLY7XPrhFL0Lyc1s311QqGuQKAZ3JnYTZEXhJ3alqmIBvi/Knd8xRf42Nx1z prs6Uz4dFBuNhlXHXH3CmbmM0k9h7VJfM6SP4ER3A/qgRM9JJ2K26Bw9rqqJY3aiiRia Cvcw== X-Gm-Message-State: AHPjjUg0DFfm3YR54SgUtJ+me6TjM9hxxdc3S/ll0Ik5H5R7JNEh96d1 izWlj9JaugOt8/VxUR+GS1I= 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-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 --- 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"; - }; }; }; };