ARM: dts: renesas: Replace R8A77950 with R8A77951

R-Car R8A77950 H3 ES1.* was only available to an internal development
group and needed a lot of quirks and workarounds. Public users only
have R-Car R8A77950 H3 ES2 and newer. Switch existing systems to use
R8A77951 device trees.

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

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 2da5eddd3759ca791304ab2f82eabb61fe5b786a..b1c9c6222e5d444a9aae94884591f35e0cf0b6f3 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1073,8 +1073,8 @@ dtb-$(CONFIG_RCAR_GEN3) += \
        r8a774b1-hihope-rzg2n.dtb \
        r8a774c0-ek874.dtb \
        r8a774e1-hihope-rzg2h.dtb \
-       r8a77950-ulcb.dtb \
-       r8a77950-salvator-x.dtb \
+       r8a77951-ulcb.dtb \
+       r8a77951-salvator-x.dtb \
        r8a77960-ulcb.dtb \
        r8a77960-salvator-x.dtb \
        r8a77965-ulcb.dtb \

diff --git a/arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi
deleted file mode 100644 (file)
index 23f1254..0000000
--- a/arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi
+++ /dev/null
@@ -1,59 +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 <marek.vasut@gmail.com>
- */
-
-#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-u-boot.dtsi b/arch/arm/dts/r8a77950-u-boot.dtsi
deleted file mode 100644 (file)
index 92907ea..0000000
--- a/arch/arm/dts/r8a77950-u-boot.dtsi
+++ /dev/null
@@ -1,101 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on RCar R8A7795 SoC
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
- */
-
-#include "r8a779x-u-boot.dtsi"
-
-&extalr_clk {
-       bootph-all;
-};
-
-/ {
-       soc {
-               rpc: spi@ee200000 {
-                       compatible = "renesas,r8a7795-rpc-if", "renesas,rcar-gen3-rpc-if";
-                       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-                       clocks = <&cpg CPG_MOD 917>;
-                       bank-width = <2>;
-                       status = "disabled";
-               };
-       };
-};
-
-/delete-node/ &ak4613;
-/delete-node/ &audma0;
-/delete-node/ &audma1;
-/delete-node/ &can0;
-/delete-node/ &can1;
-/delete-node/ &canfd;
-/delete-node/ &csi20;
-/delete-node/ &csi21;
-/delete-node/ &csi40;
-/delete-node/ &csi41;
-/delete-node/ &drif00;
-/delete-node/ &drif01;
-/delete-node/ &drif10;
-/delete-node/ &drif11;
-/delete-node/ &drif20;
-/delete-node/ &drif21;
-/delete-node/ &drif30;
-/delete-node/ &drif31;
-/delete-node/ &du;
-/delete-node/ &fcpf0;
-/delete-node/ &fcpf1;
-/delete-node/ &fcpf2;
-/delete-node/ &fcpvb0;
-/delete-node/ &fcpvb1;
-/delete-node/ &fcpvd0;
-/delete-node/ &fcpvd1;
-/delete-node/ &fcpvd2;
-/delete-node/ &fcpvd3;
-/delete-node/ &fcpvi0;
-/delete-node/ &fcpvi1;
-/delete-node/ &fcpvi2;
-/delete-node/ &hdmi0;
-/delete-node/ &hdmi1;
-/delete-node/ &lvds0;
-/delete-node/ &rcar_sound;
-/delete-node/ &sound_card;
-/delete-node/ &vin0;
-/delete-node/ &vin1;
-/delete-node/ &vin2;
-/delete-node/ &vin3;
-/delete-node/ &vin4;
-/delete-node/ &vin5;
-/delete-node/ &vin6;
-/delete-node/ &vin7;
-/delete-node/ &vspbc;
-/delete-node/ &vspbd;
-/delete-node/ &vspd0;
-/delete-node/ &vspd1;
-/delete-node/ &vspd2;
-/delete-node/ &vspd3;
-/delete-node/ &vspi0;
-/delete-node/ &vspi1;
-/delete-node/ &vspi2;
-
-/ {
-       /delete-node/ cvbs-in;
-       /delete-node/ hdmi-in;
-       /delete-node/ hdmi0-out;
-       /delete-node/ hdmi1-out;
-       /delete-node/ vga-encoder;
-       /delete-node/ vga;
-};
-
-&i2c4 {
-       /delete-node/ video-receiver@70;
-};
-
-&soc {
-       /delete-node/ fdp1@fe940000;
-       /delete-node/ fdp1@fe944000;
-       /delete-node/ fdp1@fe948000;
-       /delete-node/ imr-lx4@fe860000;
-       /delete-node/ imr-lx4@fe870000;
-       /delete-node/ imr-lx4@fe880000;
-       /delete-node/ imr-lx4@fe890000;
-};

