From b65ed99f23dd63bea15ebe7a60785f4ac431a3dc Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Thu, 28 Sep 2017 16:33:11 -0400 Subject: [PATCH] fix clock issue with FSL_ERRATUM_A008585 --- config/kernel/linux-sunxi64-dev.config | 2 +- config/kernel/linux-sunxi64-next.config | 2 +- .../kernel/sunxi-next/enable-fsl-timer-errata.patch | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 patch/kernel/sunxi-next/enable-fsl-timer-errata.patch diff --git a/config/kernel/linux-sunxi64-dev.config b/config/kernel/linux-sunxi64-dev.config index 41deec8da..62e615704 100644 --- a/config/kernel/linux-sunxi64-dev.config +++ b/config/kernel/linux-sunxi64-dev.config @@ -4265,7 +4265,7 @@ CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y -# CONFIG_FSL_ERRATUM_A008585 is not set +CONFIG_FSL_ERRATUM_A008585=y # CONFIG_HISILICON_ERRATUM_161010101 is not set # CONFIG_ARM64_ERRATUM_858921 is not set # CONFIG_ARM_TIMER_SP804 is not set diff --git a/config/kernel/linux-sunxi64-next.config b/config/kernel/linux-sunxi64-next.config index ba8bf26bc..4936e9a71 100644 --- a/config/kernel/linux-sunxi64-next.config +++ b/config/kernel/linux-sunxi64-next.config @@ -4249,7 +4249,7 @@ CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y -# CONFIG_FSL_ERRATUM_A008585 is not set +CONFIG_FSL_ERRATUM_A008585=y # CONFIG_HISILICON_ERRATUM_161010101 is not set # CONFIG_ARM64_ERRATUM_858921 is not set # CONFIG_ARM_TIMER_SP804 is not set diff --git a/patch/kernel/sunxi-next/enable-fsl-timer-errata.patch b/patch/kernel/sunxi-next/enable-fsl-timer-errata.patch new file mode 100644 index 000000000..e6f3aa034 --- /dev/null +++ b/patch/kernel/sunxi-next/enable-fsl-timer-errata.patch @@ -0,0 +1,12 @@ +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +index 02c0385f..db616e73 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +@@ -105,6 +110,7 @@ + + timer { + compatible = "arm,armv8-timer"; ++ fsl,erratum-a008585; + interrupts = , +