Skip to content

Commit 94bb9d1

Browse files
committed
Merge tag 'arm-soc/for-5.6/devicetree-fixes-part2' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM-based SoCs Device Tree fixes for 5.6, please pull the following: - Nick fixes the missing pinctrl-names property for the Raspberry Pi Zero Wireless DTS - Nicolas fixes the VC4 firmware node dma-range property which does not have the limitations of the soc's bus node * tag 'arm-soc/for-5.6/devicetree-fixes-part2' of https://github.com/Broadcom/stblinux: ARM: dts: bcm283x: Fix vc4's firmware bus DMA limitations ARM: bcm2835-rpi-zero-w: Add missing pinctrl name Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9b63164 + 55c7c06 commit 94bb9d1

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
&sdhci {
113113
#address-cells = <1>;
114114
#size-cells = <0>;
115+
pinctrl-names = "default";
115116
pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;
116117
bus-width = <4>;
117118
mmc-pwrseq = <&wifi_pwrseq>;

arch/arm/boot/dts/bcm2835-rpi.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
firmware: firmware {
1616
compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
1717
mboxes = <&mailbox>;
18+
dma-ranges;
1819
};
1920

2021
power: power {

0 commit comments

Comments
 (0)