diff --git a/arch/arm/dts/r8a77950-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77950-ulcb-u-boot.dtsi
deleted file mode 100644 (file)
index c65c2e6..0000000
--- a/arch/arm/dts/r8a77950-ulcb-u-boot.dtsi
+++ /dev/null
@@ -1,60 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot for the ULCB board
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
- */
-
-#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/r8a77951-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi
new file mode 100644 (file)
index 0000000..744f4aa
--- /dev/null
+++ b/arch/arm/dts/r8a77951-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 <marek.vasut@gmail.com>
+ */
+
+#include "r8a77951-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/r8a77951-u-boot.dtsi b/arch/arm/dts/r8a77951-u-boot.dtsi
new file mode 100644 (file)
index 0000000..4cbec59
--- /dev/null
+++ b/arch/arm/dts/r8a77951-u-boot.dtsi
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source extras for U-Boot on RCar R8A7795 SoC
+ *
+ * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
+ */
+
+#include "r8a779x-u-boot.dtsi"
+
+&extalr_clk {
+       bootph-all;
+};
+
+/ {
+       soc {
+               rpc: spi@ee200000 {
+                       compatible = "renesas,r8a7795-rpc-if", "renesas,rcar-gen3-rpc-if";
+                       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
+                       clocks = <&cpg CPG_MOD 917>;
+                       bank-width = <2>;
+                       status = "disabled";
+               };
+       };
+};
+
+/delete-node/ &ak4613;
+/delete-node/ &audma0;
+/delete-node/ &audma1;
+/delete-node/ &can0;
+/delete-node/ &can1;
+/delete-node/ &canfd;
+/delete-node/ &csi20;
+/delete-node/ &csi40;
+/delete-node/ &csi41;
+/delete-node/ &drif00;
+/delete-node/ &drif01;
+/delete-node/ &drif10;
+/delete-node/ &drif11;
+/delete-node/ &drif20;
+/delete-node/ &drif21;
+/delete-node/ &drif30;
+/delete-node/ &drif31;
+/delete-node/ &du;
+/delete-node/ &fcpf0;
+/delete-node/ &fcpf1;
+/delete-node/ &fcpvb0;
+/delete-node/ &fcpvb1;
+/delete-node/ &fcpvd0;
+/delete-node/ &fcpvd1;
+/delete-node/ &fcpvd2;
+/delete-node/ &fcpvi0;
+/delete-node/ &fcpvi1;
+/delete-node/ &hdmi0;
+/delete-node/ &hdmi1;
+/delete-node/ &lvds0;
+/delete-node/ &rcar_sound;
+/delete-node/ &sound_card;
+/delete-node/ &vin0;
+/delete-node/ &vin1;
+/delete-node/ &vin2;
+/delete-node/ &vin3;
+/delete-node/ &vin4;
+/delete-node/ &vin5;
+/delete-node/ &vin6;
+/delete-node/ &vin7;
+/delete-node/ &vspbc;
+/delete-node/ &vspbd;
+/delete-node/ &vspd0;
+/delete-node/ &vspd1;
+/delete-node/ &vspd2;
+/delete-node/ &vspi0;
+/delete-node/ &vspi1;
+
+/ {
+       /delete-node/ cvbs-in;
+       /delete-node/ hdmi-in;
+       /delete-node/ hdmi0-out;
+       /delete-node/ hdmi1-out;
+       /delete-node/ vga-encoder;
+       /delete-node/ vga;
+};
+
+&i2c4 {
+       /delete-node/ video-receiver@70;
+};
+
+&soc {
+       /delete-node/ fdp1@fe940000;
+       /delete-node/ fdp1@fe944000;
+       /delete-node/ fdp1@fe948000;
+       /delete-node/ imr-lx4@fe860000;
+       /delete-node/ imr-lx4@fe870000;
+       /delete-node/ imr-lx4@fe880000;
+       /delete-node/ imr-lx4@fe890000;
+};

