• Maxime Ripard's avatar
    ARM: dts: bcm283x: Remove bcm2835-rpi-common.dtsi from SoC DTSI · 9d9491b6
    Maxime Ripard authored
    According to the commit log of the commit 3ac395a5 ("ARM: dts:
    bcm283x: Use firmware PM driver for V3D"), the initial intent behind the
    bcm2835-rpi-common DTSI was to share data between the RaspberryPies
    based on the BCM2835, 36 and 37.
    
    However, it was included by these SoCs' main DTSI. This is creating an
    improper layering.
    
    On top of that, bcm2835.dtsi is being included by bcm2711.dtsi, which
    means that, even though the bcm2835-rpi-common DTSI wasn't actually
    meant to contain data for the BCM2711, it actually leaks into the
    BCM2711 DTSI.
    
    In order to remove both issues, let's remove the include of
    bcm2835-rpi-common.dtsi from bcm283{5-7}.dtsi and put them into the
    bcm283{6,7}-rpi.dtsi.
    
    BCM2835 has to be handled with special care due to the fact that
    bcm2835.dtsi is being included by bcm2711.dtsi. Thus, we chose to
    include bcm2835-rpi-common.dtsi directly into the board DTS. This will
    be more error-prone, but given that it's a fairly old SoC by now, the
    chance that we will get more BCM2835 boards is fairly low.
    
    BCM2711 isn't modified since the content of bcm2835-rpi-common.dtsi was
    only a power-domain for the v3d that was overridden anyway.
    Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
    Link: https://lore.kernel.org/r/20221026-rpi-display-fw-clk-v1-1-5c29b7a3d8b0@cerno.techSigned-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
    9d9491b6
bcm2835.dtsi 1.3 KB