From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51D15C77B7D for ; Fri, 5 May 2023 06:48:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231181AbjEEGsy (ORCPT ); Fri, 5 May 2023 02:48:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231185AbjEEGsn (ORCPT ); Fri, 5 May 2023 02:48:43 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26F60FF for ; Thu, 4 May 2023 23:48:41 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f1738d0d4cso9000435e9.1 for ; Thu, 04 May 2023 23:48:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683269319; x=1685861319; h=content-transfer-encoding:in-reply-to:organization:references:cc:to :content-language:subject:reply-to:from:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=rtN4oMlLlW4QqPQK8hFrv2bFItCp38Em6zDqy+ipvU0=; b=vO64qFhPeibbS/4AnTmWdoubVj/CcofJxbAXZG/2Y41HCD8tEwUGQEAjL8Sz3L3eMs LX/ry87diVtXsDk7srORWbWqwT+k9/SZhmiyEKoEzgUQj2bMyRIUL81E/3Xwwg3ExmOw MnLFZTa74zhK27T1vBLe1iNQuBenPHS+6X796U60BA+st7TbsDSwZYng5oMS58UgsTkT Mcnd80H/psqnwPUKwpicj2P+9Hl2zThdDJXYaD8q/ZLjbCy710sZxkU09/THy/BNTJDu 6R8/KOUqdOiywRkmnOTYsWbnfVME+I28TOkiFHi6Z96CzhPT1zTaNHemCKRNorXI4cXm zEPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683269319; x=1685861319; h=content-transfer-encoding:in-reply-to:organization:references:cc:to :content-language:subject:reply-to:from:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rtN4oMlLlW4QqPQK8hFrv2bFItCp38Em6zDqy+ipvU0=; b=CFmEwZ/aLruIWK4Lk6m7HdaQZMJAZmyW+bM7d1tqdjg79qgMbJfL9YaWCrXLpEg3v0 D8YfX0qOTBN0Iw09OmN5Pr5oLupN5OSkX3ovzZJrXgNTRWZC9yE3opSlJMyQwWcr9j3M FHl0fds8ie+D6EiJxDtAD97Ub8YR1+9qz3FFsW5eq/qf4IlbguI06Ox0s7jtsRpSaJIP jppHwyygKcOJdoIK1knFlYFisEKX/ATlSwN7y+PtPZSbXCJZvjpBJfTlCEi3LSvYnxZF l2Yi6r6toFL/YV/iRQmqjorwDsYYRAxmrDsqmDdl0Ky3TWU+f83HE1s97IsHsAJhCFom c48A== X-Gm-Message-State: AC+VfDw2BgQTo/BYuWIKajE41vQXqaolyJ8C8NZCRXYFr3hJVJdgro9L wWE0ZObr5I4Ak2Xzha2041ZC+g== X-Google-Smtp-Source: ACHHUZ4870aZXVeMzfgUOk5ToMNkHvIEW8SwW9PQdL63ZDDVaN64SJlt5Tv4kXOtRHhXWGxGJirb4w== X-Received: by 2002:a1c:f310:0:b0:3f1:74bd:bc22 with SMTP id q16-20020a1cf310000000b003f174bdbc22mr250544wmq.6.1683269319442; Thu, 04 May 2023 23:48:39 -0700 (PDT) Received: from ?IPV6:2a01:e0a:982:cbb0:f548:bbaf:d95f:43ff? ([2a01:e0a:982:cbb0:f548:bbaf:d95f:43ff]) by smtp.gmail.com with ESMTPSA id x2-20020a05600c21c200b003f182c11667sm6993181wmj.39.2023.05.04.23.48.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 May 2023 23:48:38 -0700 (PDT) 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 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 , soc@kernel.org, Christian Marangi , Krzysztof Kozlowski , Russell King , Masahiro Yamada , =?UTF-8?Q?Andreas_F=c3=a4rber?= , Manivannan Sadhasivam , Shawn Guo , Sascha Hauer , Fabio Estevam , Antoine Tenart , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Linus Walleij , Sudeep Holla , Joel Stanley , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Lars Persson , Scott Branden , Florian Fainelli , Andre Przywara , Baruch Siach , Wei Xu , Jean-Marie Verdun , Nick Hawkins , Maxime Coquelin , Alexandre Torgue , Vladimir Zapolskiy , Andrew Lunn , Gregory Clement , Lubomir Rintel , Matthias Brugger , Peter Rosin , Nancy Yuen , Benjamin Fair , =?UTF-8?Q?Jonathan_Neusch=c3=a4fer?= , Thierry Reding , Bjorn Andersson , Geert Uytterhoeven , Heiko Stuebner , Daniel Palmer , Romain Perier , Kunihiko Hayashi , Masami Hiramatsu , Viresh Kumar , Shiraz Hashim , Patrice Chotard , Marek Vasut , Qin Jian , Jisheng Zhang , Tony Lindgren , Paul Barker , Bartosz Golaszewski , Nishanth Menon , Santosh Shilimkar , Enric Balletbo i Serra , Javier Martinez Canillas , Michal Simek 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" 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 List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 > --- > MAINTAINERS | 181 +-- > 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 > @@ -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* > 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 Acked-by: Neil Armstrong