From patchwork Fri Oct 2 13:34:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Palmer X-Patchwork-Id: 11813561 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5EB42112E for ; Fri, 2 Oct 2020 13:34:46 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 594FC21D92; Fri, 2 Oct 2020 13:34:46 +0000 (UTC) Delivered-To: soc@kernel.org Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 04C5E21D94 for ; Fri, 2 Oct 2020 13:34:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=0x0f.com header.i=@0x0f.com header.b="kQvXISJu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04C5E21D94 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=0x0f.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=daniel@0x0f.com Received: by mail-pj1-f67.google.com with SMTP id t7so827531pjd.3 for ; Fri, 02 Oct 2020 06:34:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=0x0f.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8Yw3W1wDo04qc6EU7K5/0CbVdh78C1ldrffh52yrkp0=; b=kQvXISJuXT+ovAT9zSv0PSOxMHVxVy3w5VW0E0FsJCkp4C3uc4jmGbfcBVN4LEmlKl AeUg5Y2DEMvQZr2+LKRHzsOeMMnxJITQNyS35KNlRn+pzNnFH91smLo2VlNFyrK1VZME DrKOilkSpKrG0rSSpZK49+WEoQTBXIU9KWt5g= 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:mime-version:content-transfer-encoding; bh=8Yw3W1wDo04qc6EU7K5/0CbVdh78C1ldrffh52yrkp0=; b=UVxxJ1DLfF+yB7wtKU3B2CNtsXtac5XJw3B2RsGHIDdeh9xjxzOv9yT8ImfFfBCloT bZ8lKJP9P804m8rjIOxKPeLytho6zF/7igVkhOJGoA8gvmcwq8wRSfOfCioALB8qTU4T xJ+OP9EWPZWRcVDyWhmnU85yYBcvpbU+DfiX536ZaZTdlaGPtkJtc5U9Da1g7tePMEJL ZIpph9qtL1FPz7QBPqP65iPlryK0oKyX4zHHzNiZrih7ScZUWo+pjDc8rdvsWsUuuW/5 kFvWA3G9aT/OiJ4pGH0hEB5Y2HST/zd7Fm4j45rAWlhmpwGrV/cEXXa6UrGUfGjKCX1I 5n8g== X-Gm-Message-State: AOAM532H4rOgBgfUzXtAzBvJE7kzzEZ52JpRLWVMJi9Vfq62/qdiizZO b4CRWG02yc9XXtphj4u5pKfL0JRtwzuG8A== X-Google-Smtp-Source: ABdhPJw0Dn6yc42PCt2Iv6CbUx9stjkWZTT4RawfnU9Fbb0oikjrZ0MRZytZUX4oziayz2EC0J4STw== X-Received: by 2002:a17:90b:4394:: with SMTP id in20mr2974367pjb.70.1601645685048; Fri, 02 Oct 2020 06:34:45 -0700 (PDT) Received: from shiro.work (p1268123-ipngn200803sizuokaden.shizuoka.ocn.ne.jp. [118.13.124.123]) by smtp.googlemail.com with ESMTPSA id k14sm1708219pjd.45.2020.10.02.06.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 06:34:44 -0700 (PDT) From: Daniel Palmer List-Id: To: soc@kernel.org Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, mark-pk.tsai@mediatek.com, arnd@arndb.de, maz@kernel.org, Daniel Palmer Subject: [PATCH v2 4/5] ARM: mstar: Add mstar prefix to all of the dtsi/dts files Date: Fri, 2 Oct 2020 22:34:17 +0900 Message-Id: <20201002133418.2250277-5-daniel@0x0f.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201002133418.2250277-1-daniel@0x0f.com> References: <20201002133418.2250277-1-daniel@0x0f.com> MIME-Version: 1.0 Based on Arnd's comment[0] all of the MStar dtsi/dts files should have had a prefix. This moves the files, fixes the Makefile that generates dtbs and fixes up the MAINTAINERS entry. Fixing up some includes in the files themselves is left for a later commit as rolling it into this commit resulted in a confusing diff. 0 - https://lore.kernel.org/linux-arm-kernel/CAK8P3a0maQhfaerwG4KgFZOrUPwueKOp2+MOeG9C=+8ZNzc2Kg@mail.gmail.com/ Signed-off-by: Daniel Palmer --- MAINTAINERS | 4 +--- arch/arm/boot/dts/Makefile | 6 +++--- ...e_crust.dts => mstar-infinity-msc313-breadbee_crust.dts} | 0 .../{infinity-msc313.dtsi => mstar-infinity-msc313.dtsi} | 0 arch/arm/boot/dts/{infinity.dtsi => mstar-infinity.dtsi} | 0 ...3e-breadbee.dts => mstar-infinity3-msc313e-breadbee.dts} | 0 ...{infinity3-msc313e.dtsi => mstar-infinity3-msc313e.dtsi} | 0 arch/arm/boot/dts/{infinity3.dtsi => mstar-infinity3.dtsi} | 0 ...idrived08.dts => mstar-mercury5-ssc8336n-midrived08.dts} | 0 ...{mercury5-ssc8336n.dtsi => mstar-mercury5-ssc8336n.dtsi} | 0 arch/arm/boot/dts/{mercury5.dtsi => mstar-mercury5.dtsi} | 0 11 files changed, 4 insertions(+), 6 deletions(-) rename arch/arm/boot/dts/{infinity-msc313-breadbee_crust.dts => mstar-infinity-msc313-breadbee_crust.dts} (100%) rename arch/arm/boot/dts/{infinity-msc313.dtsi => mstar-infinity-msc313.dtsi} (100%) rename arch/arm/boot/dts/{infinity.dtsi => mstar-infinity.dtsi} (100%) rename arch/arm/boot/dts/{infinity3-msc313e-breadbee.dts => mstar-infinity3-msc313e-breadbee.dts} (100%) rename arch/arm/boot/dts/{infinity3-msc313e.dtsi => mstar-infinity3-msc313e.dtsi} (100%) rename arch/arm/boot/dts/{infinity3.dtsi => mstar-infinity3.dtsi} (100%) rename arch/arm/boot/dts/{mercury5-ssc8336n-midrived08.dts => mstar-mercury5-ssc8336n-midrived08.dts} (100%) rename arch/arm/boot/dts/{mercury5-ssc8336n.dtsi => mstar-mercury5-ssc8336n.dtsi} (100%) rename arch/arm/boot/dts/{mercury5.dtsi => mstar-mercury5.dtsi} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 45ec9df85a64..89cf1e4cffb0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2150,9 +2150,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained W: http://linux-chenxing.org/ F: Documentation/devicetree/bindings/arm/mstar/* -F: arch/arm/boot/dts/infinity*.dtsi -F: arch/arm/boot/dts/mercury*.dtsi -F: arch/arm/boot/dts/mstar-v7.dtsi +F: arch/arm/boot/dts/mstar-* F: arch/arm/mach-mstar/ ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 4572db3fa5ae..d80d20e6ce9e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1356,9 +1356,9 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt8135-evbp1.dtb dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb dtb-$(CONFIG_ARCH_MSTARV7) += \ - infinity-msc313-breadbee_crust.dtb \ - infinity3-msc313e-breadbee.dtb \ - mercury5-ssc8336n-midrived08.dtb + mstar-infinity-msc313-breadbee_crust.dtb \ + mstar-infinity3-msc313e-breadbee.dtb \ + mstar-mercury5-ssc8336n-midrived08.dtb dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-ast2500-evb.dtb \ diff --git a/arch/arm/boot/dts/infinity-msc313-breadbee_crust.dts b/arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts similarity index 100% rename from arch/arm/boot/dts/infinity-msc313-breadbee_crust.dts rename to arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts diff --git a/arch/arm/boot/dts/infinity-msc313.dtsi b/arch/arm/boot/dts/mstar-infinity-msc313.dtsi similarity index 100% rename from arch/arm/boot/dts/infinity-msc313.dtsi rename to arch/arm/boot/dts/mstar-infinity-msc313.dtsi diff --git a/arch/arm/boot/dts/infinity.dtsi b/arch/arm/boot/dts/mstar-infinity.dtsi similarity index 100% rename from arch/arm/boot/dts/infinity.dtsi rename to arch/arm/boot/dts/mstar-infinity.dtsi diff --git a/arch/arm/boot/dts/infinity3-msc313e-breadbee.dts b/arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts similarity index 100% rename from arch/arm/boot/dts/infinity3-msc313e-breadbee.dts rename to arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts diff --git a/arch/arm/boot/dts/infinity3-msc313e.dtsi b/arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi similarity index 100% rename from arch/arm/boot/dts/infinity3-msc313e.dtsi rename to arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi diff --git a/arch/arm/boot/dts/infinity3.dtsi b/arch/arm/boot/dts/mstar-infinity3.dtsi similarity index 100% rename from arch/arm/boot/dts/infinity3.dtsi rename to arch/arm/boot/dts/mstar-infinity3.dtsi diff --git a/arch/arm/boot/dts/mercury5-ssc8336n-midrived08.dts b/arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts similarity index 100% rename from arch/arm/boot/dts/mercury5-ssc8336n-midrived08.dts rename to arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts diff --git a/arch/arm/boot/dts/mercury5-ssc8336n.dtsi b/arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi similarity index 100% rename from arch/arm/boot/dts/mercury5-ssc8336n.dtsi rename to arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi diff --git a/arch/arm/boot/dts/mercury5.dtsi b/arch/arm/boot/dts/mstar-mercury5.dtsi similarity index 100% rename from arch/arm/boot/dts/mercury5.dtsi rename to arch/arm/boot/dts/mstar-mercury5.dtsi