Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <6f6afb3c-ae8b-5b33-1b51-2e97148c249b@linaro.org>
Date:   Fri, 5 May 2023 08:48:36 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.10.1
From:   Neil Armstrong <neil.armstrong@linaro.org>
Reply-To: neil.armstrong@linaro.org
Subject: Re: [PATCH 4/4] ARM: dts: Move .dts files to vendor sub-directories
Content-Language: en-US
To:     Rob Herring <robh@kernel.org>, soc@kernel.org,
        Christian Marangi <ansuelsmth@gmail.com>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Russell King <linux@armlinux.org.uk>,
        Masahiro Yamada <masahiroy@kernel.org>,
        =?UTF-8?Q?Andreas_F=c3=a4rber?= <afaerber@suse.de>,
        Manivannan Sadhasivam <mani@kernel.org>,
        Shawn Guo <shawnguo@kernel.org>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Fabio Estevam <festevam@gmail.com>,
        Antoine Tenart <atenart@kernel.org>,
        Kevin Hilman <khilman@baylibre.com>,
        Jerome Brunet <jbrunet@baylibre.com>,
        Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        Sudeep Holla <sudeep.holla@arm.com>,
        Joel Stanley <joel@jms.id.au>,
        Nicolas Ferre <nicolas.ferre@microchip.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Beznea <claudiu.beznea@microchip.com>,
        Lars Persson <lars.persson@axis.com>,
        Scott Branden <sbranden@broadcom.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Andre Przywara <andre.przywara@arm.com>,
        Baruch Siach <baruch@tkos.co.il>,
        Wei Xu <xuwei5@hisilicon.com>,
        Jean-Marie Verdun <verdun@hpe.com>,
        Nick Hawkins <nick.hawkins@hpe.com>,
        Maxime Coquelin <mcoquelin.stm32@gmail.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        Vladimir Zapolskiy <vz@mleia.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Gregory Clement <gregory.clement@bootlin.com>,
        Lubomir Rintel <lkundrak@v3.sk>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        Peter Rosin <peda@axentia.se>, Nancy Yuen <yuenn@google.com>,
        Benjamin Fair <benjaminfair@google.com>,
        =?UTF-8?Q?Jonathan_Neusch=c3=a4fer?= <j.neuschaefer@gmx.net>,
        Thierry Reding <thierry.reding@gmail.com>,
        Bjorn Andersson <andersson@kernel.org>,
        Geert Uytterhoeven <geert+renesas@glider.be>,
        Heiko Stuebner <heiko@sntech.de>,
        Daniel Palmer <daniel@thingy.jp>,
        Romain Perier <romain.perier@gmail.com>,
        Kunihiko Hayashi <hayashi.kunihiko@socionext.com>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Viresh Kumar <vireshk@kernel.org>,
        Shiraz Hashim <shiraz.linux.kernel@gmail.com>,
        Patrice Chotard <patrice.chotard@foss.st.com>,
        Marek Vasut <marex@denx.de>, Qin Jian <qinjian@cqplus1.com>,
        Jisheng Zhang <jszhang@kernel.org>,
        Tony Lindgren <tony@atomide.com>,
        Paul Barker <paul.barker@sancloud.com>,
        Bartosz Golaszewski <brgl@bgdev.pl>,
        Nishanth Menon <nm@ti.com>,
        Santosh Shilimkar <ssantosh@kernel.org>,
        Enric Balletbo i Serra <eballetbo@gmail.com>,
        Javier Martinez Canillas <javier@dowhile0.org>,
        Michal Simek <michal.simek@xilinx.com>
Cc:     devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, linux-arm-kernel@axis.com,
        "linux-amlogic@lists.infradead.org" 
        <linux-amlogic@lists.infradead.org>
References: <20230504-arm-dts-mv-v1-0-2c8e51a2b6c4@kernel.org>
 <20230504-arm-dts-mv-v1-4-2c8e51a2b6c4@kernel.org>
Organization: Linaro Developer Services
In-Reply-To: <20230504-arm-dts-mv-v1-4-2c8e51a2b6c4@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 05/05/2023 05:29, Rob Herring wrote:
> The arm dts directory has grown to 1553 boards which makes it a bit
> unwieldy to maintain and use. Past attempts stalled out due to plans to
> move .dts files out of the kernel tree. Doing that is no longer planned
> (any time soon at least), so let's go ahead and group .dts files by
> vendors. This move aligns arm with arm64 .dts file structure.
> 
> Doing this enables building subsets of dts files by vendor easily
> without changing kernel configs:
> 
> make allyesconfig
> make arch/arm/boot/dts/ti/
> 
> There's no change to dtbs_install as the flat structure is maintained on
> install.
> 
> The naming of vendor directories is roughly in this order of preference:
> - Matching original and current SoC vendor prefix/name (e.g. ti, qcom)
> - Current vendor prefix/name if still actively sold (SoCs which have
>    been aquired) (e.g. nxp/imx)
> - Existing platform name for older platforms not sold/maintained by any
>    company (e.g. gemini, nspire)
> 
> The whole move was scripted with the exception of MAINTAINERS.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>   MAINTAINERS                                        |  181 +--

