diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-03-16 20:41:03 +0100 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-03-16 21:24:23 +0100 |
| commit | 0f6d04457a64f2393b05f662dc8d381ea1963c66 (patch) | |
| tree | 2d6a3c82d5e6d02b030b16df66da8bf9209b02ec /target/linux/bcm27xx/patches-5.4/950-0379-ARM-dts-bcm283x-Move-intc-label-to-bcm2835-common.dt.patch | |
| parent | d890f85e59617228b1e76e8cf45a9309904d9124 (diff) | |
| download | upstream-0f6d04457a64f2393b05f662dc8d381ea1963c66.tar.gz upstream-0f6d04457a64f2393b05f662dc8d381ea1963c66.tar.bz2 upstream-0f6d04457a64f2393b05f662dc8d381ea1963c66.zip | |
bcm27xx: sync 5.4 patches with RPi Foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0379-ARM-dts-bcm283x-Move-intc-label-to-bcm2835-common.dt.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0379-ARM-dts-bcm283x-Move-intc-label-to-bcm2835-common.dt.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0379-ARM-dts-bcm283x-Move-intc-label-to-bcm2835-common.dt.patch b/target/linux/bcm27xx/patches-5.4/950-0379-ARM-dts-bcm283x-Move-intc-label-to-bcm2835-common.dt.patch new file mode 100644 index 0000000000..ef26293498 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0379-ARM-dts-bcm283x-Move-intc-label-to-bcm2835-common.dt.patch @@ -0,0 +1,36 @@ +From b124d4fdc62b91441173854872c26bea6e36d2e5 Mon Sep 17 00:00:00 2001 +From: Stefan Wahren <wahrenst@gmx.net> +Date: Wed, 25 Dec 2019 18:01:57 +0100 +Subject: [PATCH] ARM: dts: bcm283x: Move intc label to + bcm2835-common.dtsi + +The intc label isn't defined in bcm283x.dtsi, so we cannot use it there. +So move it to bcm2835-common.dtsi. + +Signed-off-by: Stefan Wahren <wahrenst@gmx.net> +--- + arch/arm/boot/dts/bcm2835-common.dtsi | 2 ++ + arch/arm/boot/dts/bcm283x.dtsi | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/bcm2835-common.dtsi ++++ b/arch/arm/boot/dts/bcm2835-common.dtsi +@@ -5,6 +5,8 @@ + */ + + / { ++ interrupt-parent = <&intc>; ++ + soc { + intc: interrupt-controller@7e00b200 { + compatible = "brcm,bcm2835-armctrl-ic"; +--- a/arch/arm/boot/dts/bcm283x.dtsi ++++ b/arch/arm/boot/dts/bcm283x.dtsi +@@ -18,7 +18,6 @@ + / { + compatible = "brcm,bcm2835"; + model = "BCM2835"; +- interrupt-parent = <&intc>; + #address-cells = <1>; + #size-cells = <1>; + |