arm: dts: Create common rz-g2-beacon-u-boot file

The rzg2_beacon_defconfig creates an image for RZ/G2[MNH] and
as such creates three different device trees and each of them
have a corresponding -u-boot.dtsi file which are basically
copies of each other.  Create a common include file to be
referenced by each of the respective board-u-boot.dtsi files
to reduce duplicate code and simplify support going forward.
This also restores some lost functionality from the device
tree re-sync and updates the MAINTAINER file to include all
beacon-renesom device tree files.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi b/arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi
index a0c0a7f35c4c4600e013598bbfbb047580525188..85336d5f3ba6bde62faa1b6d609364179564798e 100644 (file)
--- a/arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi
+++ b/arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi
@@ -1,34 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright 2020 Compass Electronics Group, LLC
+ * Copyright 2021 LogicPD dba Beacon EmbeddedWorks
  */
 
-/ {
-       soc {
-               u-boot,dm-pre-reloc;
-       };
-};
-
-&cpg {
-       u-boot,dm-pre-reloc;
-};
-
-&extal_clk {
-       u-boot,dm-pre-reloc;
-};
-
-&prr {
-       u-boot,dm-pre-reloc;
-};
-
-&extalr_clk {
-       u-boot,dm-pre-reloc;
-};
-
-&sdhi0 {
-       /delete-property/ cd-gpios;
-};
-
-&sdhi2 {
-       status = "disabled";
-};
+#include "rz-g2-beacon-u-boot.dtsi"

diff --git a/arch/arm/dts/r8a774b1-beacon-rzg2n-kit-u-boot.dtsi b/arch/arm/dts/r8a774b1-beacon-rzg2n-kit-u-boot.dtsi
index a0c0a7f35c4c4600e013598bbfbb047580525188..85336d5f3ba6bde62faa1b6d609364179564798e 100644 (file)
--- a/arch/arm/dts/r8a774b1-beacon-rzg2n-kit-u-boot.dtsi
+++ b/arch/arm/dts/r8a774b1-beacon-rzg2n-kit-u-boot.dtsi
@@ -1,34 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright 2020 Compass Electronics Group, LLC
+ * Copyright 2021 LogicPD dba Beacon EmbeddedWorks
  */
 
-/ {
-       soc {
-               u-boot,dm-pre-reloc;
-       };
-};
-
-&cpg {
-       u-boot,dm-pre-reloc;
-};
-
-&extal_clk {
-       u-boot,dm-pre-reloc;
-};
-
-&prr {
-       u-boot,dm-pre-reloc;
-};
-
-&extalr_clk {
-       u-boot,dm-pre-reloc;
-};
-
-&sdhi0 {
-       /delete-property/ cd-gpios;
-};
-
-&sdhi2 {
-       status = "disabled";
-};
+#include "rz-g2-beacon-u-boot.dtsi"

diff --git a/arch/arm/dts/r8a774e1-beacon-rzg2h-kit-u-boot.dtsi b/arch/arm/dts/r8a774e1-beacon-rzg2h-kit-u-boot.dtsi
index eef200af2d1d145fde1e2b164e931e224d50791c..85336d5f3ba6bde62faa1b6d609364179564798e 100644 (file)
--- a/arch/arm/dts/r8a774e1-beacon-rzg2h-kit-u-boot.dtsi
+++ b/arch/arm/dts/r8a774e1-beacon-rzg2h-kit-u-boot.dtsi
@@ -1,44 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright 2020 Compass Electronics Group, LLC
+ * Copyright 2021 LogicPD dba Beacon EmbeddedWorks
  */
 
