| Message ID | 20240327000510.2541-6-laurent.pinchart@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series | media: Add driver for the Raspberry Pi <5 CSI-2 receiver | expand |
Hi Laurent On Wed, 27 Mar 2024 at 00:05, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > The Raspberry Pi firmware handles clocks on all BCM2835-derived SoCs, > not just on the BCM2711. Move the corresponding DT node from > bcm2711-rpi.dtsi to bcm2835-rpi.dtsi. It's already present in bcm2835-rpi-common.dtsi [1]. That is included for all Pi0-3 platforms, but not bcm2711 / Pi4. I don't see any reason why it needs to be defined separately for the bcm283x vs bcm2711 (I suspect it's just evolution), but having it defined twice on the bcm283x platforms isn't that great. Drop the firmware_clocks node from bcm2835-rpi-common.dtsi as well, and it gets: Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com> [1] https://github.com/torvalds/linux/blob/master/arch/arm/boot/dts/broadcom/bcm2835-rpi-common.dtsi#L10-L15 > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi | 5 ----- > arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi | 5 +++++ > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi > index d233a191c139..86188eabeb24 100644 > --- a/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi > +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi > @@ -20,11 +20,6 @@ aliases { > }; > > &firmware { > - firmware_clocks: clocks { > - compatible = "raspberrypi,firmware-clocks"; > - #clock-cells = <1>; > - }; > - > expgpio: gpio { > compatible = "raspberrypi,firmware-gpio"; > gpio-controller; > diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi > index 761a9da97bd0..6e6dc109f0c2 100644 > --- a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi > +++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi > @@ -5,6 +5,11 @@ soc { > firmware: firmware { > compatible = "raspberrypi,bcm2835-firmware", "simple-mfd"; > mboxes = <&mailbox>; > + > + firmware_clocks: clocks { > + compatible = "raspberrypi,firmware-clocks"; > + #clock-cells = <1>; > + }; > }; > > power: power { > -- > Regards, > > Laurent Pinchart >
diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi index d233a191c139..86188eabeb24 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi @@ -20,11 +20,6 @@ aliases { }; &firmware { - firmware_clocks: clocks { - compatible = "raspberrypi,firmware-clocks"; - #clock-cells = <1>; - }; - expgpio: gpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi index 761a9da97bd0..6e6dc109f0c2 100644 --- a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi @@ -5,6 +5,11 @@ soc { firmware: firmware { compatible = "raspberrypi,bcm2835-firmware", "simple-mfd"; mboxes = <&mailbox>; + + firmware_clocks: clocks { + compatible = "raspberrypi,firmware-clocks"; + #clock-cells = <1>; + }; }; power: power {
The Raspberry Pi firmware handles clocks on all BCM2835-derived SoCs, not just on the BCM2711. Move the corresponding DT node from bcm2711-rpi.dtsi to bcm2835-rpi.dtsi. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi | 5 ----- arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-)