From 0d9a1348ae1164e45c3f8ee95b8a529314eb0cf9 Mon Sep 17 00:00:00 2001 From: Khang Nguyen Date: Thu, 22 Feb 2018 13:33:57 +0700 Subject: Revert "rcar-gen3: linux-renesas: Fix M3ULCB hangs up when playing video" Linux BSP v3.6.1 has been updated. This reverts commit f8e4fb869abdfac3211b5f933202644901eeac7a. Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda --- ...8a7796-m3ulcb-Disable-CPUIdle-support-for.patch | 58 ---------------------- .../linux-libc-headers/linux-libc-headers_4.14.bb | 5 -- 2 files changed, 63 deletions(-) delete mode 100644 meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-dts-r8a7796-m3ulcb-Disable-CPUIdle-support-for.patch (limited to 'meta-rcar-gen3/recipes-kernel/linux-libc-headers') diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-dts-r8a7796-m3ulcb-Disable-CPUIdle-support-for.patch b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-dts-r8a7796-m3ulcb-Disable-CPUIdle-support-for.patch deleted file mode 100644 index 9c8b675..0000000 --- a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-dts-r8a7796-m3ulcb-Disable-CPUIdle-support-for.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 97359593cdd25e46e63b46d86d1a0ea742cf6ae8 Mon Sep 17 00:00:00 2001 -From: Takeshi Kihara -Date: Fri, 19 Jan 2018 18:24:25 +0900 -Subject: [PATCH] arm64: dts: r8a7796-m3ulcb: Disable CPUIdle support for CA53 - -The revision of M3ULCB board on the R8A7796 SoC is ES1.0. This revision -can not use CPUIdle for CA53 cores. - -Therefore, this patch disables CPUIdle support for CA53. - -Signed-off-by: Takeshi Kihara ---- - arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts -index 10d6f24e60fb..0ac6a1024d96 100644 ---- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts -+++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts -@@ -17,6 +17,12 @@ - model = "Renesas M3ULCB board based on r8a7796"; - compatible = "renesas,m3ulcb", "renesas,r8a7796"; - -+ cpus { -+ idle-states { -+ /delete-node/ cpu-sleep-1; -+ }; -+ }; -+ - memory@48000000 { - device_type = "memory"; - /* first 128MB is reserved for secure area. */ -@@ -69,6 +75,22 @@ - }; - }; - -+&a53_0 { -+ /delete-property/ cpu-idle-states; -+}; -+ -+&a53_1 { -+ /delete-property/ cpu-idle-states; -+}; -+ -+&a53_2 { -+ /delete-property/ cpu-idle-states; -+}; -+ -+&a53_3 { -+ /delete-property/ cpu-idle-states; -+}; -+ - &du { - clocks = <&cpg CPG_MOD 724>, - <&cpg CPG_MOD 723>, --- -2.15.1 - diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb index 5bd332d..5609a31 100644 --- a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb +++ b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb @@ -7,9 +7,4 @@ SRCREV = "cdbdfa1452a86607db4d43914f4953ac811d2c56" SRC_URI = "${RENESAS_BSP_URL};branch=${BRANCH}" -# Disable CPUIdle support for CA53 in M3ULCB ES1.0 -SRC_URI_append = " \ - file://0001-arm64-dts-r8a7796-m3ulcb-Disable-CPUIdle-support-for.patch \ -" - S = "${WORKDIR}/git" -- cgit 1.2.3-korg