From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by mx.groups.io with SMTP id smtpd.web10.5840.1683068567700801892 for ; Tue, 02 May 2023 16:02:47 -0700 Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-75131c2997bso37715385a.1 for ; Tue, 02 May 2023 16:02:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683068567; x=1685660567; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=RVUCe/5y2Ex7bNIQOvHne7x9R8A0wELwbdEse2WDpF8=; b=iHBlY9kIRMOF3Yq8hT/HYtLwTwjoof0FVfaEhNjRSWPoYgoA1qtRUzGwD+nkjOzJPI u09FXpbJrjxtM3MFyzM74JfHNsb7UZ0GJze/A7Ip/HD+5roEWeYmZwjlYu0a2cdkfbwf +kLbPvAmDmxad5KujOjWnyiCW+W4okHTLQRqn4fLYSw7t/qXPwhwMm5mWSJxb8hi+d0O ev3gtx0+XlazA6w82yl+mnLoL1jpad70ZxSgOz1YQXa9W1BLk0lheCYSgecLnoqpXxAH /k0Y7rMrxmhfNEQZTdJyCemWb5DMYD7STFJO05Jiqj2/50xWs6TXP7C2X1ywzoueu5sn IGTQ== Return-Path: Message-ID: Date: Tue, 2 May 2023 16:02:34 -0700 MIME-Version: 1.0 Subject: Re: [RFC PATCH 0/1] Categorize ARM dts directory References: <20220328000915.15041-1-ansuelsmth@gmail.com> <85eb14ec-f465-7447-ad77-a3dabc666f47@kernel.org> <720a2829-b6b5-411c-ac69-9a53e881f48d@app.fastmail.com> From: Florian Fainelli In-Reply-To: Content-Language: en-US Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit To: Rob Herring , Arnd Bergmann Cc: Geert Uytterhoeven , Olof Johansson , Christian Marangi , Krzysztof Kozlowski , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-actions@lists.infradead.org, linux-sunxi@lists.linux.dev, Linux-OMAP , linux-amlogic@lists.infradead.org, linux-arm-kernel@axis.com, linux-aspeed@lists.ozlabs.org, linux-rpi-kernel@lists.infradead.org, chrome-platform@lists.linux.dev, Linux-Renesas , linux-samsung-soc@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, kernel@dh-electronics.com, linux-mediatek@lists.infradead.org, openbmc@lists.ozlabs.org, linux-tegra@vger.kernel.org, "linux-oxnas@groups.io" , linux-arm-msm@vger.kernel.org, linux-unisoc@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-realtek-soc@lists.infradead.org List-ID: On 5/2/23 12:40, Rob Herring wrote: > On Tue, May 2, 2023 at 3:15 AM Arnd Bergmann wrote: >> >> On Tue, Apr 25, 2023, at 17:57, Rob Herring wrote: >>> On Tue, Apr 25, 2023 at 2:28 AM Geert Uytterhoeven wrote: >>> >>>> Does your script also cater for .dts files not matching any pattern, >>>> but including a .dtsi file that does match a pattern? >>> >>> I assume I built everything after moving, but maybe not... >>> >>> That's all just "details". First, we need agreement on a) moving >>> things to subdirs and b) doing it 1-by-1 or all at once. So far we've >>> been stuck on a) for being 'too much churn'. >> >> Sorry for missing most of the discussion last week. The script sounds >> fine to me, the only reason I didn't want to do this in the past is that >> we had the plan to move platforms out of the kernel tree to an external >> repository and I wanted to do this platform at a time and also only move >> each one once. I don't think that is going to happen anytime soon now, >> so let's just do your script. >> >> Can you send me the script and/or a pull request of the resulting >> tree based on my soc/dt branch? Everything is merged upstream, >> and I think git-merge would handle the remaining merges with any >> other changes in mainline. > > I've dusted off my script and made a branch[1] with the result. > There's just a couple of fixes needed after the script is run (see the > top commit). The cross arch includes are all fixed up by the script. > dtbs_install maintains a flat install. I compared the number of .dtbs > before and after to check the script. > > I think the only issue remaining is finalizing the mapping of > platforms to subdirs. What I have currently is a mixture of SoC > families and vendors. The most notable are all the Freescale/NXP > platforms, pxa, socfpga, and stm32. It's not consistent with arm64 > either. Once that's finalized, I still need to go update MAINTAINERS. > > Here's the current mapping: > > vendor_map = { > 'alphascale' : 'alphascale', > 'alpine' : 'alpine', > 'artpec' : 'axis', > 'axm' : 'lsi', > 'cx9' : 'cnxt', > 'ecx' : 'calxeda', > 'highbank' : 'calxeda', > 'ep7' : 'cirrus', > 'mxs': 'mxs', > 'imx23': 'mxs', > 'imx28': 'mxs', > 'sun' : 'allwinner', > 'imx': 'imx', > 'e6' : 'imx', > 'e7' : 'imx', > 'mba6' : 'imx', > 'ls': 'fsl', > 'vf': 'fsl', > 'qcom': 'qcom', > 'am3' : 'ti', > 'am4' : 'ti', > 'am5' : 'ti', > 'dra' : 'ti', > 'keystone' : 'ti', > 'omap' : 'ti', > 'compulab' : 'ti', > 'logicpd' : 'ti', > 'elpida' : 'ti', > 'motorola' : 'ti', > 'twl' : 'ti', > 'da' : 'ti', > 'dm' : 'ti', > 'nspire' : 'nspire', > 'armada' : 'marvell', > 'dove' : 'marvell', > 'kirkwood' : 'marvell', > 'orion' : 'marvell', > 'mvebu' : 'marvell', > 'mmp' : 'marvell', > 'berlin' : 'berlin', > 'pxa2' : 'pxa', > 'pxa3' : 'pxa', > 'pxa' : 'marvell', > 'arm-' : 'arm', > 'integ' : 'arm', > 'mps' : 'arm', > 've' : 'arm', > 'aspeed' : 'aspeed', > 'ast2' : 'aspeed', > 'facebook' : 'aspeed', > 'ibm' : 'aspeed', > 'openbmc' : 'aspeed', > 'en7' : 'airoha', > 'at91' : 'microchip', > 'sama' : 'microchip', > 'sam9' : 'microchip', > 'usb_' : 'microchip', > 'tny_' : 'microchip', > 'mpa1600' : 'microchip', > 'animeo_ip' : 'microchip', > 'aks-cdu' : 'microchip', > 'ethernut5' : 'microchip', > 'evk-pro3' : 'microchip', > 'pm9g45' : 'microchip', > 'ge86' : 'microchip', > 'bcm' : 'brcm', How about we use 'broadcom' here, to follow what arm64 does? I could rename arch/mips/boot/dts/brcm to arch/mips/boot/dts/broadcom for consistency, too? -- Florian