bcm27xx: sync 5.4 patches with RPi Foundation
[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0379-ARM-dts-bcm283x-Move-intc-label-to-bcm2835-common.dt.patch
1 From b124d4fdc62b91441173854872c26bea6e36d2e5 Mon Sep 17 00:00:00 2001
2 From: Stefan Wahren <wahrenst@gmx.net>
3 Date: Wed, 25 Dec 2019 18:01:57 +0100
4 Subject: [PATCH] ARM: dts: bcm283x: Move intc label to
5 bcm2835-common.dtsi
6
7 The intc label isn't defined in bcm283x.dtsi, so we cannot use it there.
8 So move it to bcm2835-common.dtsi.
9
10 Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
11 ---
12 arch/arm/boot/dts/bcm2835-common.dtsi | 2 ++
13 arch/arm/boot/dts/bcm283x.dtsi | 1 -
14 2 files changed, 2 insertions(+), 1 deletion(-)
15
16 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
17 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
18 @@ -5,6 +5,8 @@
19 */
20
21 / {
22 + interrupt-parent = <&intc>;
23 +
24 soc {
25 intc: interrupt-controller@7e00b200 {
26 compatible = "brcm,bcm2835-armctrl-ic";
27 --- a/arch/arm/boot/dts/bcm283x.dtsi
28 +++ b/arch/arm/boot/dts/bcm283x.dtsi
29 @@ -18,7 +18,6 @@
30 / {
31 compatible = "brcm,bcm2835";
32 model = "BCM2835";
33 - interrupt-parent = <&intc>;
34 #address-cells = <1>;
35 #size-cells = <1>;
36