From 85f4b9114194fbf70960e34765bc788d45bddd4d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 17 Mar 2024 07:23:38 +0100 Subject: ARM: dts: renesas: Stop using the -u-boot DTs for build The U-Boot build system can automatically paste -u-boot.dtsi at the end of matching .dts during build. Stop emulating this behavior and rename the -u-boot.dts files to -u-boot.dtsi, drop "#include...dts" from those new u-boot.dtsi files, and update board configuration accordingly. The rename, '#include...dts` scrubbing and configuration update has been done using the following script: ``` $ find . -name r[78]\*-u-boot.dts | sort -u | while read line ; do \ git mv ${line%-u-boot.dts}-u-boot.dts ${line%-u-boot.dts}-u-boot.dtsi ; \ done $ sed -i '/^#include.*dts"/ d' `find . -name r[78]\*-u-boot.dtsi` $ sed -i 's@-u-boot@@g' `git grep -li renesas configs` ``` The Salvator-X and ULCB board files have been updated manually. Signed-off-by: Marek Vasut Acked-by: Adam Ford --- arch/arm/dts/Makefile | 58 ++++++++-------- arch/arm/dts/r7s72100-gr-peach-u-boot.dts | 92 -------------------------- arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi | 91 +++++++++++++++++++++++++ arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts | 27 -------- arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dtsi | 26 ++++++++ arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dts | 27 -------- arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dtsi | 26 ++++++++ arch/arm/dts/r8a774c0-ek874-u-boot.dts | 33 --------- arch/arm/dts/r8a774c0-ek874-u-boot.dtsi | 32 +++++++++ arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dts | 27 -------- arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dtsi | 26 ++++++++ arch/arm/dts/r8a7790-lager-u-boot.dts | 20 ------ arch/arm/dts/r8a7790-lager-u-boot.dtsi | 19 ++++++ arch/arm/dts/r8a7790-stout-u-boot.dts | 20 ------ arch/arm/dts/r8a7790-stout-u-boot.dtsi | 19 ++++++ arch/arm/dts/r8a7791-koelsch-u-boot.dts | 20 ------ arch/arm/dts/r8a7791-koelsch-u-boot.dtsi | 19 ++++++ arch/arm/dts/r8a7791-porter-u-boot.dts | 25 ------- arch/arm/dts/r8a7791-porter-u-boot.dtsi | 24 +++++++ arch/arm/dts/r8a7792-blanche-u-boot.dts | 17 ----- arch/arm/dts/r8a7792-blanche-u-boot.dtsi | 16 +++++ arch/arm/dts/r8a7793-gose-u-boot.dts | 20 ------ arch/arm/dts/r8a7793-gose-u-boot.dtsi | 19 ++++++ arch/arm/dts/r8a7794-alt-u-boot.dts | 53 --------------- arch/arm/dts/r8a7794-alt-u-boot.dtsi | 52 +++++++++++++++ arch/arm/dts/r8a7794-silk-u-boot.dts | 20 ------ arch/arm/dts/r8a7794-silk-u-boot.dtsi | 19 ++++++ arch/arm/dts/r8a77950-salvator-x-u-boot.dts | 60 ----------------- arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi | 59 +++++++++++++++++ arch/arm/dts/r8a77950-ulcb-u-boot.dts | 61 ----------------- arch/arm/dts/r8a77950-ulcb-u-boot.dtsi | 60 +++++++++++++++++ arch/arm/dts/r8a77960-salvator-x-u-boot.dts | 60 ----------------- arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi | 59 +++++++++++++++++ arch/arm/dts/r8a77960-ulcb-u-boot.dts | 61 ----------------- arch/arm/dts/r8a77960-ulcb-u-boot.dtsi | 60 +++++++++++++++++ arch/arm/dts/r8a77965-salvator-x-u-boot.dts | 63 ------------------ arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi | 62 +++++++++++++++++ arch/arm/dts/r8a77965-ulcb-u-boot.dts | 63 ------------------ arch/arm/dts/r8a77965-ulcb-u-boot.dtsi | 62 +++++++++++++++++ arch/arm/dts/r8a77970-eagle-u-boot.dts | 54 --------------- arch/arm/dts/r8a77970-eagle-u-boot.dtsi | 53 +++++++++++++++ arch/arm/dts/r8a77970-v3msk-u-boot.dts | 65 ------------------ arch/arm/dts/r8a77970-v3msk-u-boot.dtsi | 64 ++++++++++++++++++ arch/arm/dts/r8a77980-condor-u-boot.dts | 52 --------------- arch/arm/dts/r8a77980-condor-u-boot.dtsi | 51 ++++++++++++++ arch/arm/dts/r8a77980-v3hsk-u-boot.dts | 42 ------------ arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi | 41 ++++++++++++ arch/arm/dts/r8a77990-ebisu-u-boot.dts | 67 ------------------- arch/arm/dts/r8a77990-ebisu-u-boot.dtsi | 66 ++++++++++++++++++ arch/arm/dts/r8a77995-draak-u-boot.dts | 33 --------- arch/arm/dts/r8a77995-draak-u-boot.dtsi | 32 +++++++++ arch/arm/dts/r8a779a0-falcon-u-boot.dts | 32 --------- arch/arm/dts/r8a779a0-falcon-u-boot.dtsi | 31 +++++++++ arch/arm/dts/r8a779f0-spider-u-boot.dts | 42 ------------ arch/arm/dts/r8a779f0-spider-u-boot.dtsi | 41 ++++++++++++ arch/arm/dts/r8a779g0-white-hawk-u-boot.dts | 42 ------------ arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi | 41 ++++++++++++ arch/arm/dts/r8a779h0-gray-hawk-u-boot.dts | 42 ------------ arch/arm/dts/r8a779h0-gray-hawk-u-boot.dtsi | 41 ++++++++++++ board/renesas/salvator-x/salvator-x.c | 6 +- board/renesas/ulcb/ulcb.c | 6 +- configs/alt_defconfig | 2 +- configs/blanche_defconfig | 2 +- configs/gose_defconfig | 2 +- configs/grpeach_defconfig | 2 +- configs/hihope_rzg2_defconfig | 4 +- configs/koelsch_defconfig | 2 +- configs/lager_defconfig | 2 +- configs/porter_defconfig | 2 +- configs/r8a77970_eagle_defconfig | 2 +- configs/r8a77970_v3msk_defconfig | 2 +- configs/r8a77980_condor_defconfig | 2 +- configs/r8a77980_v3hsk_defconfig | 2 +- configs/r8a77990_ebisu_defconfig | 2 +- configs/r8a77995_draak_defconfig | 2 +- configs/r8a779a0_falcon_defconfig | 2 +- configs/r8a779f0_spider_defconfig | 2 +- configs/r8a779g0_whitehawk_defconfig | 2 +- configs/r8a779h0_grayhawk_defconfig | 2 +- configs/rcar3_salvator-x_defconfig | 4 +- configs/rcar3_ulcb_defconfig | 4 +- configs/silinux_ek874_defconfig | 2 +- configs/silk_defconfig | 2 +- configs/stout_defconfig | 2 +- 84 files changed, 1272 insertions(+), 1301 deletions(-) delete mode 100644 arch/arm/dts/r7s72100-gr-peach-u-boot.dts create mode 100644 arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dts create mode 100644 arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a774c0-ek874-u-boot.dts create mode 100644 arch/arm/dts/r8a774c0-ek874-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dts create mode 100644 arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a7790-lager-u-boot.dts create mode 100644 arch/arm/dts/r8a7790-lager-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a7790-stout-u-boot.dts create mode 100644 arch/arm/dts/r8a7790-stout-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a7791-koelsch-u-boot.dts create mode 100644 arch/arm/dts/r8a7791-koelsch-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a7791-porter-u-boot.dts create mode 100644 arch/arm/dts/r8a7791-porter-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a7792-blanche-u-boot.dts create mode 100644 arch/arm/dts/r8a7792-blanche-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a7793-gose-u-boot.dts create mode 100644 arch/arm/dts/r8a7793-gose-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a7794-alt-u-boot.dts create mode 100644 arch/arm/dts/r8a7794-alt-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a7794-silk-u-boot.dts create mode 100644 arch/arm/dts/r8a7794-silk-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77950-salvator-x-u-boot.dts create mode 100644 arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77950-ulcb-u-boot.dts create mode 100644 arch/arm/dts/r8a77950-ulcb-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77960-salvator-x-u-boot.dts create mode 100644 arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77960-ulcb-u-boot.dts create mode 100644 arch/arm/dts/r8a77960-ulcb-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77965-salvator-x-u-boot.dts create mode 100644 arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77965-ulcb-u-boot.dts create mode 100644 arch/arm/dts/r8a77965-ulcb-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77970-eagle-u-boot.dts create mode 100644 arch/arm/dts/r8a77970-eagle-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77970-v3msk-u-boot.dts create mode 100644 arch/arm/dts/r8a77970-v3msk-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77980-condor-u-boot.dts create mode 100644 arch/arm/dts/r8a77980-condor-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77980-v3hsk-u-boot.dts create mode 100644 arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77990-ebisu-u-boot.dts create mode 100644 arch/arm/dts/r8a77990-ebisu-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a77995-draak-u-boot.dts create mode 100644 arch/arm/dts/r8a77995-draak-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a779a0-falcon-u-boot.dts create mode 100644 arch/arm/dts/r8a779a0-falcon-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a779f0-spider-u-boot.dts create mode 100644 arch/arm/dts/r8a779f0-spider-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a779g0-white-hawk-u-boot.dts create mode 100644 arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi delete mode 100644 arch/arm/dts/r8a779h0-gray-hawk-u-boot.dts create mode 100644 arch/arm/dts/r8a779h0-gray-hawk-u-boot.dtsi diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 08dfbdd557b..2da5eddd375 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1056,41 +1056,41 @@ dtb-$(CONFIG_ARCH_IMXRT) += imxrt1050-evk.dtb \ imxrt1170-evk.dtb \ dtb-$(CONFIG_RCAR_GEN2) += \ - r8a7790-lager-u-boot.dtb \ - r8a7790-stout-u-boot.dtb \ - r8a7791-koelsch-u-boot.dtb \ - r8a7791-porter-u-boot.dtb \ - r8a7792-blanche-u-boot.dtb \ - r8a7793-gose-u-boot.dtb \ - r8a7794-alt-u-boot.dtb \ - r8a7794-silk-u-boot.dtb + r8a7790-lager.dtb \ + r8a7790-stout.dtb \ + r8a7791-koelsch.dtb \ + r8a7791-porter.dtb \ + r8a7792-blanche.dtb \ + r8a7793-gose.dtb \ + r8a7794-alt.dtb \ + r8a7794-silk.dtb dtb-$(CONFIG_RCAR_GEN3) += \ r8a774a1-beacon-rzg2m-kit.dtb \ r8a774b1-beacon-rzg2n-kit.dtb \ r8a774e1-beacon-rzg2h-kit.dtb \ - r8a774a1-hihope-rzg2m-u-boot.dtb \ - r8a774b1-hihope-rzg2n-u-boot.dtb \ - r8a774c0-ek874-u-boot.dtb \ - r8a774e1-hihope-rzg2h-u-boot.dtb \ - r8a77950-ulcb-u-boot.dtb \ - r8a77950-salvator-x-u-boot.dtb \ - r8a77960-ulcb-u-boot.dtb \ - r8a77960-salvator-x-u-boot.dtb \ - r8a77965-ulcb-u-boot.dtb \ - r8a77965-salvator-x-u-boot.dtb \ - r8a77970-eagle-u-boot.dtb \ - r8a77970-v3msk-u-boot.dtb \ - r8a77980-condor-u-boot.dtb \ - r8a77980-v3hsk-u-boot.dtb \ - r8a77990-ebisu-u-boot.dtb \ - r8a77995-draak-u-boot.dtb + r8a774a1-hihope-rzg2m.dtb \ + r8a774b1-hihope-rzg2n.dtb \ + r8a774c0-ek874.dtb \ + r8a774e1-hihope-rzg2h.dtb \ + r8a77950-ulcb.dtb \ + r8a77950-salvator-x.dtb \ + r8a77960-ulcb.dtb \ + r8a77960-salvator-x.dtb \ + r8a77965-ulcb.dtb \ + r8a77965-salvator-x.dtb \ + r8a77970-eagle.dtb \ + r8a77970-v3msk.dtb \ + r8a77980-condor.dtb \ + r8a77980-v3hsk.dtb \ + r8a77990-ebisu.dtb \ + r8a77995-draak.dtb dtb-$(CONFIG_RCAR_GEN4) += \ - r8a779a0-falcon-u-boot.dtb \ - r8a779f0-spider-u-boot.dtb \ - r8a779g0-white-hawk-u-boot.dtb \ - r8a779h0-gray-hawk-u-boot.dtb + r8a779a0-falcon.dtb \ + r8a779f0-spider.dtb \ + r8a779g0-white-hawk.dtb \ + r8a779h0-gray-hawk.dtb dtb-$(CONFIG_TARGET_RZG2L) += \ r9a07g044l2-smarc.dts @@ -1100,7 +1100,7 @@ DTC_FLAGS += -R 4 -p 0x1000 endif dtb-$(CONFIG_RZA1) += \ - r7s72100-gr-peach-u-boot.dtb + r7s72100-gr-peach.dtb dtb-$(CONFIG_ARCH_KEYSTONE) += keystone-k2hk-evm.dtb \ keystone-k2l-evm.dtb \ diff --git a/arch/arm/dts/r7s72100-gr-peach-u-boot.dts b/arch/arm/dts/r7s72100-gr-peach-u-boot.dts deleted file mode 100644 index 0ae9f91fbe8..00000000000 --- a/arch/arm/dts/r7s72100-gr-peach-u-boot.dts +++ /dev/null @@ -1,92 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the GR Peach board - * - * Copyright (C) 2019 Marek Vasut - */ - -#include "r7s72100-gr-peach.dts" - -/ { - aliases { - spi0 = &rpc; - }; - - soc { - bootph-all; - }; - - leds { - led1 { - label = "peach:bottom:red"; - }; - - led-red { - label = "peach:tri:red"; - gpios = <&port6 13 GPIO_ACTIVE_HIGH>; - }; - - led-green { - label = "peach:tri:green"; - gpios = <&port6 14 GPIO_ACTIVE_HIGH>; - }; - - led-blue { - label = "peach:tri:blue"; - gpios = <&port6 15 GPIO_ACTIVE_HIGH>; - }; - }; - - reg_usbhs0_vbus: regulator-usbhs0-vbus { - compatible = "regulator-fixed"; - regulator-name = "usbhs0_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&port4 1 GPIO_ACTIVE_LOW>; - }; - - - rpc: spi@ee200000 { - compatible = "renesas,r7s72100-rpc-if"; - reg = <0x3fefa000 0x100>, <0x18000000 0x08000000>; - bank-width = <2>; - num-cs = <1>; - status = "okay"; - spi-max-frequency = <50000000>; - #address-cells = <1>; - #size-cells = <0>; - - flash0: spi-flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - reg = <0>; - status = "okay"; - }; - }; -}; - -&ostm0 { - bootph-all; -}; - -&pinctrl { - bootph-all; -}; - -&scif2 { - bootph-all; - clock = <66666666>; /* ToDo: Replace by DM clock driver */ -}; - -&scif2_pins { - bootph-all; -}; - -&usbhs0 { - vbus-supply = <®_usbhs0_vbus>; - status = "okay"; -}; diff --git a/arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi b/arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi new file mode 100644 index 00000000000..34fba29e859 --- /dev/null +++ b/arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the GR Peach board + * + * Copyright (C) 2019 Marek Vasut + */ + + +/ { + aliases { + spi0 = &rpc; + }; + + soc { + bootph-all; + }; + + leds { + led1 { + label = "peach:bottom:red"; + }; + + led-red { + label = "peach:tri:red"; + gpios = <&port6 13 GPIO_ACTIVE_HIGH>; + }; + + led-green { + label = "peach:tri:green"; + gpios = <&port6 14 GPIO_ACTIVE_HIGH>; + }; + + led-blue { + label = "peach:tri:blue"; + gpios = <&port6 15 GPIO_ACTIVE_HIGH>; + }; + }; + + reg_usbhs0_vbus: regulator-usbhs0-vbus { + compatible = "regulator-fixed"; + regulator-name = "usbhs0_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&port4 1 GPIO_ACTIVE_LOW>; + }; + + + rpc: spi@ee200000 { + compatible = "renesas,r7s72100-rpc-if"; + reg = <0x3fefa000 0x100>, <0x18000000 0x08000000>; + bank-width = <2>; + num-cs = <1>; + status = "okay"; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <0>; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + reg = <0>; + status = "okay"; + }; + }; +}; + +&ostm0 { + bootph-all; +}; + +&pinctrl { + bootph-all; +}; + +&scif2 { + bootph-all; + clock = <66666666>; /* ToDo: Replace by DM clock driver */ +}; + +&scif2_pins { + bootph-all; +}; + +&usbhs0 { + vbus-supply = <®_usbhs0_vbus>; + status = "okay"; +}; diff --git a/arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts b/arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts deleted file mode 100644 index b735e972214..00000000000 --- a/arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Hihope RZ/G2M board - * - * Copyright (C) 2021 Renesas Electronics Corporation - */ - -#include "r8a774a1-hihope-rzg2m-ex.dts" -#include "r8a774a1-u-boot.dtsi" - -&gpio3 { - bt_reg_on{ - gpio-hog; - gpios = <13 GPIO_ACTIVE_HIGH>; - output-low; - line-name = "bt-reg-on"; - }; -}; - -&gpio4 { - wlan_reg_on{ - gpio-hog; - gpios = <6 GPIO_ACTIVE_HIGH>; - output-low; - line-name = "wlan-reg-on"; - }; -}; diff --git a/arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dtsi b/arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dtsi new file mode 100644 index 00000000000..3ad619bdb90 --- /dev/null +++ b/arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dtsi @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Hihope RZ/G2M board + * + * Copyright (C) 2021 Renesas Electronics Corporation + */ + +#include "r8a774a1-u-boot.dtsi" + +&gpio3 { + bt_reg_on{ + gpio-hog; + gpios = <13 GPIO_ACTIVE_HIGH>; + output-low; + line-name = "bt-reg-on"; + }; +}; + +&gpio4 { + wlan_reg_on{ + gpio-hog; + gpios = <6 GPIO_ACTIVE_HIGH>; + output-low; + line-name = "wlan-reg-on"; + }; +}; diff --git a/arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dts b/arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dts deleted file mode 100644 index 0bdc6909bfb..00000000000 --- a/arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dts +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Hihope RZ/G2N board - * - * Copyright (C) 2021 Renesas Electronics Corp. - */ - -#include "r8a774b1-hihope-rzg2n-ex.dts" -#include "r8a774b1-u-boot.dtsi" - -&gpio3 { - bt_reg_on{ - gpio-hog; - gpios = <13 GPIO_ACTIVE_HIGH>; - output-low; - line-name = "bt-reg-on"; - }; -}; - -&gpio4 { - wlan_reg_on{ - gpio-hog; - gpios = <6 GPIO_ACTIVE_HIGH>; - output-low; - line-name = "wlan-reg-on"; - }; -}; diff --git a/arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dtsi b/arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dtsi new file mode 100644 index 00000000000..6f2f6c71c2f --- /dev/null +++ b/arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dtsi @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Hihope RZ/G2N board + * + * Copyright (C) 2021 Renesas Electronics Corp. + */ + +#include "r8a774b1-u-boot.dtsi" + +&gpio3 { + bt_reg_on{ + gpio-hog; + gpios = <13 GPIO_ACTIVE_HIGH>; + output-low; + line-name = "bt-reg-on"; + }; +}; + +&gpio4 { + wlan_reg_on{ + gpio-hog; + gpios = <6 GPIO_ACTIVE_HIGH>; + output-low; + line-name = "wlan-reg-on"; + }; +}; diff --git a/arch/arm/dts/r8a774c0-ek874-u-boot.dts b/arch/arm/dts/r8a774c0-ek874-u-boot.dts deleted file mode 100644 index 8fa6d8074b3..00000000000 --- a/arch/arm/dts/r8a774c0-ek874-u-boot.dts +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Hihope board - * - * Copyright (C) 2021 Renesas Electronisc Corporation - */ - -#include "r8a774c0-ek874.dts" -#include "r8a774c0-u-boot.dtsi" - -/ { - aliases { - spi0 = &rpc; - }; -}; - -&rpc { - num-cs = <1>; - status = "okay"; - spi-max-frequency = <50000000>; - #address-cells = <1>; - #size-cells = <0>; - - flash0: spi-flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "w25m512jv", "spi-flash", "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - reg = <0>; - }; -}; diff --git a/arch/arm/dts/r8a774c0-ek874-u-boot.dtsi b/arch/arm/dts/r8a774c0-ek874-u-boot.dtsi new file mode 100644 index 00000000000..dcdddd9aed6 --- /dev/null +++ b/arch/arm/dts/r8a774c0-ek874-u-boot.dtsi @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Hihope board + * + * Copyright (C) 2021 Renesas Electronisc Corporation + */ + +#include "r8a774c0-u-boot.dtsi" + +/ { + aliases { + spi0 = &rpc; + }; +}; + +&rpc { + num-cs = <1>; + status = "okay"; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <0>; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "w25m512jv", "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + reg = <0>; + }; +}; diff --git a/arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dts b/arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dts deleted file mode 100644 index 03a17bac7ec..00000000000 --- a/arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dts +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Hihope RZ/G2H board - * - * Copyright (C) 2020 Renesas Electronics Corp. - */ - -#include "r8a774e1-hihope-rzg2h-ex.dts" -#include "r8a774e1-u-boot.dtsi" - -&gpio3 { - bt_reg_on{ - gpio-hog; - gpios = <13 GPIO_ACTIVE_HIGH>; - output-low; - line-name = "bt-reg-on"; - }; -}; - -&gpio4 { - wlan_reg_on{ - gpio-hog; - gpios = <6 GPIO_ACTIVE_HIGH>; - output-low; - line-name = "wlan-reg-on"; - }; -}; diff --git a/arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dtsi b/arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dtsi new file mode 100644 index 00000000000..8e57e03c899 --- /dev/null +++ b/arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dtsi @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Hihope RZ/G2H board + * + * Copyright (C) 2020 Renesas Electronics Corp. + */ + +#include "r8a774e1-u-boot.dtsi" + +&gpio3 { + bt_reg_on{ + gpio-hog; + gpios = <13 GPIO_ACTIVE_HIGH>; + output-low; + line-name = "bt-reg-on"; + }; +}; + +&gpio4 { + wlan_reg_on{ + gpio-hog; + gpios = <6 GPIO_ACTIVE_HIGH>; + output-low; + line-name = "wlan-reg-on"; + }; +}; diff --git a/arch/arm/dts/r8a7790-lager-u-boot.dts b/arch/arm/dts/r8a7790-lager-u-boot.dts deleted file mode 100644 index 28b8b604c37..00000000000 --- a/arch/arm/dts/r8a7790-lager-u-boot.dts +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Lager board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a7790-lager.dts" -#include "r8a7790-u-boot.dtsi" - -&scif0 { - bootph-all; -}; - -&qspi { - flash@0 { - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - }; -}; diff --git a/arch/arm/dts/r8a7790-lager-u-boot.dtsi b/arch/arm/dts/r8a7790-lager-u-boot.dtsi new file mode 100644 index 00000000000..ed1891706ce --- /dev/null +++ b/arch/arm/dts/r8a7790-lager-u-boot.dtsi @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Lager board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a7790-u-boot.dtsi" + +&scif0 { + bootph-all; +}; + +&qspi { + flash@0 { + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; diff --git a/arch/arm/dts/r8a7790-stout-u-boot.dts b/arch/arm/dts/r8a7790-stout-u-boot.dts deleted file mode 100644 index 85bcb787613..00000000000 --- a/arch/arm/dts/r8a7790-stout-u-boot.dts +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Stout board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a7790-stout.dts" -#include "r8a7790-u-boot.dtsi" - -&scifa0 { - bootph-all; -}; - -&qspi { - flash@0 { - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - }; -}; diff --git a/arch/arm/dts/r8a7790-stout-u-boot.dtsi b/arch/arm/dts/r8a7790-stout-u-boot.dtsi new file mode 100644 index 00000000000..3b393045e36 --- /dev/null +++ b/arch/arm/dts/r8a7790-stout-u-boot.dtsi @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Stout board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a7790-u-boot.dtsi" + +&scifa0 { + bootph-all; +}; + +&qspi { + flash@0 { + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; diff --git a/arch/arm/dts/r8a7791-koelsch-u-boot.dts b/arch/arm/dts/r8a7791-koelsch-u-boot.dts deleted file mode 100644 index c5a1332131d..00000000000 --- a/arch/arm/dts/r8a7791-koelsch-u-boot.dts +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Koelsch board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a7791-koelsch.dts" -#include "r8a7791-u-boot.dtsi" - -&scif0 { - bootph-all; -}; - -&qspi { - flash@0 { - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - }; -}; diff --git a/arch/arm/dts/r8a7791-koelsch-u-boot.dtsi b/arch/arm/dts/r8a7791-koelsch-u-boot.dtsi new file mode 100644 index 00000000000..541c4191d69 --- /dev/null +++ b/arch/arm/dts/r8a7791-koelsch-u-boot.dtsi @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Koelsch board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a7791-u-boot.dtsi" + +&scif0 { + bootph-all; +}; + +&qspi { + flash@0 { + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; diff --git a/arch/arm/dts/r8a7791-porter-u-boot.dts b/arch/arm/dts/r8a7791-porter-u-boot.dts deleted file mode 100644 index bfec1fc6d62..00000000000 --- a/arch/arm/dts/r8a7791-porter-u-boot.dts +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Porter board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a7791-porter.dts" -#include "r8a7791-u-boot.dtsi" - -&scif0 { - bootph-all; -}; - -&i2c6 { - status = "okay"; - clock-frequency = <400000>; -}; - -&qspi { - flash@0 { - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - }; -}; diff --git a/arch/arm/dts/r8a7791-porter-u-boot.dtsi b/arch/arm/dts/r8a7791-porter-u-boot.dtsi new file mode 100644 index 00000000000..cbf2c5265d8 --- /dev/null +++ b/arch/arm/dts/r8a7791-porter-u-boot.dtsi @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Porter board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a7791-u-boot.dtsi" + +&scif0 { + bootph-all; +}; + +&i2c6 { + status = "okay"; + clock-frequency = <400000>; +}; + +&qspi { + flash@0 { + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; diff --git a/arch/arm/dts/r8a7792-blanche-u-boot.dts b/arch/arm/dts/r8a7792-blanche-u-boot.dts deleted file mode 100644 index 1f33df81cef..00000000000 --- a/arch/arm/dts/r8a7792-blanche-u-boot.dts +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Blanche board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a7792-blanche.dts" -#include "r8a7792-u-boot.dtsi" - -&iic3 { - status = "okay"; -}; - -&scif0 { - bootph-all; -}; diff --git a/arch/arm/dts/r8a7792-blanche-u-boot.dtsi b/arch/arm/dts/r8a7792-blanche-u-boot.dtsi new file mode 100644 index 00000000000..8c36a3e5850 --- /dev/null +++ b/arch/arm/dts/r8a7792-blanche-u-boot.dtsi @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Blanche board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a7792-u-boot.dtsi" + +&iic3 { + status = "okay"; +}; + +&scif0 { + bootph-all; +}; diff --git a/arch/arm/dts/r8a7793-gose-u-boot.dts b/arch/arm/dts/r8a7793-gose-u-boot.dts deleted file mode 100644 index dd0932ceca9..00000000000 --- a/arch/arm/dts/r8a7793-gose-u-boot.dts +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Gose board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a7793-gose.dts" -#include "r8a7793-u-boot.dtsi" - -&scif0 { - bootph-all; -}; - -&qspi { - flash@0 { - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - }; -}; diff --git a/arch/arm/dts/r8a7793-gose-u-boot.dtsi b/arch/arm/dts/r8a7793-gose-u-boot.dtsi new file mode 100644 index 00000000000..41c4361c6e1 --- /dev/null +++ b/arch/arm/dts/r8a7793-gose-u-boot.dtsi @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Gose board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a7793-u-boot.dtsi" + +&scif0 { + bootph-all; +}; + +&qspi { + flash@0 { + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; diff --git a/arch/arm/dts/r8a7794-alt-u-boot.dts b/arch/arm/dts/r8a7794-alt-u-boot.dts deleted file mode 100644 index 0a39039fc97..00000000000 --- a/arch/arm/dts/r8a7794-alt-u-boot.dts +++ /dev/null @@ -1,53 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Alt board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a7794-alt.dts" -#include "r8a7794-u-boot.dtsi" - -&i2c7 { - status = "okay"; - clock-frequency = <100000>; -}; - -&pci0 { - status = "okay"; - pinctrl-0 = <&usb0_pins>; - pinctrl-names = "default"; -}; - -&pci1 { - status = "okay"; - pinctrl-0 = <&usb1_pins>; - pinctrl-names = "default"; -}; - -&pfc { - usb0_pins: usb0 { - groups = "usb0"; - function = "usb0"; - }; - - usb1_pins: usb1 { - groups = "usb1"; - function = "usb1"; - }; -}; - -&scif2 { - bootph-all; -}; - -&qspi { - flash@0 { - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - }; -}; - -&usbphy { - status = "okay"; -}; diff --git a/arch/arm/dts/r8a7794-alt-u-boot.dtsi b/arch/arm/dts/r8a7794-alt-u-boot.dtsi new file mode 100644 index 00000000000..e156b4c93c7 --- /dev/null +++ b/arch/arm/dts/r8a7794-alt-u-boot.dtsi @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Alt board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a7794-u-boot.dtsi" + +&i2c7 { + status = "okay"; + clock-frequency = <100000>; +}; + +&pci0 { + status = "okay"; + pinctrl-0 = <&usb0_pins>; + pinctrl-names = "default"; +}; + +&pci1 { + status = "okay"; + pinctrl-0 = <&usb1_pins>; + pinctrl-names = "default"; +}; + +&pfc { + usb0_pins: usb0 { + groups = "usb0"; + function = "usb0"; + }; + + usb1_pins: usb1 { + groups = "usb1"; + function = "usb1"; + }; +}; + +&scif2 { + bootph-all; +}; + +&qspi { + flash@0 { + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; + +&usbphy { + status = "okay"; +}; diff --git a/arch/arm/dts/r8a7794-silk-u-boot.dts b/arch/arm/dts/r8a7794-silk-u-boot.dts deleted file mode 100644 index 3fcb535a3ac..00000000000 --- a/arch/arm/dts/r8a7794-silk-u-boot.dts +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Silk board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a7794-silk.dts" -#include "r8a7794-u-boot.dtsi" - -&scif2 { - bootph-all; -}; - -&qspi { - flash@0 { - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - }; -}; diff --git a/arch/arm/dts/r8a7794-silk-u-boot.dtsi b/arch/arm/dts/r8a7794-silk-u-boot.dtsi new file mode 100644 index 00000000000..e448ea7e146 --- /dev/null +++ b/arch/arm/dts/r8a7794-silk-u-boot.dtsi @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Silk board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a7794-u-boot.dtsi" + +&scif2 { + bootph-all; +}; + +&qspi { + flash@0 { + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; diff --git a/arch/arm/dts/r8a77950-salvator-x-u-boot.dts b/arch/arm/dts/r8a77950-salvator-x-u-boot.dts deleted file mode 100644 index ba7cf521d0d..00000000000 --- a/arch/arm/dts/r8a77950-salvator-x-u-boot.dts +++ /dev/null @@ -1,60 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Salvator-X board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a77950-salvator-x.dts" -#include "r8a77950-u-boot.dtsi" - -/ { - sysinfo { - compatible = "renesas,rcar-sysinfo"; - i2c-eeprom = <&sysinfo_eeprom>; - bootph-all; - }; -}; - -&i2c_dvfs { - bootph-all; - - sysinfo_eeprom: eeprom@50 { - bootph-all; - status = "okay"; - }; -}; - -&rpc { - reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "disabled"; -}; - -&sdhi0 { - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr104; - max-frequency = <208000000>; -}; - -&sdhi2 { - mmc-ddr-1_8v; - mmc-hs200-1_8v; - mmc-hs400-1_8v; - max-frequency = <200000000>; -}; - -&sdhi3 { - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr104; - max-frequency = <208000000>; -}; - -&vcc_sdhi0 { - u-boot,off-on-delay-us = <20000>; -}; - -&vcc_sdhi3 { - u-boot,off-on-delay-us = <20000>; -}; diff --git a/arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi new file mode 100644 index 00000000000..23f12543746 --- /dev/null +++ b/arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Salvator-X board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a77950-u-boot.dtsi" + +/ { + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + bootph-all; + }; +}; + +&i2c_dvfs { + bootph-all; + + sysinfo_eeprom: eeprom@50 { + bootph-all; + status = "okay"; + }; +}; + +&rpc { + reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; + status = "disabled"; +}; + +&sdhi0 { + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr104; + max-frequency = <208000000>; +}; + +&sdhi2 { + mmc-ddr-1_8v; + mmc-hs200-1_8v; + mmc-hs400-1_8v; + max-frequency = <200000000>; +}; + +&sdhi3 { + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr104; + max-frequency = <208000000>; +}; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; + +&vcc_sdhi3 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a77950-ulcb-u-boot.dts b/arch/arm/dts/r8a77950-ulcb-u-boot.dts deleted file mode 100644 index e371cde349f..00000000000 --- a/arch/arm/dts/r8a77950-ulcb-u-boot.dts +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the ULCB board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a77950-ulcb.dts" -#include "r8a77950-u-boot.dtsi" - -/ { - cpld { - compatible = "renesas,ulcb-cpld"; - status = "okay"; - gpio-sck = <&gpio6 8 0>; - gpio-mosi = <&gpio6 7 0>; - gpio-miso = <&gpio6 10 0>; - gpio-sstbz = <&gpio2 3 0>; - }; - - sysinfo { - compatible = "renesas,rcar-sysinfo"; - i2c-eeprom = <&sysinfo_eeprom>; - bootph-all; - }; -}; - -&i2c_dvfs { - bootph-all; - - sysinfo_eeprom: eeprom@50 { - compatible = "rohm,br24t01", "atmel,24c01"; - reg = <0x50>; - pagesize = <8>; - bootph-all; - status = "okay"; - }; -}; - -&rpc { - reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "disabled"; -}; - -&sdhi0 { - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr104; - max-frequency = <208000000>; -}; - -&sdhi2 { - mmc-ddr-1_8v; - mmc-hs200-1_8v; - mmc-hs400-1_8v; - max-frequency = <200000000>; -}; - -&vcc_sdhi0 { - u-boot,off-on-delay-us = <20000>; -}; diff --git a/arch/arm/dts/r8a77950-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77950-ulcb-u-boot.dtsi new file mode 100644 index 00000000000..c65c2e6406d --- /dev/null +++ b/arch/arm/dts/r8a77950-ulcb-u-boot.dtsi @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the ULCB board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a77950-u-boot.dtsi" + +/ { + cpld { + compatible = "renesas,ulcb-cpld"; + status = "okay"; + gpio-sck = <&gpio6 8 0>; + gpio-mosi = <&gpio6 7 0>; + gpio-miso = <&gpio6 10 0>; + gpio-sstbz = <&gpio2 3 0>; + }; + + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + bootph-all; + }; +}; + +&i2c_dvfs { + bootph-all; + + sysinfo_eeprom: eeprom@50 { + compatible = "rohm,br24t01", "atmel,24c01"; + reg = <0x50>; + pagesize = <8>; + bootph-all; + status = "okay"; + }; +}; + +&rpc { + reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; + status = "disabled"; +}; + +&sdhi0 { + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr104; + max-frequency = <208000000>; +}; + +&sdhi2 { + mmc-ddr-1_8v; + mmc-hs200-1_8v; + mmc-hs400-1_8v; + max-frequency = <200000000>; +}; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a77960-salvator-x-u-boot.dts b/arch/arm/dts/r8a77960-salvator-x-u-boot.dts deleted file mode 100644 index 2a9f0aa2180..00000000000 --- a/arch/arm/dts/r8a77960-salvator-x-u-boot.dts +++ /dev/null @@ -1,60 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Salvator-X board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a77960-salvator-x.dts" -#include "r8a77960-u-boot.dtsi" - -/ { - sysinfo { - compatible = "renesas,rcar-sysinfo"; - i2c-eeprom = <&sysinfo_eeprom>; - bootph-all; - }; -}; - -&i2c_dvfs { - bootph-all; - - sysinfo_eeprom: eeprom@50 { - bootph-all; - status = "okay"; - }; -}; - -&rpc { - reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "disabled"; -}; - -&sdhi0 { - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr104; - max-frequency = <208000000>; -}; - -&sdhi2 { - mmc-ddr-1_8v; - mmc-hs200-1_8v; - mmc-hs400-1_8v; - max-frequency = <200000000>; -}; - -&sdhi3 { - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr104; - max-frequency = <208000000>; -}; - -&vcc_sdhi0 { - u-boot,off-on-delay-us = <20000>; -}; - -&vcc_sdhi3 { - u-boot,off-on-delay-us = <20000>; -}; diff --git a/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi new file mode 100644 index 00000000000..84a28bf885c --- /dev/null +++ b/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Salvator-X board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a77960-u-boot.dtsi" + +/ { + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + bootph-all; + }; +}; + +&i2c_dvfs { + bootph-all; + + sysinfo_eeprom: eeprom@50 { + bootph-all; + status = "okay"; + }; +}; + +&rpc { + reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; + status = "disabled"; +}; + +&sdhi0 { + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr104; + max-frequency = <208000000>; +}; + +&sdhi2 { + mmc-ddr-1_8v; + mmc-hs200-1_8v; + mmc-hs400-1_8v; + max-frequency = <200000000>; +}; + +&sdhi3 { + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr104; + max-frequency = <208000000>; +}; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; + +&vcc_sdhi3 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a77960-ulcb-u-boot.dts b/arch/arm/dts/r8a77960-ulcb-u-boot.dts deleted file mode 100644 index 79042b20852..00000000000 --- a/arch/arm/dts/r8a77960-ulcb-u-boot.dts +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the ULCB board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a77960-ulcb.dts" -#include "r8a77960-u-boot.dtsi" - -/ { - cpld { - compatible = "renesas,ulcb-cpld"; - status = "okay"; - gpio-sck = <&gpio6 8 0>; - gpio-mosi = <&gpio6 7 0>; - gpio-miso = <&gpio6 10 0>; - gpio-sstbz = <&gpio2 3 0>; - }; - - sysinfo { - compatible = "renesas,rcar-sysinfo"; - i2c-eeprom = <&sysinfo_eeprom>; - bootph-all; - }; -}; - -&i2c_dvfs { - bootph-all; - - sysinfo_eeprom: eeprom@50 { - compatible = "rohm,br24t01", "atmel,24c01"; - reg = <0x50>; - pagesize = <8>; - bootph-all; - status = "okay"; - }; -}; - -&rpc { - reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "disabled"; -}; - -&sdhi0 { - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr104; - max-frequency = <208000000>; -}; - -&sdhi2 { - mmc-ddr-1_8v; - mmc-hs200-1_8v; - mmc-hs400-1_8v; - max-frequency = <200000000>; -}; - -&vcc_sdhi0 { - u-boot,off-on-delay-us = <20000>; -}; diff --git a/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi new file mode 100644 index 00000000000..6372f953956 --- /dev/null +++ b/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the ULCB board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a77960-u-boot.dtsi" + +/ { + cpld { + compatible = "renesas,ulcb-cpld"; + status = "okay"; + gpio-sck = <&gpio6 8 0>; + gpio-mosi = <&gpio6 7 0>; + gpio-miso = <&gpio6 10 0>; + gpio-sstbz = <&gpio2 3 0>; + }; + + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + bootph-all; + }; +}; + +&i2c_dvfs { + bootph-all; + + sysinfo_eeprom: eeprom@50 { + compatible = "rohm,br24t01", "atmel,24c01"; + reg = <0x50>; + pagesize = <8>; + bootph-all; + status = "okay"; + }; +}; + +&rpc { + reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; + status = "disabled"; +}; + +&sdhi0 { + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr104; + max-frequency = <208000000>; +}; + +&sdhi2 { + mmc-ddr-1_8v; + mmc-hs200-1_8v; + mmc-hs400-1_8v; + max-frequency = <200000000>; +}; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts deleted file mode 100644 index e5421f9ca8f..00000000000 --- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts +++ /dev/null @@ -1,63 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the M3N Salvator-XS board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a77965-salvator-x.dts" -#include "r8a77965-u-boot.dtsi" - -/ { - sysinfo { - compatible = "renesas,rcar-sysinfo"; - i2c-eeprom = <&sysinfo_eeprom>; - bootph-all; - }; -}; - -&i2c_dvfs { - bootph-all; - - sysinfo_eeprom: eeprom@50 { - bootph-all; - status = "okay"; - }; -}; - -&rpc { - reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "disabled"; -}; - -&sdhi0 { - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr104; - max-frequency = <208000000>; - status = "okay"; -}; - -&sdhi2 { - mmc-ddr-1_8v; - mmc-hs200-1_8v; - mmc-hs400-1_8v; - max-frequency = <200000000>; - status = "okay"; -}; - -&sdhi3 { - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr104; - max-frequency = <208000000>; - status = "okay"; -}; - -&vcc_sdhi0 { - u-boot,off-on-delay-us = <20000>; -}; - -&vcc_sdhi3 { - u-boot,off-on-delay-us = <20000>; -}; diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi new file mode 100644 index 00000000000..d9a28fe9bab --- /dev/null +++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the M3N Salvator-XS board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a77965-u-boot.dtsi" + +/ { + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + bootph-all; + }; +}; + +&i2c_dvfs { + bootph-all; + + sysinfo_eeprom: eeprom@50 { + bootph-all; + status = "okay"; + }; +}; + +&rpc { + reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; + status = "disabled"; +}; + +&sdhi0 { + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr104; + max-frequency = <208000000>; + status = "okay"; +}; + +&sdhi2 { + mmc-ddr-1_8v; + mmc-hs200-1_8v; + mmc-hs400-1_8v; + max-frequency = <200000000>; + status = "okay"; +}; + +&sdhi3 { + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr104; + max-frequency = <208000000>; + status = "okay"; +}; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; + +&vcc_sdhi3 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a77965-ulcb-u-boot.dts b/arch/arm/dts/r8a77965-ulcb-u-boot.dts deleted file mode 100644 index 969911d89ce..00000000000 --- a/arch/arm/dts/r8a77965-ulcb-u-boot.dts +++ /dev/null @@ -1,63 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the ULCB board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a77965-ulcb.dts" -#include "r8a77965-u-boot.dtsi" - -/ { - cpld { - compatible = "renesas,ulcb-cpld"; - status = "okay"; - gpio-sck = <&gpio6 8 0>; - gpio-mosi = <&gpio6 7 0>; - gpio-miso = <&gpio6 10 0>; - gpio-sstbz = <&gpio2 3 0>; - }; - - sysinfo { - compatible = "renesas,rcar-sysinfo"; - i2c-eeprom = <&sysinfo_eeprom>; - bootph-all; - }; -}; - -&i2c_dvfs { - bootph-all; - - sysinfo_eeprom: eeprom@50 { - compatible = "rohm,br24t01", "atmel,24c01"; - reg = <0x50>; - pagesize = <8>; - bootph-all; - status = "okay"; - }; -}; - -&rpc { - reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "disabled"; -}; - -&sdhi0 { - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr104; - max-frequency = <208000000>; - status = "okay"; -}; - -&sdhi2 { - mmc-ddr-1_8v; - mmc-hs200-1_8v; - mmc-hs400-1_8v; - max-frequency = <200000000>; - status = "okay"; -}; - -&vcc_sdhi0 { - u-boot,off-on-delay-us = <20000>; -}; diff --git a/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi new file mode 100644 index 00000000000..aa5de3d0465 --- /dev/null +++ b/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the ULCB board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a77965-u-boot.dtsi" + +/ { + cpld { + compatible = "renesas,ulcb-cpld"; + status = "okay"; + gpio-sck = <&gpio6 8 0>; + gpio-mosi = <&gpio6 7 0>; + gpio-miso = <&gpio6 10 0>; + gpio-sstbz = <&gpio2 3 0>; + }; + + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + bootph-all; + }; +}; + +&i2c_dvfs { + bootph-all; + + sysinfo_eeprom: eeprom@50 { + compatible = "rohm,br24t01", "atmel,24c01"; + reg = <0x50>; + pagesize = <8>; + bootph-all; + status = "okay"; + }; +}; + +&rpc { + reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; + status = "disabled"; +}; + +&sdhi0 { + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr104; + max-frequency = <208000000>; + status = "okay"; +}; + +&sdhi2 { + mmc-ddr-1_8v; + mmc-hs200-1_8v; + mmc-hs400-1_8v; + max-frequency = <200000000>; + status = "okay"; +}; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a77970-eagle-u-boot.dts b/arch/arm/dts/r8a77970-eagle-u-boot.dts deleted file mode 100644 index eb868eda414..00000000000 --- a/arch/arm/dts/r8a77970-eagle-u-boot.dts +++ /dev/null @@ -1,54 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Eagle board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a77970-eagle.dts" -#include "r8a77970-u-boot.dtsi" -#include - -/ { - aliases { - spi0 = &rpc; - }; -}; - -&avb { - pinctrl-0 = <&avb0_pins>; - pinctrl-names = "default"; - -}; - -&phy0 { - reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; -}; - -&pfc { - avb0_pins: avb { - mux { - groups = "avb0_link", "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk"; - function = "avb0"; - }; - }; -}; - -&rpc { - num-cs = <1>; - status = "okay"; - spi-max-frequency = <50000000>; - #address-cells = <1>; - #size-cells = <0>; - - flash0: spi-flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "s25fs512s", "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - reg = <0>; - status = "okay"; - }; -}; diff --git a/arch/arm/dts/r8a77970-eagle-u-boot.dtsi b/arch/arm/dts/r8a77970-eagle-u-boot.dtsi new file mode 100644 index 00000000000..c7971b9e9ce --- /dev/null +++ b/arch/arm/dts/r8a77970-eagle-u-boot.dtsi @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Eagle board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a77970-u-boot.dtsi" +#include + +/ { + aliases { + spi0 = &rpc; + }; +}; + +&avb { + pinctrl-0 = <&avb0_pins>; + pinctrl-names = "default"; + +}; + +&phy0 { + reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; +}; + +&pfc { + avb0_pins: avb { + mux { + groups = "avb0_link", "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk"; + function = "avb0"; + }; + }; +}; + +&rpc { + num-cs = <1>; + status = "okay"; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <0>; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "s25fs512s", "jedec,spi-nor"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + reg = <0>; + status = "okay"; + }; +}; diff --git a/arch/arm/dts/r8a77970-v3msk-u-boot.dts b/arch/arm/dts/r8a77970-v3msk-u-boot.dts deleted file mode 100644 index 6ee06d7c000..00000000000 --- a/arch/arm/dts/r8a77970-v3msk-u-boot.dts +++ /dev/null @@ -1,65 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the V3MSK board - * - * Copyright (C) 2019 Cogent Embedded, Inc. - */ - -#include "r8a77970-v3msk.dts" -#include "r8a77970-u-boot.dtsi" -#include - -/ { - aliases { - spi0 = &rpc; - }; - - cpld { - compatible = "renesas,v3msk-cpld"; - status = "okay"; - gpio-mdc = <&gpio1 21 0>; - gpio-mosi = <&gpio1 22 0>; - gpio-miso = <&gpio1 23 0>; - gpio-enablez = <&gpio1 19 0>; - /* Disable V3MSK Videobox Mini CANFD PHY */ - gpios = <&gpio0 12 0>, <&gpio0 14 0>; - }; -}; - -&avb { - pinctrl-0 = <&avb0_pins>; - pinctrl-names = "default"; - -}; - -&phy0 { - reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; -}; - -&pfc { - avb0_pins: avb { - mux { - groups = "avb0_link", "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk"; - function = "avb0"; - }; - }; -}; - -&rpc { - num-cs = <1>; - status = "okay"; - spi-max-frequency = <50000000>; - #address-cells = <1>; - #size-cells = <0>; - - flash0: spi-flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "s25fs512s", "spi-flash", "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - reg = <0>; - status = "okay"; - }; -}; diff --git a/arch/arm/dts/r8a77970-v3msk-u-boot.dtsi b/arch/arm/dts/r8a77970-v3msk-u-boot.dtsi new file mode 100644 index 00000000000..c7b2e07793d --- /dev/null +++ b/arch/arm/dts/r8a77970-v3msk-u-boot.dtsi @@ -0,0 +1,64 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the V3MSK board + * + * Copyright (C) 2019 Cogent Embedded, Inc. + */ + +#include "r8a77970-u-boot.dtsi" +#include + +/ { + aliases { + spi0 = &rpc; + }; + + cpld { + compatible = "renesas,v3msk-cpld"; + status = "okay"; + gpio-mdc = <&gpio1 21 0>; + gpio-mosi = <&gpio1 22 0>; + gpio-miso = <&gpio1 23 0>; + gpio-enablez = <&gpio1 19 0>; + /* Disable V3MSK Videobox Mini CANFD PHY */ + gpios = <&gpio0 12 0>, <&gpio0 14 0>; + }; +}; + +&avb { + pinctrl-0 = <&avb0_pins>; + pinctrl-names = "default"; + +}; + +&phy0 { + reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; +}; + +&pfc { + avb0_pins: avb { + mux { + groups = "avb0_link", "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk"; + function = "avb0"; + }; + }; +}; + +&rpc { + num-cs = <1>; + status = "okay"; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <0>; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "s25fs512s", "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + reg = <0>; + status = "okay"; + }; +}; diff --git a/arch/arm/dts/r8a77980-condor-u-boot.dts b/arch/arm/dts/r8a77980-condor-u-boot.dts deleted file mode 100644 index f4a3b43b8ff..00000000000 --- a/arch/arm/dts/r8a77980-condor-u-boot.dts +++ /dev/null @@ -1,52 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Condor board - * - * Copyright (C) 2019 Marek Vasut - */ - -#include "r8a77980-condor.dts" -#include "r8a77980-u-boot.dtsi" - -/ { - aliases { - spi0 = &rpc; - }; - - sysinfo { - compatible = "renesas,rcar-sysinfo"; - i2c-eeprom = <&sysinfo_eeprom>; - bootph-all; - }; -}; - -&i2c0 { - bootph-all; - - sysinfo_eeprom: eeprom@50 { - compatible = "rohm,br24t01", "atmel,24c01"; - reg = <0x50>; - pagesize = <8>; - bootph-all; - }; -}; - -&rpc { - num-cs = <1>; - status = "okay"; - spi-max-frequency = <50000000>; - #address-cells = <1>; - #size-cells = <0>; - - flash0: spi-flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "s25fs512s", "jedec,spi-nor"; - m25p,fast-read; - spi-max-frequency = <50000000>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - reg = <0>; - status = "okay"; - }; -}; diff --git a/arch/arm/dts/r8a77980-condor-u-boot.dtsi b/arch/arm/dts/r8a77980-condor-u-boot.dtsi new file mode 100644 index 00000000000..34a735ae5b2 --- /dev/null +++ b/arch/arm/dts/r8a77980-condor-u-boot.dtsi @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Condor board + * + * Copyright (C) 2019 Marek Vasut + */ + +#include "r8a77980-u-boot.dtsi" + +/ { + aliases { + spi0 = &rpc; + }; + + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + bootph-all; + }; +}; + +&i2c0 { + bootph-all; + + sysinfo_eeprom: eeprom@50 { + compatible = "rohm,br24t01", "atmel,24c01"; + reg = <0x50>; + pagesize = <8>; + bootph-all; + }; +}; + +&rpc { + num-cs = <1>; + status = "okay"; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <0>; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "s25fs512s", "jedec,spi-nor"; + m25p,fast-read; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + reg = <0>; + status = "okay"; + }; +}; diff --git a/arch/arm/dts/r8a77980-v3hsk-u-boot.dts b/arch/arm/dts/r8a77980-v3hsk-u-boot.dts deleted file mode 100644 index d083df65f9a..00000000000 --- a/arch/arm/dts/r8a77980-v3hsk-u-boot.dts +++ /dev/null @@ -1,42 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Eagle board - * - * Copyright (C) 2019 Cogent Embedded, Inc. - */ - -#include "r8a77980-v3hsk.dts" -#include "r8a77980-u-boot.dtsi" - -/ { - aliases { - spi0 = &rpc; - }; -}; - -&rpc { - num-cs = <1>; - status = "okay"; - spi-max-frequency = <50000000>; - #address-cells = <1>; - #size-cells = <0>; - - flash0: spi-flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "s25fs512s", "spi-flash", "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - reg = <0>; - status = "okay"; - }; -}; - -&i2c0 { - cpld { - compatible = "renesas,v3hsk-cpld"; - reg = <0x70>; - u-boot,i2c-offset-len = <2>; - }; -}; diff --git a/arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi b/arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi new file mode 100644 index 00000000000..2901d0e7b57 --- /dev/null +++ b/arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi @@ -0,0 +1,41 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Eagle board + * + * Copyright (C) 2019 Cogent Embedded, Inc. + */ + +#include "r8a77980-u-boot.dtsi" + +/ { + aliases { + spi0 = &rpc; + }; +}; + +&rpc { + num-cs = <1>; + status = "okay"; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <0>; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "s25fs512s", "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + reg = <0>; + status = "okay"; + }; +}; + +&i2c0 { + cpld { + compatible = "renesas,v3hsk-cpld"; + reg = <0x70>; + u-boot,i2c-offset-len = <2>; + }; +}; diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dts b/arch/arm/dts/r8a77990-ebisu-u-boot.dts deleted file mode 100644 index fc1c4a79294..00000000000 --- a/arch/arm/dts/r8a77990-ebisu-u-boot.dts +++ /dev/null @@ -1,67 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Ebisu board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a77990-ebisu.dts" -#include "r8a77990-u-boot.dtsi" - -/ { - sysinfo { - compatible = "renesas,rcar-sysinfo"; - i2c-eeprom = <&sysinfo_eeprom>; - bootph-all; - }; -}; - -&i2c_dvfs { - compatible = "renesas,iic-r8a77990", - "renesas,rcar-gen3-iic", - "renesas,rmobile-iic"; - bootph-all; - - sysinfo_eeprom: eeprom@50 { - compatible = "rohm,br24t01", "atmel,24c01"; - reg = <0x50>; - pagesize = <8>; - bootph-all; - status = "okay"; - }; -}; - -&pfc { - pinctrl-0 = <&scif_clk_pins>; - pinctrl-names = "default"; - - scif_clk_pins: scif_clk { - groups = "scif_clk_a"; - function = "scif_clk"; - }; -}; - -&rpc { - reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "disabled"; -}; - -&sdhi0 { - sd-uhs-sdr12; - sd-uhs-sdr25; - max-frequency = <208000000>; -}; - -&sdhi1 { - sd-uhs-sdr12; - sd-uhs-sdr25; - max-frequency = <208000000>; -}; - -&vcc_sdhi0 { - u-boot,off-on-delay-us = <20000>; -}; - -&vcc_sdhi1 { - u-boot,off-on-delay-us = <20000>; -}; diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi b/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi new file mode 100644 index 00000000000..b6b7b8f3609 --- /dev/null +++ b/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Ebisu board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a77990-u-boot.dtsi" + +/ { + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + bootph-all; + }; +}; + +&i2c_dvfs { + compatible = "renesas,iic-r8a77990", + "renesas,rcar-gen3-iic", + "renesas,rmobile-iic"; + bootph-all; + + sysinfo_eeprom: eeprom@50 { + compatible = "rohm,br24t01", "atmel,24c01"; + reg = <0x50>; + pagesize = <8>; + bootph-all; + status = "okay"; + }; +}; + +&pfc { + pinctrl-0 = <&scif_clk_pins>; + pinctrl-names = "default"; + + scif_clk_pins: scif_clk { + groups = "scif_clk_a"; + function = "scif_clk"; + }; +}; + +&rpc { + reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; + status = "disabled"; +}; + +&sdhi0 { + sd-uhs-sdr12; + sd-uhs-sdr25; + max-frequency = <208000000>; +}; + +&sdhi1 { + sd-uhs-sdr12; + sd-uhs-sdr25; + max-frequency = <208000000>; +}; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; + +&vcc_sdhi1 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a77995-draak-u-boot.dts b/arch/arm/dts/r8a77995-draak-u-boot.dts deleted file mode 100644 index 41ceae1da77..00000000000 --- a/arch/arm/dts/r8a77995-draak-u-boot.dts +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Draak board - * - * Copyright (C) 2018 Marek Vasut - */ - -#include "r8a77995-draak.dts" -#include "r8a77995-u-boot.dtsi" - -/ { - sysinfo { - compatible = "renesas,rcar-sysinfo"; - i2c-eeprom = <&sysinfo_eeprom>; - bootph-all; - }; -}; - -&i2c0 { - bootph-all; - - sysinfo_eeprom: eeprom@50 { - compatible = "rohm,br24t01", "atmel,24c01"; - reg = <0x50>; - pagesize = <8>; - bootph-all; - }; -}; - -&rpc { - reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "disabled"; -}; diff --git a/arch/arm/dts/r8a77995-draak-u-boot.dtsi b/arch/arm/dts/r8a77995-draak-u-boot.dtsi new file mode 100644 index 00000000000..1922c40a438 --- /dev/null +++ b/arch/arm/dts/r8a77995-draak-u-boot.dtsi @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Draak board + * + * Copyright (C) 2018 Marek Vasut + */ + +#include "r8a77995-u-boot.dtsi" + +/ { + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + bootph-all; + }; +}; + +&i2c0 { + bootph-all; + + sysinfo_eeprom: eeprom@50 { + compatible = "rohm,br24t01", "atmel,24c01"; + reg = <0x50>; + pagesize = <8>; + bootph-all; + }; +}; + +&rpc { + reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; + status = "disabled"; +}; diff --git a/arch/arm/dts/r8a779a0-falcon-u-boot.dts b/arch/arm/dts/r8a779a0-falcon-u-boot.dts deleted file mode 100644 index 9d28791c605..00000000000 --- a/arch/arm/dts/r8a779a0-falcon-u-boot.dts +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Falcon board - * - * Copyright (C) 2020 Renesas Electronics Corp. - */ - -#include "r8a779a0-falcon.dts" -#include "r8a779a0-u-boot.dtsi" - -/ { - aliases { - spi0 = &rpc; - }; -}; - -&rpc { - #address-cells = <1>; - #size-cells = <0>; - num-cs = <1>; - spi-max-frequency = <50000000>; - status = "okay"; - - flash@0 { - reg = <0>; - compatible = "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - status = "okay"; - }; -}; diff --git a/arch/arm/dts/r8a779a0-falcon-u-boot.dtsi b/arch/arm/dts/r8a779a0-falcon-u-boot.dtsi new file mode 100644 index 00000000000..3b8a017cb41 --- /dev/null +++ b/arch/arm/dts/r8a779a0-falcon-u-boot.dtsi @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Falcon board + * + * Copyright (C) 2020 Renesas Electronics Corp. + */ + +#include "r8a779a0-u-boot.dtsi" + +/ { + aliases { + spi0 = &rpc; + }; +}; + +&rpc { + #address-cells = <1>; + #size-cells = <0>; + num-cs = <1>; + spi-max-frequency = <50000000>; + status = "okay"; + + flash@0 { + reg = <0>; + compatible = "jedec,spi-nor"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + status = "okay"; + }; +}; diff --git a/arch/arm/dts/r8a779f0-spider-u-boot.dts b/arch/arm/dts/r8a779f0-spider-u-boot.dts deleted file mode 100644 index 26fc8bcf440..00000000000 --- a/arch/arm/dts/r8a779f0-spider-u-boot.dts +++ /dev/null @@ -1,42 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Spider board - * - * Copyright (C) 2021 Renesas Electronics Corp. - */ - -#include "r8a779f0-spider.dts" -#include "r8a779f0-u-boot.dtsi" - -/ { - aliases { - spi0 = &rpc; - }; -}; - -&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 = "okay"; - - spi-flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "s25fs512s", "jedec,spi-nor"; - reg = <0>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - spi-max-frequency = <40000000>; - }; -}; diff --git a/arch/arm/dts/r8a779f0-spider-u-boot.dtsi b/arch/arm/dts/r8a779f0-spider-u-boot.dtsi new file mode 100644 index 00000000000..2fc7e7789a2 --- /dev/null +++ b/arch/arm/dts/r8a779f0-spider-u-boot.dtsi @@ -0,0 +1,41 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Spider board + * + * Copyright (C) 2021 Renesas Electronics Corp. + */ + +#include "r8a779f0-u-boot.dtsi" + +/ { + aliases { + spi0 = &rpc; + }; +}; + +&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 = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "s25fs512s", "jedec,spi-nor"; + reg = <0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + spi-max-frequency = <40000000>; + }; +}; diff --git a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dts b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dts deleted file mode 100644 index bd756036645..00000000000 --- a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dts +++ /dev/null @@ -1,42 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the White Hawk board - * - * Copyright (C) 2021 Renesas Electronics Corp. - */ - -#include "r8a779g0-white-hawk.dts" -#include "r8a779g0-u-boot.dtsi" - -/ { - aliases { - spi0 = &rpc; - }; -}; - -&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>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - spi-max-frequency = <40000000>; - }; -}; diff --git a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi new file mode 100644 index 00000000000..a102639010d --- /dev/null +++ b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi @@ -0,0 +1,41 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the White Hawk board + * + * Copyright (C) 2021 Renesas Electronics Corp. + */ + +#include "r8a779g0-u-boot.dtsi" + +/ { + aliases { + spi0 = &rpc; + }; +}; + +&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>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + spi-max-frequency = <40000000>; + }; +}; diff --git a/arch/arm/dts/r8a779h0-gray-hawk-u-boot.dts b/arch/arm/dts/r8a779h0-gray-hawk-u-boot.dts deleted file mode 100644 index 935ba9465dc..00000000000 --- a/arch/arm/dts/r8a779h0-gray-hawk-u-boot.dts +++ /dev/null @@ -1,42 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source extras for U-Boot for the Gray Hawk board - * - * Copyright (C) 2023 Renesas Electronics Corp. - */ - -#include "r8a779h0-gray-hawk.dts" -#include "r8a779h0-u-boot.dtsi" - -/ { - aliases { - spi0 = &rpc; - }; -}; - -&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 = "okay"; - - flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "s25fs512s", "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <40000000>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <1>; - }; -}; diff --git a/arch/arm/dts/r8a779h0-gray-hawk-u-boot.dtsi b/arch/arm/dts/r8a779h0-gray-hawk-u-boot.dtsi new file mode 100644 index 00000000000..92c13151613 --- /dev/null +++ b/arch/arm/dts/r8a779h0-gray-hawk-u-boot.dtsi @@ -0,0 +1,41 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the Gray Hawk board + * + * Copyright (C) 2023 Renesas Electronics Corp. + */ + +#include "r8a779h0-u-boot.dtsi" + +/ { + aliases { + spi0 = &rpc; + }; +}; + +&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 = "okay"; + + flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "s25fs512s", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index 8c47246ae8b..afb3b63582b 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -79,15 +79,15 @@ int board_fit_config_name_match(const char *name) u32 cpu_type = renesas_get_cpu_type(); if ((cpu_type == RENESAS_CPU_TYPE_R8A7795) && - !strcmp(name, "r8a77950-salvator-x-u-boot")) + !strcmp(name, "r8a77950-salvator-x")) return 0; if ((cpu_type == RENESAS_CPU_TYPE_R8A7796) && - !strcmp(name, "r8a77960-salvator-x-u-boot")) + !strcmp(name, "r8a77960-salvator-x")) return 0; if ((cpu_type == RENESAS_CPU_TYPE_R8A77965) && - !strcmp(name, "r8a77965-salvator-x-u-boot")) + !strcmp(name, "r8a77965-salvator-x")) return 0; return -1; diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 8f5de216995..cda6976602d 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -70,15 +70,15 @@ int board_fit_config_name_match(const char *name) u32 cpu_type = renesas_get_cpu_type(); if ((cpu_type == RENESAS_CPU_TYPE_R8A7795) && - !strcmp(name, "r8a77950-ulcb-u-boot")) + !strcmp(name, "r8a77950-ulcb")) return 0; if ((cpu_type == RENESAS_CPU_TYPE_R8A7796) && - !strcmp(name, "r8a77960-ulcb-u-boot")) + !strcmp(name, "r8a77960-ulcb")) return 0; if ((cpu_type == RENESAS_CPU_TYPE_R8A77965) && - !strcmp(name, "r8a77965-ulcb-u-boot")) + !strcmp(name, "r8a77965-ulcb")) return 0; return -1; diff --git a/configs/alt_defconfig b/configs/alt_defconfig index e4007ab8f71..06e9e11f297 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7794-alt-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a7794-alt" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Alt" CONFIG_R8A7794=y diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index af7622a88af..c392055e5a7 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -12,7 +12,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x40000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche" CONFIG_ARCH_RENESAS_BOARD_STRING="Blanche" CONFIG_R8A7792=y CONFIG_TARGET_BLANCHE=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 1eadf7c14d3..35edc677c48 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7793-gose-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a7793-gose" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Gose" CONFIG_R8A7793=y diff --git a/configs/grpeach_defconfig b/configs/grpeach_defconfig index eef3bad4e65..0c581b634a2 100644 --- a/configs/grpeach_defconfig +++ b/configs/grpeach_defconfig @@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x80000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r7s72100-gr-peach-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r7s72100-gr-peach" CONFIG_RZA1=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 diff --git a/configs/hihope_rzg2_defconfig b/configs/hihope_rzg2_defconfig index a2c7e78cb86..88c7ed1b98f 100644 --- a/configs/hihope_rzg2_defconfig +++ b/configs/hihope_rzg2_defconfig @@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a774a1-hihope-rzg2m-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a774a1-hihope-rzg2m" CONFIG_RCAR_GEN3=y CONFIG_TARGET_HIHOPE_RZG2=y CONFIG_SYS_MONITOR_LEN=1048576 @@ -40,7 +40,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="r8a774a1-hihope-rzg2m-u-boot r8a774b1-hihope-rzg2n-u-boot r8a774e1-hihope-rzg2h-u-boot" +CONFIG_OF_LIST="r8a774a1-hihope-rzg2m r8a774b1-hihope-rzg2n r8a774e1-hihope-rzg2h" CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 963e02d6b54..ad411b45141 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7791-koelsch-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a7791-koelsch" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Koelsch" CONFIG_R8A7791=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 605909e812f..f60d4db5ec2 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7790-lager-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a7790-lager" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Lager" CONFIG_R8A7790=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 021e521745f..f05a0baf215 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7791-porter-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a7791-porter" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Porter" CONFIG_R8A7791=y diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig index 62fa7e1133c..a3f695e4238 100644 --- a/configs/r8a77970_eagle_defconfig +++ b/configs/r8a77970_eagle_defconfig @@ -9,7 +9,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a77970-eagle-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a77970-eagle" CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_EAGLE=y diff --git a/configs/r8a77970_v3msk_defconfig b/configs/r8a77970_v3msk_defconfig index b34087293ad..05c8d0e3868 100644 --- a/configs/r8a77970_v3msk_defconfig +++ b/configs/r8a77970_v3msk_defconfig @@ -9,7 +9,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a77970-v3msk-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a77970-v3msk" CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_RCAR_GEN3=y CONFIG_R8A77970=y diff --git a/configs/r8a77980_condor_defconfig b/configs/r8a77980_condor_defconfig index 8a501950364..9e11c1b27ee 100644 --- a/configs/r8a77980_condor_defconfig +++ b/configs/r8a77980_condor_defconfig @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a77980-condor-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a77980-condor" CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_CONDOR=y diff --git a/configs/r8a77980_v3hsk_defconfig b/configs/r8a77980_v3hsk_defconfig index 8d67b7f6bfe..f61574dd02d 100644 --- a/configs/r8a77980_v3hsk_defconfig +++ b/configs/r8a77980_v3hsk_defconfig @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a77980-v3hsk-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a77980-v3hsk" CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_RCAR_GEN3=y CONFIG_R8A77980=y diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig index 28fa30e31e5..fe4134226ac 100644 --- a/configs/r8a77990_ebisu_defconfig +++ b/configs/r8a77990_ebisu_defconfig @@ -8,7 +8,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a77990-ebisu-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a77990-ebisu" CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_EBISU=y diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig index 644320632a9..a964d4ea51e 100644 --- a/configs/r8a77995_draak_defconfig +++ b/configs/r8a77995_draak_defconfig @@ -8,7 +8,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a77995-draak-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a77995-draak" CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_DRAAK=y diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig index 04a5600960d..6681cb0088f 100644 --- a/configs/r8a779a0_falcon_defconfig +++ b/configs/r8a779a0_falcon_defconfig @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC00000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a779a0-falcon-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a779a0-falcon" CONFIG_RCAR_GEN4=y CONFIG_TARGET_FALCON=y CONFIG_SYS_MONITOR_LEN=1048576 diff --git a/configs/r8a779f0_spider_defconfig b/configs/r8a779f0_spider_defconfig index 54e0928debb..942e0184412 100644 --- a/configs/r8a779f0_spider_defconfig +++ b/configs/r8a779f0_spider_defconfig @@ -6,7 +6,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xD00000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a779f0-spider-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a779f0-spider" CONFIG_RCAR_GEN4=y CONFIG_TARGET_SPIDER=y CONFIG_SYS_MONITOR_LEN=1048576 diff --git a/configs/r8a779g0_whitehawk_defconfig b/configs/r8a779g0_whitehawk_defconfig index 1489c327c41..4cc6203e54d 100644 --- a/configs/r8a779g0_whitehawk_defconfig +++ b/configs/r8a779g0_whitehawk_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a779g0-white-hawk-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a779g0-white-hawk" CONFIG_RCAR_GEN4=y CONFIG_TARGET_WHITEHAWK=y CONFIG_SYS_MONITOR_LEN=1048576 diff --git a/configs/r8a779h0_grayhawk_defconfig b/configs/r8a779h0_grayhawk_defconfig index 84401eb9309..7368708195d 100644 --- a/configs/r8a779h0_grayhawk_defconfig +++ b/configs/r8a779h0_grayhawk_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a779h0-gray-hawk-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a779h0-gray-hawk" CONFIG_RCAR_GEN4=y CONFIG_TARGET_GRAYHAWK=y CONFIG_SYS_MONITOR_LEN=1048576 diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig index a69bb4381ca..c76cbec76d4 100644 --- a/configs/rcar3_salvator-x_defconfig +++ b/configs/rcar3_salvator-x_defconfig @@ -6,7 +6,7 @@ CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a77950-salvator-x-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a77950-salvator-x" CONFIG_SPL_TEXT_BASE=0xe6338000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y @@ -48,7 +48,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="r8a77950-salvator-x-u-boot r8a77960-salvator-x-u-boot r8a77965-salvator-x-u-boot" +CONFIG_OF_LIST="r8a77950-salvator-x r8a77960-salvator-x r8a77965-salvator-x" CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y CONFIG_OF_DTB_PROPS_REMOVE=y diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig index 5bd36979423..701dfcb7a0e 100644 --- a/configs/rcar3_ulcb_defconfig +++ b/configs/rcar3_ulcb_defconfig @@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a77950-ulcb-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a77950-ulcb" CONFIG_SPL_TEXT_BASE=0xe6338000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_ULCB=y @@ -46,7 +46,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="r8a77950-ulcb-u-boot r8a77960-ulcb-u-boot r8a77965-ulcb-u-boot" +CONFIG_OF_LIST="r8a77950-ulcb r8a77960-ulcb r8a77965-ulcb" CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y CONFIG_OF_DTB_PROPS_REMOVE=y diff --git a/configs/silinux_ek874_defconfig b/configs/silinux_ek874_defconfig index 0f0aca36ee6..93902e009b2 100644 --- a/configs/silinux_ek874_defconfig +++ b/configs/silinux_ek874_defconfig @@ -9,7 +9,7 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x3F0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a774c0-ek874-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a774c0-ek874" CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SILINUX_EK874=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 939ccc9c478..40ac8759d08 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7794-silk-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a7794-silk" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Silk" CONFIG_R8A7794=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 1022ee9e71a..428a0241986 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7790-stout-u-boot" +CONFIG_DEFAULT_DEVICE_TREE="r8a7790-stout" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Stout" CONFIG_R8A7790=y -- cgit v1.3.1