From 4d1bd5bf43bfe28a225dbc97b14593716e5ab32a Mon Sep 17 00:00:00 2001 From: Vasyl Vavrychuk Date: Thu, 29 Jul 2021 23:49:57 +0200 Subject: linux: Update patches for Renesas BSP v5.1.0. Adapt to rename done in repo: https://github.com/renesas-rcar/linux-bsp.git branch: v5.10/rcar-5.0.0.rc5 commit: 052e99d arm64: dts: renesas: Rename r8a7795{-es1,}* to r8a7795[01]* Bug-AGL: SPEC-3997 Change-Id: I4422c1d3998a4e623a6655e2e6ebc7a22f9de1c9 Signed-off-by: Vasyl Vavrychuk --- README | 6 +- meta-agl-refhw-gen3/conf/machine/agl-refhw-h3.conf | 2 +- .../linux/files/0001-add-agl-refhw.patch | 12 +- ...0001-create-r8a7795-usb-ovc-pinmux-groups.patch | 132 ++++++++++----------- 4 files changed, 76 insertions(+), 76 deletions(-) diff --git a/README b/README index 0f4d00d..e37220f 100644 --- a/README +++ b/README @@ -56,13 +56,13 @@ This works as the AGL reference hardware support activated by the "agl-refhw-h3" feature integrates on top of the "h3ulcb" (or "h3ulcb-nogfx") machine support in the AGL UCB tree. Note that it has not been tested with the "h3ulcb-kf" machine. In the resulting build, the image can be used on the reference hardware by using -the DTB file "r8a7795-agl-refhw.dtb". In the reference hardware u-boot settings, +the DTB file "r8a77951-agl-refhw.dtb". In the reference hardware u-boot settings, this can be done with the following (in case of booting from the Micro SD card in SD#0): => setenv bootargs 'console=ttySC0,115200 root=/dev/mmcblk1p1 rootwait ro rootfstype=ext4' => setenv bootcmd 'run load_ker; run load_dtb; booti 0x48080000 - 0x48000000' - => setenv load_dtb 'ext4load mmc 0:1 0x48000000 /boot/r8a7795-agl-refhw.dtb' + => setenv load_dtb 'ext4load mmc 0:1 0x48000000 /boot/r8a77951-agl-refhw.dtb' => setenv load_ker 'ext4load mmc 0:1 0x48080000 /boot/Image' => saveenv @@ -70,7 +70,7 @@ in SD#0): ... bootargs=console=ttySC0,115200 root=/dev/mmcblk1p1 rootwait ro rootfstype=ext4 bootcmd=run load_ker; run load_dtb; booti 0x48080000 - 0x48000000 - load_dtb=ext4load mmc 0:1 0x48000000 /boot/r8a7795-agl-refhw.dtb + load_dtb=ext4load mmc 0:1 0x48000000 /boot/r8a77951-agl-refhw.dtb load_ker=ext4load mmc 0:1 0x48080000 /boot/Image .. diff --git a/meta-agl-refhw-gen3/conf/machine/agl-refhw-h3.conf b/meta-agl-refhw-gen3/conf/machine/agl-refhw-h3.conf index f302d45..97c4854 100644 --- a/meta-agl-refhw-gen3/conf/machine/agl-refhw-h3.conf +++ b/meta-agl-refhw-gen3/conf/machine/agl-refhw-h3.conf @@ -13,4 +13,4 @@ MACHINEOVERRIDES_append = ":salvator-x" # Reference hardware has USB3 MACHINE_FEATURES_append = " usb3" -KERNEL_DEVICETREE_append = " renesas/r8a7795-agl-refhw.dtb" +KERNEL_DEVICETREE_append = " renesas/r8a77951-agl-refhw.dtb" diff --git a/meta-agl-refhw-gen3/recipes-kernel/linux/files/0001-add-agl-refhw.patch b/meta-agl-refhw-gen3/recipes-kernel/linux/files/0001-add-agl-refhw.patch index a47b6fb..4a4a7d6 100644 --- a/meta-agl-refhw-gen3/recipes-kernel/linux/files/0001-add-agl-refhw.patch +++ b/meta-agl-refhw-gen3/recipes-kernel/linux/files/0001-add-agl-refhw.patch @@ -7,7 +7,7 @@ Signed-off-by: Raquel Medina --- arch/arm64/boot/dts/renesas/agl-refhw-common.dtsi | 918 ++++++++++++++++++++++ - arch/arm64/boot/dts/renesas/r8a7795-agl-refhw.dts | 392 +++++++++ + arch/arm64/boot/dts/renesas/r8a77951-agl-refhw.dts | 392 +++++++++ drivers/media/i2c/adv748x/adv748x-core.c | 24 +- 3 files changed, 1333 insertions(+), 1 deletion(-) @@ -935,11 +935,11 @@ index 000000000000..796ac4c078e0 + + status = "okay"; +}; -diff --git a/arch/arm64/boot/dts/renesas/r8a7795-agl-refhw.dts b/arch/arm64/boot/dts/renesas/r8a7795-agl-refhw.dts +diff --git a/arch/arm64/boot/dts/renesas/r8a77951-agl-refhw.dts b/arch/arm64/boot/dts/renesas/r8a77951-agl-refhw.dts new file mode 100644 index 000000000000..83638a6228c0 --- /dev/null -+++ b/arch/arm64/boot/dts/renesas/r8a7795-agl-refhw.dts ++++ b/arch/arm64/boot/dts/renesas/r8a77951-agl-refhw.dts @@ -0,0 +1,392 @@ +/* + * Device Tree Source for the AGL reference hardware board with R-Car H3 ES3.0 @@ -963,11 +963,11 @@ index 000000000000..83638a6228c0 + */ + +/dts-v1/; -+#include "r8a7795.dtsi" ++#include "r8a77951.dtsi" +#include "agl-refhw-common.dtsi" + +/ { -+ model = "AGL Reference Hardware based on r8a7795 ES3.0+ with 8GiB (4 x 2 GiB)"; ++ model = "AGL Reference Hardware based on r8a77951 ES3.0+ with 8GiB (4 x 2 GiB)"; + compatible = "agl,refhw-h3", "renesas,r8a7795"; + + memory@48000000 { @@ -1197,7 +1197,7 @@ index 000000000000..83638a6228c0 + * - On Salvator-X[S], GP6_3[01] are connected to ADV7482 as irq pins + * (when SW31 is the default setting on Salvator-XS). + * - If SW31 is the default setting, you cannot use USB2.0 ch3 on -+ * r8a7795 with Salvator-XS. ++ * r8a77951 with Salvator-XS. + * Hence the SW31 setting must be changed like 2) below. + * 1) Default setting of SW31: ON-ON-OFF-OFF-OFF-OFF: + * - Connect GP6_3[01] to ADV7842. diff --git a/meta-agl-refhw-gen3/recipes-kernel/linux/files/0001-create-r8a7795-usb-ovc-pinmux-groups.patch b/meta-agl-refhw-gen3/recipes-kernel/linux/files/0001-create-r8a7795-usb-ovc-pinmux-groups.patch index 8e0c4ac..e978009 100644 --- a/meta-agl-refhw-gen3/recipes-kernel/linux/files/0001-create-r8a7795-usb-ovc-pinmux-groups.patch +++ b/meta-agl-refhw-gen3/recipes-kernel/linux/files/0001-create-r8a7795-usb-ovc-pinmux-groups.patch @@ -4,27 +4,27 @@ Split the r8a7795 USB pin groups to create separate groups for the OVC pins. This is required for the AGL reference hardware boards, which use some of the OVC pins in other pinmux modes. -Upstream-Status: pending - +Upstream-Status: pending + Signed-off-by: Scott Murray Signed-off-by: Raquel Medina