diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 18:04:33 +0100 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 23:42:32 +0100 |
| commit | f07e572f6447465d8938679533d604e402b0f066 (patch) | |
| tree | cb333bd2a67e59e7c07659514850a0fd55fc825e /target/linux/bcm27xx/patches-5.4/950-0662-dts-bcm2711-set-size-cells-2.patch | |
| parent | 5d3a6fd970619dfc55f8259035c3027d7613a2a6 (diff) | |
| download | upstream-f07e572f6447465d8938679533d604e402b0f066.tar.gz upstream-f07e572f6447465d8938679533d604e402b0f066.tar.bz2 upstream-f07e572f6447465d8938679533d604e402b0f066.zip | |
bcm27xx: import latest patches from the RPi foundation
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0662-dts-bcm2711-set-size-cells-2.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0662-dts-bcm2711-set-size-cells-2.patch | 117 |
1 files changed, 117 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0662-dts-bcm2711-set-size-cells-2.patch b/target/linux/bcm27xx/patches-5.4/950-0662-dts-bcm2711-set-size-cells-2.patch new file mode 100644 index 0000000000..fa5a2d4f54 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0662-dts-bcm2711-set-size-cells-2.patch @@ -0,0 +1,117 @@ +From 6fe41cac345c8010943defa4ebc2496dd7ca05a1 Mon Sep 17 00:00:00 2001 +From: Hristo Venev <hristo@venev.name> +Date: Wed, 22 Apr 2020 13:40:47 +0300 +Subject: [PATCH] dts: bcm2711: set #size-cells = <2> + +There already is one 4 GiB range, and one more will appear when high +peripheral mode is enabled. + +Signed-off-by: Hristo Venev <hristo@venev.name> +--- + arch/arm/boot/dts/bcm2711-rpi.dtsi | 27 +++++++++++++-------------- + arch/arm/boot/dts/bcm2711.dtsi | 10 +++++----- + 2 files changed, 18 insertions(+), 19 deletions(-) + +--- a/arch/arm/boot/dts/bcm2711-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi +@@ -65,17 +65,16 @@ + }; + + &scb { +- ranges = <0x0 0x7c000000 0x0 0xfc000000 0x03800000>, +- <0x0 0x40000000 0x0 0xff800000 0x00800000>, +- <0x6 0x00000000 0x6 0x00000000 0x40000000>, +- <0x0 0x00000000 0x0 0x00000000 0xfc000000>; +- dma-ranges = <0x0 0x00000000 0x0 0x00000000 0xfc000000>, +- <0x1 0x00000000 0x1 0x00000000 0x80000000>, +- <0x1 0x80000000 0x1 0x80000000 0x80000000>; ++ ranges = <0x0 0x7c000000 0x0 0xfc000000 0x0 0x03800000>, ++ <0x0 0x40000000 0x0 0xff800000 0x0 0x00800000>, ++ <0x6 0x00000000 0x6 0x00000000 0x0 0x40000000>, ++ <0x0 0x00000000 0x0 0x00000000 0x0 0xfc000000>; ++ dma-ranges = <0x0 0x00000000 0x0 0x00000000 0x0 0xfc000000>, ++ <0x1 0x00000000 0x1 0x00000000 0x1 0x00000000>; + + dma40: dma@7e007b00 { + compatible = "brcm,bcm2711-dma"; +- reg = <0x0 0x7e007b00 0x400>; ++ reg = <0x0 0x7e007b00 0x0 0x400>; + interrupts = + <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, /* dma4 11 */ + <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, /* dma4 12 */ +@@ -91,39 +90,39 @@ + + vchiq: mailbox@7e00b840 { + compatible = "brcm,bcm2711-vchiq"; +- reg = <0 0x7e00b840 0x3c>; ++ reg = <0 0x7e00b840 0x0 0x3c>; + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; + }; + + xhci: xhci@7e9c0000 { + compatible = "generic-xhci"; + status = "disabled"; +- reg = <0x0 0x7e9c0000 0x100000>; ++ reg = <0x0 0x7e9c0000 0x0 0x100000>; + interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>; + }; + + hevc-decoder@7eb00000 { + compatible = "raspberrypi,rpivid-hevc-decoder"; +- reg = <0x0 0x7eb00000 0x10000>; ++ reg = <0x0 0x7eb00000 0x0 0x10000>; + status = "okay"; + }; + + rpivid-local-intc@7eb10000 { + compatible = "raspberrypi,rpivid-local-intc"; +- reg = <0x0 0x7eb10000 0x1000>; ++ reg = <0x0 0x7eb10000 0x0 0x1000>; + status = "okay"; + interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; + }; + + h264-decoder@7eb20000 { + compatible = "raspberrypi,rpivid-h264-decoder"; +- reg = <0x0 0x7eb20000 0x10000>; ++ reg = <0x0 0x7eb20000 0x0 0x10000>; + status = "okay"; + }; + + vp9-decoder@7eb30000 { + compatible = "raspberrypi,rpivid-vp9-decoder"; +- reg = <0x0 0x7eb30000 0x10000>; ++ reg = <0x0 0x7eb30000 0x0 0x10000>; + status = "okay"; + }; + }; +--- a/arch/arm/boot/dts/bcm2711.dtsi ++++ b/arch/arm/boot/dts/bcm2711.dtsi +@@ -445,14 +445,14 @@ + scb { + compatible = "simple-bus"; + #address-cells = <2>; +- #size-cells = <1>; ++ #size-cells = <2>; + +- ranges = <0x0 0x7c000000 0x0 0xfc000000 0x03800000>, +- <0x6 0x00000000 0x6 0x00000000 0x40000000>; ++ ranges = <0x0 0x7c000000 0x0 0xfc000000 0x0 0x03800000>, ++ <0x6 0x00000000 0x6 0x00000000 0x0 0x40000000>; + + pcie0: pcie@7d500000 { + compatible = "brcm,bcm2711-pcie"; +- reg = <0x0 0x7d500000 0x9310>; ++ reg = <0x0 0x7d500000 0x0 0x9310>; + device_type = "pci"; + #address-cells = <3>; + #interrupt-cells = <1>; +@@ -480,7 +480,7 @@ + + genet: ethernet@7d580000 { + compatible = "brcm,bcm2711-genet-v5"; +- reg = <0x0 0x7d580000 0x10000>; ++ reg = <0x0 0x7d580000 0x0 0x10000>; + #address-cells = <0x1>; + #size-cells = <0x1>; + interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>, |