Re: [PATCHv3 20/22] ARM: dts: socfpga: removal of generic PE1 dts

Steffen Trumtrar
2024-10-28T08:42:22Z

On 2024-10-27 at 14:36 GMT, Lothar Rubusch <l.rubusch@gmail.com> wrote:

> 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";
> -};

Acked-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>

Best regards,
Steffen

--
Pengutronix e.K. | Dipl.-Inform. Steffen Trumtrar |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686| Fax: +49-5121-206917-5555 |