ARM: dts: renesas: Minimize R8A779G0 V4H RPC SPI DT node

The RPC SPI DT node is now part of mainline Linux DT, remove the
duplicate content from U-Boot DT extras. The SPI flash DT node name
has been changed from "spi-flash@0" to "flash@0", reflect this change
in this patch. Retain "bank-width" and "num-cs" DT properties which
are used by U-Boot. Retain "spi-rx-bus-width" and "spi-tx-bus-width"
DT properties to indicate the bus should always be operated in 1-1-1
mode as the U-Boot RPC SPI driver does not support higher bus width
modes yet.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

diff --git a/arch/arm/dts/r8a779g0-u-boot.dtsi b/arch/arm/dts/r8a779g0-u-boot.dtsi
index cc8becac9961358d31ff0d4c15f84078b2a0d194..f60eba531e4c067e18863fcb2643d4230da7b746 100644 (file)
--- a/arch/arm/dts/r8a779g0-u-boot.dtsi
+++ b/arch/arm/dts/r8a779g0-u-boot.dtsi
@@ -8,7 +8,6 @@
 #include "r8a779x-u-boot.dtsi"
 
 &rpc {
-       reg = <0 0xee200000 0 0x200>, <0 0x08000000 0 0x04000000>;
        bank-width = <2>;
        num-cs = <1>;
 };

diff --git a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi
index a102639010d6c95820d5cc5eb4f547fd19ca8841..c3704d789e89b52124d1a8f8c67d635b9dcc9004 100644 (file)
--- a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi
+++ b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi
@@ -13,29 +13,9 @@
        };
 };
 
-&pfc {
-       qspi0_pins: qspi0 {
-               groups = "qspi0_ctrl", "qspi0_data4";
-               function = "qspi0";
-       };
-};
-
 &rpc {
-       pinctrl-0 = <&qspi0_pins>;
-       pinctrl-names = "default";
-
-       #address-cells = <1>;
-       #size-cells = <0>;
-       spi-max-frequency = <40000000>;
-       status = "disabled";
-
-       spi-flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "s25fs512s", "jedec,spi-nor";
-               reg = <0>;
+       flash@0 {
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <1>;
-               spi-max-frequency = <40000000>;
        };
 };