ARM: dts: stm32: Drop remnants of upstream DT switch on DH STM32 DHSOM

Remove unused local DT copies after the OF_UPSTREAM conversion.

Fixes: cccb29fc1270 ("ARM: dts: stm32: Switch to using upstream DT on DH STM32 DHSOM")
Reported-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

diff --git a/arch/arm/dts/stm32mp13xx-dhcor-som.dtsi b/arch/arm/dts/stm32mp13xx-dhcor-som.dtsi
deleted file mode 100644 (file)
index ddad649..0000000
--- a/arch/arm/dts/stm32mp13xx-dhcor-som.dtsi
+++ /dev/null
@@ -1,308 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/*
- * Copyright (C) 2024 Marek Vasut <marex@denx.de>
- */
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/mfd/st,stpmic1.h>
-#include <dt-bindings/regulator/st,stm32mp13-regulator.h>
-#include "stm32mp13-pinctrl.dtsi"
-
-/ {
-       model = "DH electronics STM32MP13xx DHCOR SoM";
-       compatible = "dh,stm32mp131a-dhcor-som",
-                    "st,stm32mp131";
-
-       aliases {
-               mmc0 = &sdmmc2;
-               mmc1 = &sdmmc1;
-               serial0 = &uart4;
-               serial1 = &uart7;
-               rtc0 = &rv3032;
-               spi0 = &qspi;
-       };
-
-       memory@c0000000 {
-               device_type = "memory";
-               reg = <0xc0000000 0x20000000>;
-       };
-
-       reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-
-               optee@dd000000 {
-                       reg = <0xdd000000 0x3000000>;
-                       no-map;
-               };
-       };
-
-       sdio_pwrseq: sdio-pwrseq {
-               compatible = "mmc-pwrseq-simple";
-               reset-gpios = <&gpiof 12 GPIO_ACTIVE_LOW>;
-       };
-
-       vin: vin {
-               compatible = "regulator-fixed";
-               regulator-name = "vin";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-       };
-};
-
-&i2c3 {
-       i2c-scl-rising-time-ns = <96>;
-       i2c-scl-falling-time-ns = <3>;
-       clock-frequency = <400000>;
-       status = "okay";
-       /* spare dmas for other usage */
-       /delete-property/dmas;
-       /delete-property/dma-names;
-
-       pmic: stpmic@33 {
-               compatible = "st,stpmic1";
-               reg = <0x33>;
-               interrupts-extended = <&gpioi 3 IRQ_TYPE_EDGE_FALLING>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
-               status = "okay";
-
-               regulators {
-                       compatible = "st,stpmic1-regulators";
-
-                       ldo1-supply = <&vin>;
-                       ldo2-supply = <&vin>;
-                       ldo3-supply = <&vin>;
-                       ldo4-supply = <&vin>;
-                       ldo5-supply = <&vin>;
-                       ldo6-supply = <&vin>;
-                       pwr_sw1-supply = <&bst_out>;
-                       pwr_sw2-supply = <&bst_out>;
-
-                       vddcpu: buck1 { /* VDD_CPU_1V2 */
-                               regulator-name = "vddcpu";
-                               regulator-min-microvolt = <1250000>;
-                               regulator-max-microvolt = <1250000>;
-                               regulator-always-on;
-                               regulator-initial-mode = <0>;
-                               regulator-over-current-protection;
-                       };
-
-                       vdd_ddr: buck2 { /* VDD_DDR_1V35 */
-                               regulator-name = "vdd_ddr";
-                               regulator-min-microvolt = <1350000>;
-                               regulator-max-microvolt = <1350000>;
-                               regulator-always-on;
-                               regulator-initial-mode = <0>;
-                               regulator-over-current-protection;
-                       };
-
-                       vdd: buck3 { /* VDD_3V3_1V8 */
-                               regulator-name = "vdd";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                               regulator-initial-mode = <0>;
-                               regulator-over-current-protection;
-                       };
-
-                       vddcore: buck4 { /* VDD_CORE_1V2 */
-                               regulator-name = "vddcore";
-                               regulator-min-microvolt = <1250000>;
-                               regulator-max-microvolt = <1250000>;
-                               regulator-always-on;
-                               regulator-initial-mode = <0>;
-                               regulator-over-current-protection;
-                       };
-
-                       vdd_adc: ldo1 { /* VDD_ADC_1V8 */
-                               regulator-name = "vdd_adc";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               interrupts = <IT_CURLIM_LDO1 0>;
-                       };
-
-                       vdd_ldo2: ldo2 { /* LDO2_OUT_1V8 */
-                               regulator-name = "vdd_ldo2";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               interrupts = <IT_CURLIM_LDO2 0>;
-                       };
-
-                       vdd_ldo3: ldo3 { /* LDO3_OUT */
-                               regulator-name = "vdd_ldo3";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               interrupts = <IT_CURLIM_LDO3 0>;
-                       };
-
-                       vdd_usb: ldo4 { /* VDD_USB_3V3 */
-                               regulator-name = "vdd_usb";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               interrupts = <IT_CURLIM_LDO4 0>;
-                       };
-
-                       vdd_sd: ldo5 { /* VDD_SD_3V3_1V8 */
-                               regulator-name = "vdd_sd";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               interrupts = <IT_CURLIM_LDO5 0>;
-                       };
-
-                       vdd_sd2: ldo6 { /* VDD_SD2_3V3_1V8 */
-                               regulator-name = "vdd_sd2";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               interrupts = <IT_CURLIM_LDO6 0>;
-                       };
-
-                       vref_ddr: vref_ddr { /* VREF_DDR_0V675 */
-                               regulator-name = "vref_ddr";
-                               regulator-always-on;
-                       };
-
-                       bst_out: boost { /* BST_OUT_5V2 */
-                               regulator-name = "bst_out";
-                       };
-
-                       vbus_otg: pwr_sw1 {
-                               regulator-name = "vbus_otg";
-                               interrupts = <IT_OCP_OTG 0>;
-                       };
-
-                       vbus_sw: pwr_sw2 {
-                               regulator-name = "vbus_sw";
-                               interrupts = <IT_OCP_SWOUT 0>;
-                               regulator-active-discharge = <1>;
-                       };
-               };
-
-               onkey {
-                       compatible = "st,stpmic1-onkey";
-                       interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 1>;
-                       interrupt-names = "onkey-falling", "onkey-rising";
-                       status = "okay";
-               };
-
-               watchdog {
-                       compatible = "st,stpmic1-wdt";
-                       status = "disabled";
-               };
-       };
-
-       eeprom0: eeprom@50 {
-               compatible = "atmel,24c256";    /* ST M24256 */
-               reg = <0x50>;
-               pagesize = <64>;
-       };
-
-       rv3032: rtc@51 {
-               compatible = "microcrystal,rv3032";
-               reg = <0x51>;
-               interrupts-extended = <&gpioi 0 IRQ_TYPE_EDGE_FALLING>;
-       };
-};
-
-&iwdg2 {
-       timeout-sec = <32>;
-       status = "okay";
-};
-
-&qspi {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&qspi_clk_pins_a
-                    &qspi_bk1_pins_a
-                    &qspi_cs1_pins_a>;
-       pinctrl-1 = <&qspi_clk_sleep_pins_a
-                    &qspi_bk1_sleep_pins_a
-                    &qspi_cs1_sleep_pins_a>;
-       #address-cells = <1>;
-       #size-cells = <0>;
-       status = "okay";
-
-       flash0: flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-rx-bus-width = <4>;
-               spi-max-frequency = <108000000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-       };
-};
-
-/* Console UART */
-&uart4 {
-       pinctrl-names = "default", "sleep", "idle";
-       pinctrl-0 = <&uart4_pins_b>;
-       pinctrl-1 = <&uart4_sleep_pins_b>;
-       pinctrl-2 = <&uart4_idle_pins_b>;
-       /delete-property/dmas;
-       /delete-property/dma-names;
-       status = "okay";
-};
-
-/* Bluetooth */
-&uart7 {
-       pinctrl-names = "default", "sleep", "idle";
-       pinctrl-0 = <&uart7_pins_a>;
-       pinctrl-1 = <&uart7_sleep_pins_a>;
-       pinctrl-2 = <&uart7_idle_pins_a>;
-       uart-has-rtscts;
-       status = "okay";
-
-       bluetooth {
-               compatible = "infineon,cyw43439-bt", "brcm,bcm4329-bt";
-               max-speed = <3000000>;
-               device-wakeup-gpios = <&gpiog 9 GPIO_ACTIVE_HIGH>;
-               shutdown-gpios = <&gpioi 2 GPIO_ACTIVE_HIGH>;
-       };
-};
-
-/* SDIO WiFi */
-&sdmmc1 {
-       pinctrl-names = "default", "opendrain", "sleep";
-       pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_clk_pins_a>;
-       pinctrl-1 = <&sdmmc1_b4_od_pins_a &sdmmc1_clk_pins_a>;
-       pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
-       bus-width = <4>;
-       cap-power-off-card;
-       keep-power-in-suspend;
-       non-removable;
-       st,neg-edge;
-       vmmc-supply = <&vdd>;
-       mmc-pwrseq = <&sdio_pwrseq>;
-       status = "okay";
-
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       brcmf: bcrmf@1 {        /* muRata 1YN */
-               reg = <1>;
-               compatible = "infineon,cyw43439-fmac", "brcm,bcm4329-fmac";
-               interrupt-parent = <&gpioe>;
-               interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
-               interrupt-names = "host-wake";
-       };
-};
-
-/* eMMC */
-&sdmmc2 {
-       pinctrl-names = "default", "opendrain", "sleep";
-       pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_a &sdmmc2_clk_pins_a>;
-       pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_a &sdmmc2_clk_pins_a>;
-       pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_a>;
-       bus-width = <8>;
-       mmc-ddr-3_3v;
-       no-sd;
-       no-sdio;
-       non-removable;
-       st,neg-edge;
-       vmmc-supply = <&vdd>;
-       vqmmc-supply = <&vdd>;
-       status = "okay";
-};

