Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: socfpga: removal of generic PE1 dts

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>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>

authored by

Lothar Rubusch and committed by
Dinh Nguyen
adacc092 a31736de

-56
-1
arch/arm/boot/dts/intel/socfpga/Makefile
··· 2 2 dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \ 3 3 socfpga_arria5_socdk.dtb \ 4 4 socfpga_arria10_chameleonv3.dtb \ 5 - socfpga_arria10_mercury_pe1.dtb \ 6 5 socfpga_arria10_socdk_nand.dtb \ 7 6 socfpga_arria10_socdk_qspi.dtb \ 8 7 socfpga_arria10_socdk_sdmmc.dtb \
-55
arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_pe1.dts
··· 1 - // SPDX-License-Identifier: GPL-2.0 2 - /* 3 - * Copyright 2023 Steffen Trumtrar <kernel@pengutronix.de> 4 - */ 5 - /dts-v1/; 6 - #include "socfpga_arria10_mercury_aa1.dtsi" 7 - 8 - / { 9 - model = "Enclustra Mercury+ PE1"; 10 - compatible = "enclustra,mercury-pe1", "enclustra,mercury-aa1", 11 - "altr,socfpga-arria10", "altr,socfpga"; 12 - 13 - aliases { 14 - ethernet0 = &gmac0; 15 - serial0 = &uart0; 16 - serial1 = &uart1; 17 - }; 18 - }; 19 - 20 - &gmac0 { 21 - status = "okay"; 22 - }; 23 - 24 - &gpio0 { 25 - status = "okay"; 26 - }; 27 - 28 - &gpio1 { 29 - status = "okay"; 30 - }; 31 - 32 - &gpio2 { 33 - status = "okay"; 34 - }; 35 - 36 - &i2c1 { 37 - status = "okay"; 38 - }; 39 - 40 - &mmc { 41 - status = "okay"; 42 - }; 43 - 44 - &uart0 { 45 - status = "okay"; 46 - }; 47 - 48 - &uart1 { 49 - status = "okay"; 50 - }; 51 - 52 - &usb0 { 53 - status = "okay"; 54 - dr_mode = "host"; 55 - };