diff --git a/arch/arm/dts/r8a77951-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77951-ulcb-u-boot.dtsi
new file mode 100644 (file)
index 0000000..305c486
--- /dev/null
+++ b/arch/arm/dts/r8a77951-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 <marek.vasut@gmail.com>
+ */
+
+#include "r8a77951-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/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index afb3b63582b5bef650b57231a0b8b9fcc7dc550f..2c8860bcee47b295cae7dd8e7e57b1f3b90384e9 100644 (file)
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -79,7 +79,7 @@ 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"))
+           !strcmp(name, "r8a77951-salvator-x"))
                return 0;
 
        if ((cpu_type == RENESAS_CPU_TYPE_R8A7796) &&

diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index cda6976602d279acb28001e29838d739203bc3b2..64f01b123cb20b9c23d570dbb6221b2d7ad968d7 100644 (file)
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -70,7 +70,7 @@ 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"))
+           !strcmp(name, "r8a77951-ulcb"))
                return 0;
 
        if ((cpu_type == RENESAS_CPU_TYPE_R8A7796) &&

diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig
index c76cbec76d46593df71a79bf72672bab79e1f501..22d649296e1112af03b73ddc373d47740f547e9a 100644 (file)
--- 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"
+CONFIG_DEFAULT_DEVICE_TREE="r8a77951-salvator-x"
 CONFIG_SPL_TEXT_BASE=0xe6338000
 CONFIG_RCAR_GEN3=y
 CONFIG_TARGET_SALVATOR_X=y
@@ -21,8 +21,8 @@ CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_USE_BOOTARGS=y
 CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77950-salvator-x.dtb; booti 0x48080000 - 0x48000000"
-CONFIG_DEFAULT_FDT_FILE="r8a77950-salvator-x.dtb"
+CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77951-salvator-x.dtb; booti 0x48080000 - 0x48000000"
+CONFIG_DEFAULT_FDT_FILE="r8a77951-salvator-x.dtb"
 CONFIG_SYS_PBSIZE=2068
 CONFIG_SYS_MALLOC_BOOTPARAMS=y
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=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 r8a77960-salvator-x r8a77965-salvator-x"
+CONFIG_OF_LIST="r8a77951-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 701dfcb7a0ee1dd0e1db755e53b0977ba285d050..8349f070ba4eaa98731d2f211e40ab071b97581f 100644 (file)
--- 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"
+CONFIG_DEFAULT_DEVICE_TREE="r8a77951-ulcb"
 CONFIG_SPL_TEXT_BASE=0xe6338000
 CONFIG_RCAR_GEN3=y
 CONFIG_TARGET_ULCB=y
@@ -20,8 +20,8 @@ CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_USE_BOOTARGS=y
 CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77950-ulcb.dtb; booti 0x48080000 - 0x48000000"
-CONFIG_DEFAULT_FDT_FILE="r8a77950-ulcb.dtb"
+CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77951-ulcb.dtb; booti 0x48080000 - 0x48000000"
+CONFIG_DEFAULT_FDT_FILE="r8a77951-ulcb.dtb"
 CONFIG_SYS_PBSIZE=2068
 CONFIG_SYS_MALLOC_BOOTPARAMS=y
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=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 r8a77960-ulcb r8a77965-ulcb"
+CONFIG_OF_LIST="r8a77951-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