diff --git a/arch/arm/dts/stm32mp153c-dhcor-drc-compact.dts b/arch/arm/dts/stm32mp153c-dhcor-drc-compact.dts
deleted file mode 100644 (file)
index c8b9818..0000000
--- a/arch/arm/dts/stm32mp153c-dhcor-drc-compact.dts
+++ /dev/null
@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
-/*
- * Copyright (C) 2022 Marek Vasut <marex@denx.de>
- *
- * DHCOR STM32MP1 variant:
- * DHCR-STM32MP153C-C065-R051-V33-SPI-I-01LG
- * DHCOR PCB number: 586-100 or newer
- * DRC Compact PCB number: 627-100 or newer
- */
-
-/dts-v1/;
-
-#include "stm32mp153.dtsi"
-#include "stm32mp15xc.dtsi"
-#include "stm32mp15xx-dhcor-som.dtsi"
-#include "stm32mp15xx-dhcor-drc-compact.dtsi"
-
-/ {
-       model = "DH electronics STM32MP153C DHCOR DRC Compact";
-       compatible = "dh,stm32mp153c-dhcor-drc-compact",
-                    "dh,stm32mp153c-dhcor-som",
-                    "st,stm32mp153";
-};
-
-&m_can1 {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&m_can1_pins_c>;
-       pinctrl-1 = <&m_can1_sleep_pins_c>;
-       status = "okay";
-};

