From 18e83672ede73b4ccc9c92b81d43b78180538887 Mon Sep 17 00:00:00 2001 From: Hanjie Lin Date: Tue, 19 Feb 2019 13:42:16 +0800 Subject: [PATCH] perf: fix sys_cpu_status0 reg error dts [1/1] PD#SWPL-4843 Problem: CtsSimpleperfTestCases 1 Fail on p231 Solution: gxl,gxm,txl perf sys_cpu_status0 reg config error modify it Verify: p212 Change-Id: Ie6e8747e8e4f02734bd7883ce6dcbc3fd3d28829 Signed-off-by: Hanjie Lin Signed-off-by: Luan Yuan Conflicts: arch/arm/boot/dts/amlogic/mesontxl.dtsi arch/arm64/boot/dts/amlogic/mesontxl.dtsi --- arch/arm/boot/dts/amlogic/mesongxl.dtsi | 2 +- arch/arm/boot/dts/amlogic/mesongxl_sei210.dtsi | 2 +- arch/arm/boot/dts/amlogic/mesongxm.dtsi | 2 +- arch/arm64/boot/dts/amlogic/mesongxl.dtsi | 2 +- arch/arm64/boot/dts/amlogic/mesongxl_sei210.dtsi | 2 +- arch/arm64/boot/dts/amlogic/mesongxm.dtsi | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/mesongxl.dtsi b/arch/arm/boot/dts/amlogic/mesongxl.dtsi index a3c2f4e..b3c787f 100644 --- a/arch/arm/boot/dts/amlogic/mesongxl.dtsi +++ b/arch/arm/boot/dts/amlogic/mesongxl.dtsi @@ -136,7 +136,7 @@ compatible = "arm,cortex-a15-pmu"; /* clusterb-enabled; */ interrupts = ; - reg = <0xc8834400 0x4>; + reg = <0xc8834680 0x4>; cpumasks = <0xf>; /* default 10ms */ relax-timer-ns = <10000000>; diff --git a/arch/arm/boot/dts/amlogic/mesongxl_sei210.dtsi b/arch/arm/boot/dts/amlogic/mesongxl_sei210.dtsi index 53d7823..dfe090d 100644 --- a/arch/arm/boot/dts/amlogic/mesongxl_sei210.dtsi +++ b/arch/arm/boot/dts/amlogic/mesongxl_sei210.dtsi @@ -138,7 +138,7 @@ compatible = "arm,cortex-a15-pmu"; /* clusterb-enabled; */ interrupts = ; - reg = <0xc8834400 0x4>; + reg = <0xc8834680 0x4>; cpumasks = <0xf>; /* default 10ms */ relax-timer-ns = <10000000>; diff --git a/arch/arm/boot/dts/amlogic/mesongxm.dtsi b/arch/arm/boot/dts/amlogic/mesongxm.dtsi index d4e5245..37d28d3 100644 --- a/arch/arm/boot/dts/amlogic/mesongxm.dtsi +++ b/arch/arm/boot/dts/amlogic/mesongxm.dtsi @@ -245,7 +245,7 @@ compatible = "arm,cortex-a15-pmu"; /* clusterb-enabled; */ interrupts = ; - reg = <0xc8834400 0x4>; + reg = <0xc8834680 0x4>; cpumasks = <0xf>; /* default 10ms */ relax-timer-ns = <10000000>; diff --git a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi index 5f5f4e9..a997334 100644 --- a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi @@ -124,7 +124,7 @@ compatible = "arm,armv8-pmuv3"; /* clusterb-enabled; */ interrupts = ; - reg = <0x0 0xc8834400 0x0 0x4>; + reg = <0x0 0xc8834680 0x0 0x4>; cpumasks = <0xf>; /* default 10ms */ relax-timer-ns = <10000000>; diff --git a/arch/arm64/boot/dts/amlogic/mesongxl_sei210.dtsi b/arch/arm64/boot/dts/amlogic/mesongxl_sei210.dtsi index ef80ea7..efaa61b 100644 --- a/arch/arm64/boot/dts/amlogic/mesongxl_sei210.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesongxl_sei210.dtsi @@ -138,7 +138,7 @@ compatible = "arm,armv8-pmuv3"; /* clusterb-enabled; */ interrupts = ; - reg = <0x0 0xc8834400 0x0 0x4>; + reg = <0x0 0xc8834680 0x0 0x4>; cpumasks = <0xf>; /* default 10ms */ relax-timer-ns = <10000000>; diff --git a/arch/arm64/boot/dts/amlogic/mesongxm.dtsi b/arch/arm64/boot/dts/amlogic/mesongxm.dtsi index ef1e45c..92bd78b 100644 --- a/arch/arm64/boot/dts/amlogic/mesongxm.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesongxm.dtsi @@ -245,7 +245,7 @@ compatible = "arm,armv8-pmuv3"; /* clusterb-enabled; */ interrupts = ; - reg = <0x0 0xc8834400 0x0 0x4>; + reg = <0x0 0xc8834680 0x0 0x4>; cpumasks = <0xf>; /* default 10ms */ relax-timer-ns = <10000000>; -- 2.7.4