diff options
| author | Florian Fainelli <[email protected]> | 2020-11-20 19:14:01 -0800 |
|---|---|---|
| committer | Florian Fainelli <[email protected]> | 2020-11-20 19:14:01 -0800 |
| commit | f722fbac1e533ea1fe750d99d09c244efff59d59 (patch) | |
| tree | 1b3a3b10a84ac63daa48865cd91bea42157e38fe | |
| parent | ab7eff24a1e993b649d0383ec831a7fab30fe369 (diff) | |
| parent | 278407a53c3b33fb820332c4d39eb39316c3879a (diff) | |
Merge tag 'tags/bcm2835-dt-next-2020-11-20' into devicetree/next
- Maxime introduces a quirk to avoid EMI between WiFi and HDMI@1440p on
RPi4b.
- Pavel fixes dwc2's fifo size to properly support isochronous
transfers.
Signed-off-by: Florian Fainelli <[email protected]>
| -rw-r--r-- | arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts index 09a1182c2936..403bacf986eb 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -181,12 +181,14 @@ &hdmi0 { clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>; clock-names = "hdmi", "bvb", "audio", "cec"; + wifi-2.4ghz-coexistence; status = "okay"; }; &hdmi1 { clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>; clock-names = "hdmi", "bvb", "audio", "cec"; + wifi-2.4ghz-coexistence; status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi index e2fd9610e125..20322de2f8bf 100644 --- a/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi +++ b/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 &usb { dr_mode = "otg"; - g-rx-fifo-size = <256>; + g-rx-fifo-size = <558>; g-np-tx-fifo-size = <32>; /* * According to dwc2 the sum of all device EP diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi index 0ff0e9e25327..1409d1b559c1 100644 --- a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi +++ b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 &usb { dr_mode = "peripheral"; - g-rx-fifo-size = <256>; + g-rx-fifo-size = <558>; g-np-tx-fifo-size = <32>; g-tx-fifo-size = <256 256 512 512 512 768 768>; }; |