Re: [PATCH 04/16] rockchip: rk3328: Remove redundant device tree files
On 2024/5/5 03:42, Jonas Karlman wrote:
Remove redundant device tree files now that RK3328 boards have been
migrated to use OF_UPSTREAM.
Signed-off-by: Jonas Karlman
Reviewed-by: Kever Yang
Thanks,
- Kever
---
arch/arm/dts/rk3328-evb.dts | 289 ---
arch/arm/dts/rk3328-nanopi-r2c-plus.dts | 33 -
arch/arm/dts/rk3328-nanopi-r2c.dts | 40 -
arch/arm/dts/rk3328-nanopi-r2s.dts | 410
arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts | 42 -
arch/arm/dts/rk3328-orangepi-r1-plus.dts | 374
arch/arm/dts/rk3328-roc-cc.dts | 384
arch/arm/dts/rk3328-rock-pi-e.dts| 445
arch/arm/dts/rk3328-rock64.dts | 394
arch/arm/dts/rk3328.dtsi | 1944 --
include/dt-bindings/clock/rk3328-cru.h | 393
include/dt-bindings/power/rk3328-power.h | 19 -
12 files changed, 4767 deletions(-)
delete mode 100644 arch/arm/dts/rk3328-evb.dts
delete mode 100644 arch/arm/dts/rk3328-nanopi-r2c-plus.dts
delete mode 100644 arch/arm/dts/rk3328-nanopi-r2c.dts
delete mode 100644 arch/arm/dts/rk3328-nanopi-r2s.dts
delete mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
delete mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus.dts
delete mode 100644 arch/arm/dts/rk3328-roc-cc.dts
delete mode 100644 arch/arm/dts/rk3328-rock-pi-e.dts
delete mode 100644 arch/arm/dts/rk3328-rock64.dts
delete mode 100644 arch/arm/dts/rk3328.dtsi
delete mode 100644 include/dt-bindings/clock/rk3328-cru.h
delete mode 100644 include/dt-bindings/power/rk3328-power.h
diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts
deleted file mode 100644
index 1eef5504445f..
--- a/arch/arm/dts/rk3328-evb.dts
+++ /dev/null
@@ -1,289 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd
- */
-
-/dts-v1/;
-#include "rk3328.dtsi"
-
-/ {
- model = "Rockchip RK3328 EVB";
- compatible = "rockchip,rk3328-evb", "rockchip,rk3328";
-
- aliases {
- ethernet0 =
- mmc0 =
- mmc1 =
- mmc2 =
- };
-
- chosen {
- stdout-path = "serial2:150n8";
- };
-
- dc_12v: dc-12v {
- compatible = "regulator-fixed";
- regulator-name = "dc_12v";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1200>;
- regulator-max-microvolt = <1200>;
- };
-
- sdio_pwrseq: sdio-pwrseq {
- compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <_enable_h>;
-
- /*
-* On the module itself this is one of these (depending
-* on the actual card populated):
-* - SDIO_RESET_L_WL_REG_ON
-* - PDN (power down when low)
-*/
- reset-gpios = < 18 GPIO_ACTIVE_LOW>;
- };
-
- vcc_sd: sdmmc-regulator {
- compatible = "regulator-fixed";
- gpio = < 30 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
- pinctrl-0 = <_pin>;
- regulator-name = "vcc_sd";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- vin-supply = <_io>;
- };
-
- vcc_sys: vcc-sys {
- compatible = "regulator-fixed";
- regulator-name = "vcc_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- vin-supply = <_12v>;
- };
-
- vcc_phy: vcc-phy-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc_phy";
- regulator-always-on;
- regulator-boot-on;
- };
-};
-
- {
- cpu-supply = <_arm>;
-};
-
- {
- cpu-supply = <_arm>;
-};
-
- {
- cpu-supply = <_arm>;
-};
-
- {
- cpu-supply = <_arm>;
-};
-
- {
- bus-width = <8>;
- cap-mmc-highspeed;
- non-removable;
- pinctrl-names = "default";
- pinctrl-0 = <_clk _cmd _bus8>;
- status = "okay";
-};
-
- {
- phy-supply = <_phy>;
- clock_in_out = "output";
- assigned-clock-rate = <5000>;
- assigned-clocks = < SCLK_MAC2PHY>;
- assigned-clock-parents = < SCLK_MAC2PHY_SRC>;
- status = "okay";
-};
-
- {
- status = "okay";
-
- rk805: pmic@18 {
- compatible = "rockchip,rk805";
- reg = <0x18>;
- interrupt-parent = <>;
- interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
- #clock-cells = <1>;
- clock-output-names = "xin32k", "rk805-clkout2";
-
[PATCH 04/16] rockchip: rk3328: Remove redundant device tree files
Remove redundant device tree files now that RK3328 boards have been
migrated to use OF_UPSTREAM.
Signed-off-by: Jonas Karlman
---
arch/arm/dts/rk3328-evb.dts | 289 ---
arch/arm/dts/rk3328-nanopi-r2c-plus.dts | 33 -
arch/arm/dts/rk3328-nanopi-r2c.dts | 40 -
arch/arm/dts/rk3328-nanopi-r2s.dts | 410
arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts | 42 -
arch/arm/dts/rk3328-orangepi-r1-plus.dts | 374
arch/arm/dts/rk3328-roc-cc.dts | 384
arch/arm/dts/rk3328-rock-pi-e.dts| 445
arch/arm/dts/rk3328-rock64.dts | 394
arch/arm/dts/rk3328.dtsi | 1944 --
include/dt-bindings/clock/rk3328-cru.h | 393
include/dt-bindings/power/rk3328-power.h | 19 -
12 files changed, 4767 deletions(-)
delete mode 100644 arch/arm/dts/rk3328-evb.dts
delete mode 100644 arch/arm/dts/rk3328-nanopi-r2c-plus.dts
delete mode 100644 arch/arm/dts/rk3328-nanopi-r2c.dts
delete mode 100644 arch/arm/dts/rk3328-nanopi-r2s.dts
delete mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
delete mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus.dts
delete mode 100644 arch/arm/dts/rk3328-roc-cc.dts
delete mode 100644 arch/arm/dts/rk3328-rock-pi-e.dts
delete mode 100644 arch/arm/dts/rk3328-rock64.dts
delete mode 100644 arch/arm/dts/rk3328.dtsi
delete mode 100644 include/dt-bindings/clock/rk3328-cru.h
delete mode 100644 include/dt-bindings/power/rk3328-power.h
diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts
deleted file mode 100644
index 1eef5504445f..
--- a/arch/arm/dts/rk3328-evb.dts
+++ /dev/null
@@ -1,289 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd
- */
-
-/dts-v1/;
-#include "rk3328.dtsi"
-
-/ {
- model = "Rockchip RK3328 EVB";
- compatible = "rockchip,rk3328-evb", "rockchip,rk3328";
-
- aliases {
- ethernet0 =
- mmc0 =
- mmc1 =
- mmc2 =
- };
-
- chosen {
- stdout-path = "serial2:150n8";
- };
-
- dc_12v: dc-12v {
- compatible = "regulator-fixed";
- regulator-name = "dc_12v";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1200>;
- regulator-max-microvolt = <1200>;
- };
-
- sdio_pwrseq: sdio-pwrseq {
- compatible = "mmc-pwrseq-simple";
- pinctrl-names = "default";
- pinctrl-0 = <_enable_h>;
-
- /*
-* On the module itself this is one of these (depending
-* on the actual card populated):
-* - SDIO_RESET_L_WL_REG_ON
-* - PDN (power down when low)
-*/
- reset-gpios = < 18 GPIO_ACTIVE_LOW>;
- };
-
- vcc_sd: sdmmc-regulator {
- compatible = "regulator-fixed";
- gpio = < 30 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
- pinctrl-0 = <_pin>;
- regulator-name = "vcc_sd";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- vin-supply = <_io>;
- };
-
- vcc_sys: vcc-sys {
- compatible = "regulator-fixed";
- regulator-name = "vcc_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- vin-supply = <_12v>;
- };
-
- vcc_phy: vcc-phy-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc_phy";
- regulator-always-on;
- regulator-boot-on;
- };
-};
-
- {
- cpu-supply = <_arm>;
-};
-
- {
- cpu-supply = <_arm>;
-};
-
- {
- cpu-supply = <_arm>;
-};
-
- {
- cpu-supply = <_arm>;
-};
-
- {
- bus-width = <8>;
- cap-mmc-highspeed;
- non-removable;
- pinctrl-names = "default";
- pinctrl-0 = <_clk _cmd _bus8>;
- status = "okay";
-};
-
- {
- phy-supply = <_phy>;
- clock_in_out = "output";
- assigned-clock-rate = <5000>;
- assigned-clocks = < SCLK_MAC2PHY>;
- assigned-clock-parents = < SCLK_MAC2PHY_SRC>;
- status = "okay";
-};
-
- {
- status = "okay";
-
- rk805: pmic@18 {
- compatible = "rockchip,rk805";
- reg = <0x18>;
- interrupt-parent = <>;
- interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
- #clock-cells = <1>;
- clock-output-names = "xin32k", "rk805-clkout2";
- gpio-controller;
- #gpio-cells = <2>;
- pinctrl-names = "default";
-
