devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lothar Rubusch <l.rubusch@gmail.com>
To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org,
	dinguyen@kernel.org, martin.petersen@oracle.com,
	pabeni@redhat.com, rostedt@goodmis.org, bhelgaas@google.com,
	l.rubusch@gmail.com
Cc: arnd@arndb.de, matthew.gerlach@altera.com,
	tien.fong.chee@altera.com, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Steffen Trumtrar <s.trumtrar@pengutronix.de>
Subject: [PATCH v6 09/11] ARM: dts: socfpga: removal of generic PE1 dts
Date: Wed, 15 Oct 2025 19:44:14 +0000	[thread overview]
Message-ID: <20251015194416.33502-10-l.rubusch@gmail.com> (raw)
In-Reply-To: <20251015194416.33502-1-l.rubusch@gmail.com>

Remove the older socfpga_arria10_mercury_pe1.dts, since it is duplicate,
the hardware is covered by the combination of Enclustra's .dtsi files.

The older .dts was limited to only the case of having an Enclustra
Mercury+ AA1 on a Mercury+ PE1 base board, booting from sdmmc. This
functionality is provided also by the generic Enclustra dtsi and dts
files, in particular socfpga_arria10_mercury_aa1_pe1_sdmmc.dts. Since
both .dts files cover the same, the older one is to e replaced in
favor of the more modularized approach.

Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
Acked-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 arch/arm/boot/dts/intel/socfpga/Makefile      |  1 -
 .../socfpga/socfpga_arria10_mercury_pe1.dts   | 55 -------------------
 2 files changed, 56 deletions(-)
 delete mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_pe1.dts

diff --git a/arch/arm/boot/dts/intel/socfpga/Makefile b/arch/arm/boot/dts/intel/socfpga/Makefile
index 7f69a0355ea5..73a912ec6d95 100644
--- a/arch/arm/boot/dts/intel/socfpga/Makefile
+++ b/arch/arm/boot/dts/intel/socfpga/Makefile
@@ -2,7 +2,6 @@
 dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \
 	socfpga_arria5_socdk.dtb \
 	socfpga_arria10_chameleonv3.dtb \
-	socfpga_arria10_mercury_pe1.dtb \
 	socfpga_arria10_socdk_nand.dtb \
 	socfpga_arria10_socdk_qspi.dtb \
 	socfpga_arria10_socdk_sdmmc.dtb \
diff --git a/arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_pe1.dts b/arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_pe1.dts
deleted file mode 100644
index cf533f76a9fd..000000000000
--- a/arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_pe1.dts
+++ /dev/null
@@ -1,55 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright 2023 Steffen Trumtrar <kernel@pengutronix.de>
- */
-/dts-v1/;
-#include "socfpga_arria10_mercury_aa1.dtsi"
-
-/ {
-	model = "Enclustra Mercury+ PE1";
-	compatible = "enclustra,mercury-pe1", "enclustra,mercury-aa1",
-		     "altr,socfpga-arria10", "altr,socfpga";
-
-	aliases {
-		ethernet0 = &gmac0;
-		serial0 = &uart0;
-		serial1 = &uart1;
-	};
-};
-
-&gmac0 {
-	status = "okay";
-};
-
-&gpio0 {
-	status = "okay";
-};
-
-&gpio1 {
-	status = "okay";
-};
-
-&gpio2 {
-	status = "okay";
-};
-
-&i2c1 {
-	status = "okay";
-};
-
-&mmc {
-	status = "okay";
-};
-
-&uart0 {
-	status = "okay";
-};
-
-&uart1 {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-	dr_mode = "host";
-};
-- 
2.39.5


  parent reply	other threads:[~2025-10-15 19:44 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-15 19:44 [PATCH v6 00/11] Add Enclustra Arria10 and Cyclone5 SoMs Lothar Rubusch
2025-10-15 19:44 ` [PATCH v6 01/11] ARM: dts: socfpga: add Enclustra boot-mode dtsi Lothar Rubusch
2025-10-15 19:44 ` [PATCH v6 02/11] ARM: dts: socfpga: add Enclustra base-board dtsi Lothar Rubusch
2025-10-15 19:44 ` [PATCH v6 03/11] ARM: dts: socfpga: add Enclustra Mercury SA1 Lothar Rubusch
2025-10-15 19:44 ` [PATCH v6 04/11] dt-bindings: altera: " Lothar Rubusch
2025-10-15 19:44 ` [PATCH v6 05/11] ARM: dts: socfpga: add Enclustra Mercury+ SA2 Lothar Rubusch
2025-10-15 19:44 ` [PATCH v6 06/11] dt-bindings: altera: add binding for " Lothar Rubusch
2025-10-15 19:44 ` [PATCH v6 07/11] ARM: dts: socfpga: add Mercury AA1 variants Lothar Rubusch
2025-10-15 19:44 ` [PATCH v6 08/11] dt-bindings: altera: " Lothar Rubusch
2025-10-16 16:32   ` Rob Herring
2025-10-15 19:44 ` Lothar Rubusch [this message]
2025-10-15 19:44 ` [PATCH v6 10/11] dt-bindings: altera: removal of generic PE1 dts Lothar Rubusch
2025-10-16 16:33   ` Rob Herring
2025-10-15 19:44 ` [PATCH v6 11/11] ARM: dts: socfpga: add Enclustra SoM dts files Lothar Rubusch
2025-10-16  2:21 ` [PATCH v6 00/11] Add Enclustra Arria10 and Cyclone5 SoMs Rob Herring (Arm)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251015194416.33502-10-l.rubusch@gmail.com \
    --to=l.rubusch@gmail.com \
    --cc=arnd@arndb.de \
    --cc=bhelgaas@google.com \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dinguyen@kernel.org \
    --cc=krzk+dt@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=matthew.gerlach@altera.com \
    --cc=pabeni@redhat.com \
    --cc=robh@kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=s.trumtrar@pengutronix.de \
    --cc=tien.fong.chee@altera.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).