diff --git a/arch/arm/dts/stm32mp157a-dhcor-avenger96.dts b/arch/arm/dts/stm32mp157a-dhcor-avenger96.dts
deleted file mode 100644 (file)
index 2e3c9fb..0000000
--- a/arch/arm/dts/stm32mp157a-dhcor-avenger96.dts
+++ /dev/null
@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
-/*
- * Copyright (C) Linaro Ltd 2019 - All Rights Reserved
- * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
- * Copyright (C) 2020 Marek Vasut <marex@denx.de>
- *
- * DHCOR STM32MP1 variant:
- * DHCR-STM32MP157A-C065-R102-V18-SPI-C-01LG
- * DHCOR PCB number: 586-100 or newer
- * Avenger96 PCB number: 588-200 or newer
- */
-
-/dts-v1/;
-
-#include "stm32mp157.dtsi"
-#include "stm32mp15xc.dtsi"
-#include "stm32mp15xx-dhcor-som.dtsi"
-#include "stm32mp15xx-dhcor-avenger96.dtsi"
-
-/ {
-       model = "Arrow Electronics STM32MP157A Avenger96 board";
-       compatible = "arrow,stm32mp157a-avenger96", "dh,stm32mp157a-dhcor-som",
-                    "st,stm32mp157";
-};
-
-&m_can1 {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&m_can1_pins_b>;
-       pinctrl-1 = <&m_can1_sleep_pins_b>;
-       status = "disabled";
-};
-
-&m_can2 {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&m_can2_pins_a>;
-       pinctrl-1 = <&m_can2_sleep_pins_a>;
-       status = "disabled";
-};