diff options
| author |   Khang Nguyen <khang.nguyen.xv@rvc.renesas.com> | 2018-02-22 13:33:57 +0700 |
|---|---|---|
| committer | Khang Nguyen <khang.nguyen.xv@rvc.renesas.com> | 2018-03-22 13:36:54 +0700 |
| commit | 0d9a1348ae1164e45c3f8ee95b8a529314eb0cf9 (patch) | |
| tree | a8ca0aadb606d59e85ca6c550fc305939538ebfc /meta-rcar-gen3/recipes-kernel/linux | |
| parent | 57db885b4554b538a7d1d2f8a24b6eeb46f971bf (diff) | |
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 <khang.nguyen.xv@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Diffstat (limited to 'meta-rcar-gen3/recipes-kernel/linux')
| -rw-r--r-- | meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0001-arm64-dts-r8a7796-m3ulcb-Disable-CPUIdle-support-for.patch | 58 | ||||
| -rw-r--r-- | meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb | 5 |
2 files changed, 0 insertions, 63 deletions
diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0001-arm64-dts-r8a7796-m3ulcb-Disable-CPUIdle-support-for.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0001-arm64-dts-r8a7796-m3ulcb-Disable-CPUIdle-support-for.patch deleted file mode 100644 index 9c8b675..0000000 --- a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/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 <takeshi.kihara.df@renesas.com> -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 <takeshi.kihara.df@renesas.com> ---- - 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/linux-renesas_4.14.bb b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb index a113042..31695e0 100644 --- a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb @@ -27,11 +27,6 @@ SRC_URI_append = " \ ${@bb.utils.contains('MACHINE_FEATURES','cas','file://capacity_aware_migration_strategy.cfg','',d)} \ " -# Disable CPUIdle support for CA53 in M3ULCB ES1.0 -SRC_URI_append = " \ - file://0001-arm64-dts-r8a7796-m3ulcb-Disable-CPUIdle-support-for.patch \ -" - # Install USB3.0 firmware to rootfs USB3_FIRMWARE_V2 = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/r8a779x_usb3_v2.dlmem;md5sum=645db7e9056029efa15f158e51cc8a11" USB3_FIRMWARE_V3 = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/r8a779x_usb3_v3.dlmem;md5sum=687d5d42f38f9850f8d5a6071dca3109" |