From patchwork Thu Mar 9 10:39:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9612989 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 1971C602B4 for ; Thu, 9 Mar 2017 10:41:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06CBE285CE for ; Thu, 9 Mar 2017 10:41:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE455285E0; Thu, 9 Mar 2017 10:41:15 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID 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 EAC40285CE for ; Thu, 9 Mar 2017 10:41:14 +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=/qxFvDuVXwa8b0XyJfAuoAphsu3g6zOTzsvu5vVITSg=; b=qmW3C3Z9U+mDaJO/5WgKpf+ZeN Klqa7qz8l52Tg3wuXjfMFGaNI5aEodmf4KvN/EFtWit/MPaIIyU9auRXI/Cj4nIyiOy2WAEtToU4E ioqlDFjek6RhhHuxoIooIG64ZLTbrmqV8xhKe/8WCE/8NbJfwmaBq38tveBSEIJpC5x+phvX03Sql Y+pdgnSs++6TeAYefgWvhdlNpRpdkCosWStz6GGwJ5LgPyAxgo66SLXs0DJ7kTZpWm68UUmiHaWHs XoyelJVZiRHYCZ1BfMqv1dljw4ZXP5nE0iXCU0crpCGi3L4kl34jY5nrATCkqAQsQ85TsipyUMzVw wpisr5XA==; 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 1clvVS-0005rO-Id; Thu, 09 Mar 2017 10:41:14 +0000 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1clvTq-0003eg-Vy for linux-arm-kernel@lists.infradead.org; Thu, 09 Mar 2017 10:39:38 +0000 Received: by mail-wr0-x22b.google.com with SMTP id u48so42105647wrc.0 for ; Thu, 09 Mar 2017 02:39:14 -0800 (PST) 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:in-reply-to:references; bh=UBai9rsjV6DlfeJGh7Sr6nnBmeM5SXC0jL4CKKUKaJA=; b=NRdfsEl0DeFLHmZNqIC4tIvwNCJ7yp9e4opL6Rh0TUR4i7oV1ZMxHFLTh1J++bV4Is pBOSNdZzhklOFsuil22U1PgXfvpOZyaMkuH569EiYgcWOemmfLmbT08xVutkuwFf4o1d CJkht+Y1fgglOcCDvG9kxxe/l7agAzOCLsIKZpeAxpKZYXuvKDDo6UOhgyPA2NcleY9d SrG21fBZBP4FcH7DDhgsKDmRcBPIZl66iZ6gr8Q08nUDrtGEuyCCpxYadsLuJlAVAiWT eYV3r9vJhYRZJnO8UkiAftzfXNCkTvnhQQVu/AuBMn+5k1kuj1Kqg5WiyjpnxKyc6vlK RTtQ== 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:in-reply-to :references; bh=UBai9rsjV6DlfeJGh7Sr6nnBmeM5SXC0jL4CKKUKaJA=; b=AEldF0x/gPonLURg+JUZgi23Uh7D2ryn1zGRWP7hNLGYjDe5eVmx8OkRafzsRzWUWM gd3x3M2WD01W3jgsd/c+Uv4Vd1eoAQhqXkxHeXI73j3k+c+Vj/vk1VTSH1tbUkxSNysa jQusyuXvk5ttAnVmkMy1R43FAUWDP2vky+BzG0syKKlWY1s0LaY5W+tsFSUTDniPVTbL PAqXCD7uHelf5fIf79aAQmBcoa8GbYoguGGidajDDlUXbilAqq1F9xyLrSU1vxnvP6RU dB+SZwBgJvm18qEojETgvHjBCNfYlH+YFNohykc4/I0wzRdfvCqxie8GurZMZqnLTx2s iEVA== X-Gm-Message-State: AMke39kLry0URjfk+WIBVR7IZelwquhXtVpeVbKJ1mQDqhNE1qYUzTzLI8MxFN94OPXDQ0MZ X-Received: by 10.223.169.45 with SMTP id u42mr9548339wrc.187.1489055953106; Thu, 09 Mar 2017 02:39:13 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id g23sm8262791wme.8.2017.03.09.02.39.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Mar 2017 02:39:12 -0800 (PST) From: Neil Armstrong To: carlo@caione.org, khilman@baylibre.com Subject: [PATCH 1/3] ARM64: dts: meson-gx: Finally move common nodes to GX dtsi Date: Thu, 9 Mar 2017 11:39:06 +0100 Message-Id: <1489055948-10656-2-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489055948-10656-1-git-send-email-narmstrong@baylibre.com> References: <1489055948-10656-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170309_023935_180780_C4EDE619 X-CRM114-Status: GOOD ( 10.24 ) 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, devicetree@vger.kernel.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 Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 24 ++++++++++++++++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 43 ++++++----------------------- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 ++++++ 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 5d995f7..2d8dc6f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -296,6 +296,14 @@ status = "disabled"; }; + spifc: spi@8c80 { + compatible = "amlogic,meson-gxbb-spifc"; + reg = <0x0 0x08c80 0x0 0x80>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + watchdog@98d0 { compatible = "amlogic,meson-gx-wdt", "amlogic,meson-gxbb-wdt"; reg = <0x0 0x098d0 0x0 0x10>; @@ -342,6 +350,13 @@ #size-cells = <2>; ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>; + clkc_AO: clock-controller@040 { + compatible = "amlogic,gx-aoclkc", "amlogic,gxbb-aoclkc"; + reg = <0x0 0x00040 0x0 0x4>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + uart_AO: serial@4c0 { compatible = "amlogic,meson-uart"; reg = <0x0 0x004c0 0x0 0x14>; @@ -358,6 +373,15 @@ status = "disabled"; }; + i2c_AO: i2c@500 { + compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; + reg = <0x0 0x500 0x0 0x20>; + interrupts = ; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + pwm_AO_ab: pwm@550 { compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; reg = <0x0 0x00550 0x0 0x10>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 04b3324..c2c41aa 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -97,17 +97,6 @@ }; }; -&cbus { - spifc: spi@8c80 { - compatible = "amlogic,meson-gxbb-spifc"; - reg = <0x0 0x08c80 0x0 0x80>; - #address-cells = <1>; - #size-cells = <0>; - clocks = <&clkc CLKID_SPI>; - status = "disabled"; - }; -}; - ðmac { clocks = <&clkc CLKID_ETH>, <&clkc CLKID_FCLK_DIV2>, @@ -204,30 +193,6 @@ }; }; }; - - clkc_AO: clock-controller@040 { - compatible = "amlogic,gxbb-aoclkc"; - reg = <0x0 0x00040 0x0 0x4>; - #clock-cells = <1>; - #reset-cells = <1>; - }; - - pwm_ab_AO: pwm@550 { - compatible = "amlogic,meson-gxbb-pwm"; - reg = <0x0 0x0550 0x0 0x10>; - #pwm-cells = <3>; - status = "disabled"; - }; - - i2c_AO: i2c@500 { - compatible = "amlogic,meson-gxbb-i2c"; - reg = <0x0 0x500 0x0 0x20>; - interrupts = ; - clocks = <&clkc CLKID_AO_I2C>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; }; &periphs { @@ -482,6 +447,10 @@ clocks = <&clkc CLKID_I2C>; }; +&i2c_AO { + clocks = <&clkc CLKID_AO_I2C>; +}; + &i2c_B { clocks = <&clkc CLKID_I2C>; }; @@ -521,6 +490,10 @@ clock-names = "core", "clkin0", "clkin1"; }; +&spifc { + clocks = <&clkc CLKID_SPI>; +}; + &vpu { compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 17cd546..37ed7a0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -427,6 +427,10 @@ clocks = <&clkc CLKID_I2C>; }; +&i2c_AO { + clocks = <&clkc CLKID_AO_I2C>; +}; + &i2c_B { clocks = <&clkc CLKID_I2C>; }; @@ -466,6 +470,10 @@ clock-names = "core", "clkin0", "clkin1"; }; +&spifc { + clocks = <&clkc CLKID_SPI>; +}; + &vpu { compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; };