-/ {
-       soc {
-               u-boot,dm-pre-reloc;
-       };
-};
-
-&cpg {
-       u-boot,dm-pre-reloc;
-};
-
-&extal_clk {
-       u-boot,dm-pre-reloc;
-};
-
-&prr {
-       u-boot,dm-pre-reloc;
-};
-
-&extalr_clk {
-       u-boot,dm-pre-reloc;
-};
-
-&sdhi0 {
-       /delete-property/ cd-gpios;
-       sd-uhs-sdr12;
-       sd-uhs-sdr25;
-       sd-uhs-sdr104;
-       max-frequency = <208000000>;
-};
-
-&sdhi2 {
-       status = "disabled";
-};
-
-&sdhi3 {
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       mmc-hs400-1_8v;
-};
+#include "rz-g2-beacon-u-boot.dtsi"

diff --git a/arch/arm/dts/rz-g2-beacon-u-boot.dtsi b/arch/arm/dts/rz-g2-beacon-u-boot.dtsi
new file mode 100644 (file)
index 0000000..ef0b96a
--- /dev/null
+++ b/arch/arm/dts/rz-g2-beacon-u-boot.dtsi
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright 2021 LogicPD dba Beacon EmbeddedWorks
+ */
+
+/ {
+       aliases {
+               spi0 = &rpc;
+       };
+
+       soc {
+               u-boot,dm-pre-reloc;
+       };
+};
+
+&cpg {
+       u-boot,dm-pre-reloc;
+};
+
+&ehci0 {
+       clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>, <&versaclock5 3>;
+};
+
+&ehci1 {
+       clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>, <&versaclock5 3>;
+};
+
+&extal_clk {
+       u-boot,dm-pre-reloc;
+};
+
+&extalr_clk {
+       u-boot,dm-pre-reloc;
+};
+
+&prr {
+       u-boot,dm-pre-reloc;
+};
+
+&rpc {
+       compatible = "renesas,rcar-gen3-rpc";
+       num-cs = <1>;
+       spi-max-frequency = <40000000>;
+       #address-cells = <1>;
+       #size-cells = <0>;
+       status = "okay";
+
+       flash0: spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               reg = <0>;
+               compatible = "spi-flash", "jedec,spi-nor";
+               spi-max-frequency = <40000000>;
+               spi-tx-bus-width = <1>;
+               spi-rx-bus-width = <1>;
+       };
+};
+
+&sdhi0 {
+       /delete-property/ cd-gpios;
+       sd-uhs-sdr12;
+       sd-uhs-sdr25;
+       sd-uhs-sdr104;
+       max-frequency = <208000000>;
+};
+
+&sdhi2 {
+       status = "disabled";
+};
+
+&sdhi3 {
+       mmc-ddr-1_8v;
+       mmc-hs200-1_8v;
+       mmc-hs400-1_8v;
+};

diff --git a/board/beacon/beacon-rzg2m/MAINTAINERS b/board/beacon/beacon-rzg2m/MAINTAINERS
index 77c4057ab05208e382b1c2245b5371ce0ce8acc8..f8042bb2c445a44787c53231b9716d1e800b8714 100644 (file)
--- a/board/beacon/beacon-rzg2m/MAINTAINERS
+++ b/board/beacon/beacon-rzg2m/MAINTAINERS
@@ -4,3 +4,13 @@ S:     Maintained
 F:     board/beacon/beacon-rzg2m/
 F:     include/configs/beacon-rzg2m.h
 F:     configs/rzg2_beacon_defconfig
+F:     arch/arm/dts/beacon-renesom-baseboard.dtsi
+F:     arch/arm/dts/beacon-renesom-som.dtsi
+F:     arch/arm/dts/r8a774a1-beacon-rzg2m-kit.dts
+F:     arch/arm/dts/r8a774b1-beacon-rzg2n-kit.dts
+F:     arch/arm/dts/r8a774e1-beacon-rzg2h-kit.dts
+F:     arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi
+F:     arch/arm/dts/r8a774b1-beacon-rzg2n-kit-u-boot.dtsi
+F:     arch/arm/dts/r8a774e1-beacon-rzg2h-kit-u-boot.dtsi
+F:     arch/arm/dts/rz-g2-beacon-u-boot.dtsi
+