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, marex@denx.de, s.trumtrar@pengutronix.de
Cc: l.rubusch@gmail.com, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCHv2 21/23] ARM: dts: socfpga: removal of generic PE1 dts
Date: Sun, 20 Oct 2024 19:40:26 +0000	[thread overview]
Message-ID: <20241020194028.2272371-22-l.rubusch@gmail.com> (raw)
In-Reply-To: <20241020194028.2272371-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>
---
 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 c467828ae..d95862e34 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 cf533f76a..000000000
--- 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.25.1


  parent reply	other threads:[~2024-10-20 19:41 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-20 19:40 [PATCHv2 00/23] Add Enclustra Arria10 and Cyclone5 SoMs Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 01/23] ARM: dts: socfpga: fix typo Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 02/23] ARM: dts: socfpga: align bus name with bindings Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 03/23] ARM: dts: socfpga: align dma name with binding Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 04/23] ARM: dts: socfpga: align fpga-region name Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 05/23] ARM: dts: socfpga: add label to clock manager Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 06/23] ARM: dts: socfpga: add missing cells properties Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 07/23] ARM: dts: socfpga: fix missing ranges Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 08/23] ARM: dts: socfpga: add clock-frequency property Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 09/23] ARM: dts: socfpga: add ranges property to sram Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 10/23] ARM: dts: socfpga: remove arria10 reset-names Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 11/23] ARM: socfpga: dts: add compatibility for arria10 Lothar Rubusch
2024-10-21  7:05   ` Krzysztof Kozlowski
2024-10-20 19:40 ` [PATCHv2 12/23] ARM: socfpga: dts: add a10 clock binding yaml Lothar Rubusch
2024-10-20 22:21   ` Rob Herring (Arm)
2024-10-21  7:04   ` Krzysztof Kozlowski
2024-10-24  6:10     ` Lothar Rubusch
2024-10-24  6:24       ` Krzysztof Kozlowski
2024-10-25  6:59         ` Lothar Rubusch
2024-10-25  8:01           ` Krzysztof Kozlowski
2024-10-20 19:40 ` [PATCHv2 13/23] ARM: dts: socfpga: add Enclustra boot-mode dtsi Lothar Rubusch
2024-10-23 17:20   ` Ahmad Fatoum
2024-10-24  6:15     ` Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 14/23] ARM: dts: socfpga: add Enclustra base-board dtsi Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 15/23] ARM: dts: socfpga: add Enclustra Mercury SA1 Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 16/23] dt-bindings: altera: " Lothar Rubusch
2024-10-21  7:47   ` Krzysztof Kozlowski
2024-10-20 19:40 ` [PATCHv2 17/23] ARM: dts: socfpga: add Enclustra Mercury+ SA2 Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 18/23] dt-bindings: altera: add binding for " Lothar Rubusch
2024-10-21  7:47   ` Krzysztof Kozlowski
2024-10-20 19:40 ` [PATCHv2 19/23] ARM: dts: socfpga: add Mercury AA1 combinations Lothar Rubusch
2024-10-20 19:40 ` [PATCHv2 20/23] dt-bindings: altera: " Lothar Rubusch
2024-10-21  7:48   ` Krzysztof Kozlowski
2024-10-20 19:40 ` Lothar Rubusch [this message]
2024-10-20 19:40 ` [PATCHv2 22/23] dt-bindings: altera: removal of generic PE1 dts Lothar Rubusch
2024-10-21  7:48   ` Krzysztof Kozlowski
2024-10-20 19:40 ` [PATCHv2 23/23] ARM: dts: socfpga: add Enclustra SoM dts files Lothar Rubusch
2024-10-21 17:58 ` [PATCHv2 00/23] 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=20241020194028.2272371-22-l.rubusch@gmail.com \
    --to=l.rubusch@gmail.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=marex@denx.de \
    --cc=robh@kernel.org \
    --cc=s.trumtrar@pengutronix.de \
    /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).