| From ef613e21a95589866d638ece8390b775f2539818 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 29 May 2021 15:02:51 +0200 |
| Subject: Revert "ARM: dts: bcm283x: increase dwc2's RX FIFO size" |
| |
| From: Stefan Wahren <stefan.wahren@i2se.com> |
| |
| [ Upstream commit 77daceabedb42482bb6200fa26047c5591716e45 ] |
| |
| This reverts commit 278407a53c3b33fb820332c4d39eb39316c3879a. |
| |
| The original change breaks USB config on Raspberry Pi Zero and Pi 4 B, |
| because it exceeds the total fifo size of 4080. A naive attempt to reduce |
| g-tx-fifo-size doesn't help on Raspberry Pi Zero. So better go back. |
| |
| Fixes: 278407a53c3b ("ARM: dts: bcm283x: increase dwc2's RX FIFO size") |
| Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> |
| Cc: Pavel Hofman <pavel.hofman@ivitera.com> |
| Link: https://lore.kernel.org/r/1622293371-5997-1-git-send-email-stefan.wahren@i2se.com |
| Signed-off-by: Nicolas Saenz Julienne <nsaenz@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi | 2 +- |
| arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi |
| index 20322de2f8bf..e2fd9610e125 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 = <558>; |
| + g-rx-fifo-size = <256>; |
| 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 1409d1b559c1..0ff0e9e25327 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 = <558>; |
| + g-rx-fifo-size = <256>; |
| g-np-tx-fifo-size = <32>; |
| g-tx-fifo-size = <256 256 512 512 512 768 768>; |
| }; |
| -- |
| 2.30.2 |
| |