diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0365-ARM-dts-bcm283x-Move-system-timer-back-to-bcm283x.dt.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0365-ARM-dts-bcm283x-Move-system-timer-back-to-bcm283x.dt.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0365-ARM-dts-bcm283x-Move-system-timer-back-to-bcm283x.dt.patch b/target/linux/bcm27xx/patches-5.4/950-0365-ARM-dts-bcm283x-Move-system-timer-back-to-bcm283x.dt.patch new file mode 100644 index 0000000000..3ececc8f92 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0365-ARM-dts-bcm283x-Move-system-timer-back-to-bcm283x.dt.patch @@ -0,0 +1,73 @@ +From fcd4bc412167d2a79bf63603e883f4960ca6b2a1 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren <wahrenst@gmx.net> +Date: Fri, 27 Dec 2019 11:15:00 +0100 +Subject: [PATCH] ARM: dts: bcm283x: Move system timer back to + bcm283x.dtsi + +During Raspberry Pi 4 upstream discussion Tim Gover confirmed that the +system timer also exists on BCM2711. So move it back to bcm283x.dtsi and +overwrite the interrupt definition in bcm2838.dtsi. + +Signed-off-by: Stefan Wahren <wahrenst@gmx.net> +--- + arch/arm/boot/dts/bcm2835-common.dtsi | 11 ----------- + arch/arm/boot/dts/bcm2838.dtsi | 7 +++++++ + arch/arm/boot/dts/bcm283x.dtsi | 11 +++++++++++ + 3 files changed, 18 insertions(+), 11 deletions(-) + +--- a/arch/arm/boot/dts/bcm2835-common.dtsi ++++ b/arch/arm/boot/dts/bcm2835-common.dtsi +@@ -6,17 +6,6 @@ + + / { + soc { +- timer@7e003000 { +- compatible = "brcm,bcm2835-system-timer"; +- reg = <0x7e003000 0x1000>; +- interrupts = <1 0>, <1 1>, <1 2>, <1 3>; +- /* This could be a reference to BCM2835_CLOCK_TIMER, +- * but we don't have the driver using the common clock +- * support yet. +- */ +- clock-frequency = <1000000>; +- }; +- + intc: interrupt-controller@7e00b200 { + compatible = "brcm,bcm2835-armctrl-ic"; + reg = <0x7e00b200 0x200>; +--- a/arch/arm/boot/dts/bcm2838.dtsi ++++ b/arch/arm/boot/dts/bcm2838.dtsi +@@ -711,6 +711,13 @@ + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + }; + ++&system_timer { ++ interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>, ++ <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, ++ <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>, ++ <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; ++}; ++ + &uart0 { + interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; + }; +--- a/arch/arm/boot/dts/bcm283x.dtsi ++++ b/arch/arm/boot/dts/bcm283x.dtsi +@@ -56,6 +56,17 @@ + #address-cells = <1>; + #size-cells = <1>; + ++ system_timer: timer@7e003000 { ++ compatible = "brcm,bcm2835-system-timer"; ++ reg = <0x7e003000 0x1000>; ++ interrupts = <1 0>, <1 1>, <1 2>, <1 3>; ++ /* This could be a reference to BCM2835_CLOCK_TIMER, ++ * but we don't have the driver using the common clock ++ * support yet. ++ */ ++ clock-frequency = <1000000>; ++ }; ++ + txp: txp@7e004000 { + compatible = "brcm,bcm2835-txp"; + reg = <0x7e004000 0x20>; |