| Message ID | 7ba92b281cea785358551c8de99845c6345a2391.1737214993.git.hns@goldelico.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Revert v6.2-rc1 and later "ARM: dts: bcm2835-rpi: Use firmware clocks for display" | expand |
On Sat, Jan 18, 2025 at 04:43:14PM +0100, H. Nikolaus Schaller wrote:
> This reverts commit d02f02c28f5561cf5b2345f8b4c910bd98d18553.
I don't see this git id anywhere in Linus's tree, where did it come
from? It's also not in linux-next.
thanks,
greg k-h
Hi Greg, > Am 18.01.2025 um 17:04 schrieb Greg KH <gregkh@linuxfoundation.org>: > > On Sat, Jan 18, 2025 at 04:43:14PM +0100, H. Nikolaus Schaller wrote: >> This reverts commit d02f02c28f5561cf5b2345f8b4c910bd98d18553. Sorry for the noise. It was reverted from a locally rebased but otherwise identical copy of commit 27ab05e1b7e5c5ec9b4f658e1b2464c0908298a6 > > I don't see this git id anywhere in Linus's tree, where did it come > from? It's also not in linux-next. I'll send a v2 patch with corrected references. BR and thanks, Nikolaus
diff --git a/arch/arm/boot/dts/bcm2835-rpi-common.dtsi b/arch/arm/boot/dts/bcm2835-rpi-common.dtsi index 4e7b4a592da7c..8a55b6cded592 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi-common.dtsi @@ -7,23 +7,6 @@ #include <dt-bindings/power/raspberrypi-power.h> -&firmware { - firmware_clocks: clocks { - compatible = "raspberrypi,firmware-clocks"; - #clock-cells = <1>; - }; -}; - -&hdmi { - clocks = <&firmware_clocks 9>, - <&firmware_clocks 13>; - clock-names = "pixel", "hdmi"; -}; - &v3d { power-domains = <&power RPI_POWER_DOMAIN_V3D>; }; - -&vec { - clocks = <&firmware_clocks 15>; -};
This reverts commit d02f02c28f5561cf5b2345f8b4c910bd98d18553. I tried to upgrade a RasPi 3B+ with Waveshare 7inch HDMI LCD from 6.1.y to 6.6.y but found that the display is broken with this log message: [ 17.776315] vc4-drm soc:gpu: bound 3f400000.hvs (ops vc4_drm_unregister [vc4]) [ 17.784034] platform 3f806000.vec: deferred probe pending Some tests revealed that while 6.1.y works, 6.2-rc1 is already broken but all newer kernels as well. And a bisect did lead me to this patch. I could repair several versions up to 6.13-rc7 by doing this revert. Newer kernels have just to take care of commit f702475b839c ("ARM: dts: bcm2835-rpi: Move duplicate firmware-clocks to bcm2835-rpi.dtsi") but that is straightforward. Fixes: d02f02c28f55 ("ARM: dts: bcm2835-rpi: Use firmware clocks for display") Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> --- arch/arm/boot/dts/bcm2835-rpi-common.dtsi | 17 ----------------- 1 file changed, 17 deletions(-)