From 99f3c91ea829046b35d8539b315735b093e13c39 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 15 Mar 2021 16:36:13 +0100 Subject: linux: bsp-41x: non-target: Move R-Car M3-W+ Salvator-X(S) and ULCB Upstream uses r8a77960 and r8a77961 to differentiate. Signed-off-by: Geert Uytterhoeven --- projects/linux/bsp-41x-non-target.yaml | 3 +++ projects/linux/bsp-41x-upport-request.yaml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/linux/bsp-41x-non-target.yaml b/projects/linux/bsp-41x-non-target.yaml index 360c62d..aa7ab90 100644 --- a/projects/linux/bsp-41x-non-target.yaml +++ b/projects/linux/bsp-41x-non-target.yaml @@ -410,3 +410,6 @@ bsp41x: - da926cc61b9af2324dcedcaa6b29ce606b12afd0 # arm64: dts: salvator-common: Enable IPMMU of SDHI2 (torvalds: 8292f5eb3874844d41d87d1c8e415592d27e8e20 # arm64: dts: renesas: Add iommus to R-Car Gen3 SDHI/MMC nodes) - 06bd7c990d4848fe92a42c1212d10d3dad7c788c # arm64: dts: r8a77990-ebisu{,-es10}: Add no-sdio and no-sd properties to SDHI3 (torvalds: d68c9edfda21247a63521072806479e842761a42 # arm64: dts: renesas: Disable SD functions for plain eMMC) - bfcd64deddea8c49a33c8211a24fed5f308a85da # arm64: dts: salvator-common: Add no-sdio and no-sd properties to SDHI2 (torvalds: d68c9edfda21247a63521072806479e842761a42 # arm64: dts: renesas: Disable SD functions for plain eMMC) + - 624e06cd82c606b6d54f2386c89a96739958311d # arm64: dts: r8a7796-m3ulcb: Add R-Car M3 ES3.0 (2 x 4 GiB) support (torvalds: 42afeb28d28061108364d987a8898d67cecb6b25 # arm64: dts: renesas: Add support for M3ULCB with R-Car M3-W+) + - 95b51f939ff05a960b5e39fa5bb720a395181a7a # arm64: dts: r8a7796-m3ulcb: Select the device tree of R-Car M3 ES1.x. (Proposing 'N' Upstream uses r8a77960 and r8a77961 to differentiata) + - 3c47b4692832b7db4276cce5f62ed8cf952ebeba # arm64: dts: r8a7796: Add support for R-Car M3 ES3.0 (torvalds: f51746ad7d1ff6b4f763716c9cf4a40a2ad1d90c # arm64: dts: renesas: Add Renesas R8A77961 SoC support and torvalds: 92980759c1699a3c10beb00f411270197ac89544 # arm64: dts: renesas: Add support for Salvator-XS with R-Car M3-W+) diff --git a/projects/linux/bsp-41x-upport-request.yaml b/projects/linux/bsp-41x-upport-request.yaml index 54d8fa8..711c4af 100644 --- a/projects/linux/bsp-41x-upport-request.yaml +++ b/projects/linux/bsp-41x-upport-request.yaml @@ -186,7 +186,6 @@ bsp41x: - 446d62ee0240fddf445ed0603f8d3eb755cab5de # arm64: dts: renesas: falcon: Enable PCIe - 6235ae0b3cf3c6848c33ae8466e830b2119d4e5a # arm64: dts: renesas: r8a779a0: Add PCIe device node - e4962e0a61d0b5a7a578dc1ce1c578bafd21df07 # arm64: dts: renesas: r8a779a0: Add SYS-DMAC and RT-DMAC support - - 624e06cd82c606b6d54f2386c89a96739958311d # arm64: dts: r8a7796-m3ulcb: Add R-Car M3 ES3.0 (2 x 4 GiB) support - c9a6d3671ee32017daf47cb0898ce172f36caa76 # arm64: dts: r8a77990: Create thermal zone to support IPA - 15bae2a7c49a8e68dcd06d706cc756d8449703da # arm64: dts: r8a77965: Create thermal zone to support IPA - 642eafde46f6e8852de04644432ea30a40dfcc20 # arm64: dts: r8a7796: Create thermal zone to support IPA @@ -234,8 +233,6 @@ bsp41x: - 98bd560f9959aa833a8118b31cee113df84a63ff # arm64: dts: r8a77965: Enable IPMMU-DS1 and IPMMU-MM - d6bcfc3e79bb8ff10f3de0dae5e1f95e7e1d5326 # arm64: dts: r8a7796: Enable IPMMU-DS1 and IPMMU-MM - feb194f8420a190d27467badf3f9f58864872b29 # arm64: dts: r8a7795: Enable IPMMU-DS1 and IPMMU-MM - - 95b51f939ff05a960b5e39fa5bb720a395181a7a # arm64: dts: r8a7796-m3ulcb: Select the device tree of R-Car M3 ES1.x. - - 3c47b4692832b7db4276cce5f62ed8cf952ebeba # arm64: dts: r8a7796: Add support for R-Car M3 ES3.0 - e6c2c5a9d009658687f5028995ebf0a541ba891c # arm64: dts: renesas: r8a77990: Change default of all IPMMU devices to disable - 53eccb4433b01476365ddba4c77128bf14e1f50f # arm64: dts: renesas: r8a77965: Change default of all IPMMU devices to disable - 532fbdfa578bf5a4fccf1077a1da63e2b707ea8b # arm64: dts: r8a77990: Detach IPMMU-VI0/1 from FCPVD -- cgit v1.2.3