Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933326AbdGTABy (ORCPT ); Wed, 19 Jul 2017 20:01:54 -0400 Received: from mail-wr0-f181.google.com ([209.85.128.181]:33242 "EHLO mail-wr0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932187AbdGTABw (ORCPT ); Wed, 19 Jul 2017 20:01:52 -0400 Subject: Re: [PATCH] ARM: dts: bcm283x: Move the BCM2837 DT contents from arm64 to arm. To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Catalin Marinas , Will Deacon , devicetree@vger.kernel.org, Rob Herring , Mark Rutland References: <20170719201916.22369-1-eric@anholt.net> Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stefan Wahren , bcm-kernel-feedback-list@broadcom.com From: Scott Branden Message-ID: Date: Wed, 19 Jul 2017 17:01:33 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170719201916.22369-1-eric@anholt.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4032 Lines: 139 Hi Eric, suggestion inline On 17-07-19 01:19 PM, Eric Anholt wrote: > BCM2837 is somewhat unusual in that we build its DT on both arm32 and > arm64. Most devices are being run in arm32 mode. > > Having the body of the DT for 2837 separate from 2835/6 has been a > source of pain, as we often need to make changes that span both > directories simultaneously (for example, the thermal changes for 4.13, > and pinmuxing changes earlier). Other changes are made more > complicated than they need to be, such as the SDHOST enabling, because > we end up splitting a single change into a 283[56] half and a 2837 > half. > > Signed-off-by: Eric Anholt > --- > > I had asked about what we could do about our DT merging troubles back > in https://lkml.org/lkml/2017/5/16/707 with no response. I'm hoping > we can take this patch as a resolution to that, and submit (almost > all) future RPi DT changes through the arm32 dt tree. > > > arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 42 +++++++++++++++++++++- > .../dts/broadcom => arm/boot/dts}/bcm2837.dtsi | 0 > arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 42 +--------------------- > 3 files changed, 42 insertions(+), 42 deletions(-) > rename arch/{arm64/boot/dts/broadcom => arm/boot/dts}/bcm2837.dtsi (100%) > > diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts > index c72a27d908b6..972f14db28ac 100644 > --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts > +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts > @@ -1 +1,41 @@ > -#include "arm64/broadcom/bcm2837-rpi-3-b.dts" > +/dts-v1/; > +#include "bcm2837.dtsi" > +#include "bcm2835-rpi.dtsi" > +#include "bcm283x-rpi-smsc9514.dtsi" > +#include "bcm283x-rpi-usb-host.dtsi" If you're moving this back to the arm directory why not change the include path and remove the 4 symlinks in arm64/boot/dts/broadcom? +#include "arm/bcm2837.dtsi" +#include "arm/bcm2835-rpi.dtsi" +#include "arm/bcm283x-rpi-smsc9514.dtsi" +#include "arm/bcm283x-rpi-usb-host.dtsi" > + > +/ { > + compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; > + model = "Raspberry Pi 3 Model B"; > + > + memory { > + reg = <0 0x40000000>; > + }; > + > + leds { > + act { > + gpios = <&gpio 47 0>; > + }; > + }; > +}; > + > +&uart1 { > + status = "okay"; > +}; > + > +/* SDHCI is used to control the SDIO for wireless */ > +&sdhci { > + pinctrl-names = "default"; > + pinctrl-0 = <&emmc_gpio34>; > + status = "okay"; > + bus-width = <4>; > + non-removable; > +}; > + > +/* SDHOST is used to drive the SD card */ > +&sdhost { > + pinctrl-names = "default"; > + pinctrl-0 = <&sdhost_gpio48>; > + status = "okay"; > + bus-width = <4>; > +}; > diff --git a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi > similarity index 100% > rename from arch/arm64/boot/dts/broadcom/bcm2837.dtsi > rename to arch/arm/boot/dts/bcm2837.dtsi > diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts > index 972f14db28ac..699d340a3437 100644 > --- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts > +++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts > @@ -1,41 +1 @@ > -/dts-v1/; > -#include "bcm2837.dtsi" > -#include "bcm2835-rpi.dtsi" > -#include "bcm283x-rpi-smsc9514.dtsi" > -#include "bcm283x-rpi-usb-host.dtsi" > - > -/ { > - compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; > - model = "Raspberry Pi 3 Model B"; > - > - memory { > - reg = <0 0x40000000>; > - }; > - > - leds { > - act { > - gpios = <&gpio 47 0>; > - }; > - }; > -}; > - > -&uart1 { > - status = "okay"; > -}; > - > -/* SDHCI is used to control the SDIO for wireless */ > -&sdhci { > - pinctrl-names = "default"; > - pinctrl-0 = <&emmc_gpio34>; > - status = "okay"; > - bus-width = <4>; > - non-removable; > -}; > - > -/* SDHOST is used to drive the SD card */ > -&sdhost { > - pinctrl-names = "default"; > - pinctrl-0 = <&sdhost_gpio48>; > - status = "okay"; > - bus-width = <4>; > -}; > +#include "arm/bcm2837-rpi-3-b.dts"