From: Sasha Levin Date: Fri, 21 Feb 2020 17:25:17 +0000 (-0500) Subject: Drop arm-dts-allwinner-h3-add-pmu-node.patch from 4.14 and 4.9 X-Git-Tag: v4.19.106~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7fb76fd2b1ede5f0bb7967f0dd39482fb0fd3838;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm-dts-allwinner-h3-add-pmu-node.patch from 4.14 and 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/arm-dts-allwinner-h3-add-pmu-node.patch b/queue-4.14/arm-dts-allwinner-h3-add-pmu-node.patch deleted file mode 100644 index 2cd259e8084..00000000000 --- a/queue-4.14/arm-dts-allwinner-h3-add-pmu-node.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1799153a946972238e995b83d9364059534dcc6c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 21 Nov 2019 01:18:35 +0000 -Subject: arm: dts: allwinner: H3: Add PMU node - -From: Andre Przywara - -[ Upstream commit 0388a110747bec0c9d9de995842bb2a03a26aae1 ] - -Add the Performance Monitoring Unit (PMU) device tree node to the H3 -.dtsi, which tells DT users which interrupts are triggered by PMU -overflow events on each core. The numbers come from the manual and have -been checked in U-Boot and with perf in Linux. - -Tested with perf record and taskset on an OrangePi Zero. - -Signed-off-by: Andre Przywara -Signed-off-by: Maxime Ripard -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/sun8i-h3.dtsi | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi -index b36f9f423c39d..d685beb49659c 100644 ---- a/arch/arm/boot/dts/sun8i-h3.dtsi -+++ b/arch/arm/boot/dts/sun8i-h3.dtsi -@@ -53,25 +53,34 @@ - reg = <0>; - }; - -- cpu@1 { -+ cpu1: cpu@1 { - compatible = "arm,cortex-a7"; - device_type = "cpu"; - reg = <1>; - }; - -- cpu@2 { -+ cpu2: cpu@2 { - compatible = "arm,cortex-a7"; - device_type = "cpu"; - reg = <2>; - }; - -- cpu@3 { -+ cpu3: cpu@3 { - compatible = "arm,cortex-a7"; - device_type = "cpu"; - reg = <3>; - }; - }; - -+ pmu { -+ compatible = "arm,cortex-a7-pmu"; -+ interrupts = , -+ , -+ , -+ ; -+ interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; -+ }; -+ - timer { - compatible = "arm,armv7-timer"; - interrupts = , --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 6d18cbf009d..05404fbbcef 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -68,7 +68,6 @@ regulator-rk808-lower-log-level-on-optional-gpios-be.patch net-wan-fsl_ucc_hdlc-reject-muram-offsets-above-64k.patch pci-iov-fix-memory-leak-in-pci_iov_add_virtfn.patch nfc-port100-convert-cpu_to_le16-le16_to_cpu-e1-e2-to.patch -arm-dts-allwinner-h3-add-pmu-node.patch arm64-dts-qcom-msm8996-disable-usb2-phy-suspend-by-c.patch padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch arm-dts-imx6-rdu2-disable-wp-for-usdhc2-and-usdhc3.patch diff --git a/queue-4.9/arm-dts-allwinner-h3-add-pmu-node.patch b/queue-4.9/arm-dts-allwinner-h3-add-pmu-node.patch deleted file mode 100644 index 5b3a1a7af8e..00000000000 --- a/queue-4.9/arm-dts-allwinner-h3-add-pmu-node.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8d0271a18b723a04a29ee748881aca28bc085f86 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 21 Nov 2019 01:18:35 +0000 -Subject: arm: dts: allwinner: H3: Add PMU node - -From: Andre Przywara - -[ Upstream commit 0388a110747bec0c9d9de995842bb2a03a26aae1 ] - -Add the Performance Monitoring Unit (PMU) device tree node to the H3 -.dtsi, which tells DT users which interrupts are triggered by PMU -overflow events on each core. The numbers come from the manual and have -been checked in U-Boot and with perf in Linux. - -Tested with perf record and taskset on an OrangePi Zero. - -Signed-off-by: Andre Przywara -Signed-off-by: Maxime Ripard -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/sun8i-h3.dtsi | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi -index f4ba088b225ed..08d65f252e172 100644 ---- a/arch/arm/boot/dts/sun8i-h3.dtsi -+++ b/arch/arm/boot/dts/sun8i-h3.dtsi -@@ -60,25 +60,34 @@ - reg = <0>; - }; - -- cpu@1 { -+ cpu1: cpu@1 { - compatible = "arm,cortex-a7"; - device_type = "cpu"; - reg = <1>; - }; - -- cpu@2 { -+ cpu2: cpu@2 { - compatible = "arm,cortex-a7"; - device_type = "cpu"; - reg = <2>; - }; - -- cpu@3 { -+ cpu3: cpu@3 { - compatible = "arm,cortex-a7"; - device_type = "cpu"; - reg = <3>; - }; - }; - -+ pmu { -+ compatible = "arm,cortex-a7-pmu"; -+ interrupts = , -+ , -+ , -+ ; -+ interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; -+ }; -+ - timer { - compatible = "arm,armv7-timer"; - interrupts = , --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 90027e8d462..700960cbc5b 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -43,7 +43,6 @@ regulator-rk808-lower-log-level-on-optional-gpios-be.patch net-wan-fsl_ucc_hdlc-reject-muram-offsets-above-64k.patch pci-iov-fix-memory-leak-in-pci_iov_add_virtfn.patch nfc-port100-convert-cpu_to_le16-le16_to_cpu-e1-e2-to.patch -arm-dts-allwinner-h3-add-pmu-node.patch padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch media-v4l2-device.h-explicitly-compare-grp-id-mask-t.patch reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch