riscv: dts: starfive: prune redundant jh7110-common overrides

Prune jh7110-common-u-boot.dtsi (clocks, qspi flash, eeprom, and
bootph-pre-ram hints now upstream since devicetree-rebasing v6.16).

In preparation for removal of per-dts jh7110-*-u-boot.dtsi replace include
by next dependency jh7110-u-boot.dtsi in automatic dtsi inclusion order.

Signed-off-by: E Shattow <e@freeshell.de>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

diff --git a/arch/riscv/dts/jh7110-common-u-boot.dtsi b/arch/riscv/dts/jh7110-common-u-boot.dtsi
deleted file mode 100644 (file)
index 049b0a7..0000000
--- a/arch/riscv/dts/jh7110-common-u-boot.dtsi
+++ /dev/null
@@ -1,99 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0 OR MIT
-/*
- * Copyright (C) 2023 StarFive Technology Co., Ltd.
- */
-
-#include "jh7110-u-boot.dtsi"
-/ {
-       aliases {
-               spi0 = &qspi;
-       };
-
-       chosen {
-               bootph-pre-ram;
-       };
-
-       firmware {
-               spi0 = &qspi;
-               bootph-pre-ram;
-       };
-
-       memory@40000000 {
-               bootph-pre-ram;
-       };
-};
-
-&uart0 {
-       bootph-pre-ram;
-       reg-offset = <0>;
-       current-speed = <115200>;
-};
-
-&mmc0 {
-       bootph-pre-ram;
-};
-
-&mmc1 {
-       bootph-pre-ram;
-};
-
-&qspi {
-       bootph-pre-ram;
-
-       flash@0 {
-               bootph-pre-ram;
-               cdns,read-delay = <2>;
-               spi-max-frequency = <100000000>;
-       };
-};
-
-&syscrg {
-       assigned-clocks = <&syscrg JH7110_SYSCLK_CPU_ROOT>,
-                         <&syscrg JH7110_SYSCLK_BUS_ROOT>,
-                         <&syscrg JH7110_SYSCLK_PERH_ROOT>,
-                         <&syscrg JH7110_SYSCLK_QSPI_REF>;
-       assigned-clock-parents = <&pllclk JH7110_PLLCLK_PLL0_OUT>,
-                                <&pllclk JH7110_PLLCLK_PLL2_OUT>,
-                                <&pllclk JH7110_PLLCLK_PLL2_OUT>,
-                                <&syscrg JH7110_SYSCLK_QSPI_REF_SRC>;
-       assigned-clock-rates = <0>, <0>, <0>, <0>;
-};
-
-&sysgpio {
-       bootph-pre-ram;
-};
-
-&mmc0_pins {
-       bootph-pre-ram;
-       rst-pins {
-               bootph-pre-ram;
-       };
-};
-
-&mmc1_pins {
-       bootph-pre-ram;
-       clk-pins {
-               bootph-pre-ram;
-       };
-
-       mmc-pins {
-               bootph-pre-ram;
-       };
-};
-
-&i2c5_pins {
-       bootph-pre-ram;
-       i2c-pins {
-               bootph-pre-ram;
-       };
-};
-
-&i2c5 {
-       bootph-pre-ram;
-       eeprom@50 {
-               bootph-pre-ram;
-               compatible = "atmel,24c04";
-               reg = <0x50>;
-               pagesize = <16>;
-       };
-};

diff --git a/arch/riscv/dts/jh7110-deepcomputing-fml13v01-u-boot.dtsi b/arch/riscv/dts/jh7110-deepcomputing-fml13v01-u-boot.dtsi
index ab882d07f6fa476039d6104366d06646313f3124..b9202f2acce60074a911b2f413fa37452b20e94a 100644 (file)
--- a/arch/riscv/dts/jh7110-deepcomputing-fml13v01-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-deepcomputing-fml13v01-u-boot.dtsi
@@ -3,5 +3,5 @@
  * Copyright (C) 2024 StarFive Technology Co., Ltd.
  */
 
-#include "jh7110-common-u-boot.dtsi"
+#include "jh7110-u-boot.dtsi"
 #include "starfive-visionfive2-binman.dtsi"

diff --git a/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi b/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi
index ab882d07f6fa476039d6104366d06646313f3124..b9202f2acce60074a911b2f413fa37452b20e94a 100644 (file)
--- a/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi
@@ -3,5 +3,5 @@
  * Copyright (C) 2024 StarFive Technology Co., Ltd.
  */
 
-#include "jh7110-common-u-boot.dtsi"
+#include "jh7110-u-boot.dtsi"
 #include "starfive-visionfive2-binman.dtsi"

diff --git a/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi b/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi
index ab882d07f6fa476039d6104366d06646313f3124..b9202f2acce60074a911b2f413fa37452b20e94a 100644 (file)
--- a/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi
@@ -3,5 +3,5 @@
  * Copyright (C) 2024 StarFive Technology Co., Ltd.
  */
 
-#include "jh7110-common-u-boot.dtsi"
+#include "jh7110-u-boot.dtsi"
 #include "starfive-visionfive2-binman.dtsi"

diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi
index ab882d07f6fa476039d6104366d06646313f3124..b9202f2acce60074a911b2f413fa37452b20e94a 100644 (file)
--- a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi
@@ -3,5 +3,5 @@
  * Copyright (C) 2024 StarFive Technology Co., Ltd.
  */
 
-#include "jh7110-common-u-boot.dtsi"
+#include "jh7110-u-boot.dtsi"
 #include "starfive-visionfive2-binman.dtsi"

diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi
index 874074174ff69ed1ab33037fccf8e6657d8f5a48..848ed8225ac3ae39b87791fa083fd78f5836cc99 100644 (file)
--- a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi
@@ -3,5 +3,5 @@
  * Copyright (C) 2023 StarFive Technology Co., Ltd.
  */
 
-#include "jh7110-common-u-boot.dtsi"
+#include "jh7110-u-boot.dtsi"
 #include "starfive-visionfive2-binman.dtsi"