<snip>

>   arch/arm/boot/dts/amlogic/Makefile                 |    9 +
>   arch/arm/boot/dts/{ => amlogic}/meson.dtsi         |    0
>   arch/arm/boot/dts/{ => amlogic}/meson6-atv1200.dts |    0
>   arch/arm/boot/dts/{ => amlogic}/meson6.dtsi        |    0
>   .../boot/dts/{ => amlogic}/meson8-minix-neo-x8.dts |    0
>   arch/arm/boot/dts/{ => amlogic}/meson8.dtsi        |    0
>   arch/arm/boot/dts/{ => amlogic}/meson8b-ec100.dts  |    0
>   arch/arm/boot/dts/{ => amlogic}/meson8b-mxq.dts    |    0
>   .../boot/dts/{ => amlogic}/meson8b-odroidc1.dts    |    0
>   arch/arm/boot/dts/{ => amlogic}/meson8b.dtsi       |    0
>   .../boot/dts/{ => amlogic}/meson8m2-mxiii-plus.dts |    0
>   arch/arm/boot/dts/{ => amlogic}/meson8m2.dtsi      |    0

<snip>

> @@ -1909,7 +1909,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
>   L:	linux-amlogic@lists.infradead.org
>   S:	Maintained
>   W:	http://linux-meson.com/
> -F:	arch/arm/boot/dts/meson*
> +F:	arch/arm/boot/dts/amlogic/
>   F:	arch/arm/mach-meson/
>   F:	arch/arm64/boot/dts/amlogic/
>   F:	drivers/mmc/host/meson*

<snip>

> diff --git a/arch/arm/boot/dts/amlogic/Makefile b/arch/arm/boot/dts/amlogic/Makefile
> new file mode 100644
> index 000000000000..a84310780ea3
> --- /dev/null
> +++ b/arch/arm/boot/dts/amlogic/Makefile
> @@ -0,0 +1,9 @@
> +# SPDX-License-Identifier: GPL-2.0
> +dtb-$(CONFIG_MACH_MESON6) += \
> +	meson6-atv1200.dtb
> +dtb-$(CONFIG_MACH_MESON8) += \
> +	meson8-minix-neo-x8.dtb \
> +	meson8b-ec100.dtb \
> +	meson8b-mxq.dtb \
> +	meson8b-odroidc1.dtb \
> +	meson8m2-mxiii-plus.dtb
> diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/amlogic/meson.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/meson.dtsi
> rename to arch/arm/boot/dts/amlogic/meson.dtsi
> diff --git a/arch/arm/boot/dts/meson6-atv1200.dts b/arch/arm/boot/dts/amlogic/meson6-atv1200.dts
> similarity index 100%
> rename from arch/arm/boot/dts/meson6-atv1200.dts
> rename to arch/arm/boot/dts/amlogic/meson6-atv1200.dts
> diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/amlogic/meson6.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/meson6.dtsi
> rename to arch/arm/boot/dts/amlogic/meson6.dtsi
> diff --git a/arch/arm/boot/dts/meson8-minix-neo-x8.dts b/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts
> similarity index 100%
> rename from arch/arm/boot/dts/meson8-minix-neo-x8.dts
> rename to arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts
> diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/meson8.dtsi
> rename to arch/arm/boot/dts/amlogic/meson8.dtsi
> diff --git a/arch/arm/boot/dts/meson8b-ec100.dts b/arch/arm/boot/dts/amlogic/meson8b-ec100.dts
> similarity index 100%
> rename from arch/arm/boot/dts/meson8b-ec100.dts
> rename to arch/arm/boot/dts/amlogic/meson8b-ec100.dts
> diff --git a/arch/arm/boot/dts/meson8b-mxq.dts b/arch/arm/boot/dts/amlogic/meson8b-mxq.dts
> similarity index 100%
> rename from arch/arm/boot/dts/meson8b-mxq.dts
> rename to arch/arm/boot/dts/amlogic/meson8b-mxq.dts
> diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
> similarity index 100%
> rename from arch/arm/boot/dts/meson8b-odroidc1.dts
> rename to arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
> diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/meson8b.dtsi
> rename to arch/arm/boot/dts/amlogic/meson8b.dtsi
> diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts
> similarity index 100%
> rename from arch/arm/boot/dts/meson8m2-mxiii-plus.dts
> rename to arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts
> diff --git a/arch/arm/boot/dts/meson8m2.dtsi b/arch/arm/boot/dts/amlogic/meson8m2.dtsi
> similarity index 100%
> rename from arch/arm/boot/dts/meson8m2.dtsi
> rename to arch/arm/boot/dts/amlogic/meson8m2.dtsi


<snip>

Acked-by: Neil Armstrong <neil.armstrong@linaro.org>