On 02/12/2024 15:31, Dave Stevenson wrote:
> Fixes up errors on HDMI and interrupt controllers that weren't
What errors? I can't find anything in the commit. Describe the error.
> noticed before merging.
>
> Fixes: de9bc2dba3db ("arm64: dts: broadcom: Add display pipeline support to BCM2712")
> Signed-off-by: Dave Stevenson <dave.stevenson@xxxxxxxxxxxxxxx>
> ---
> arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
> index 39305e0869ec..f42fad2d8b37 100644
> --- a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
> +++ b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
> @@ -336,7 +336,7 @@ ddc1: i2c@7d508280 {
> #size-cells = <0>;
> };
>
> - bsc_irq: intc@7d508380 {
> + bsc_irq: interrupt-controller@7d508380 {
Do not mix cleanups with bugfixes.
BTW, do not mix DTS to DRM. DRM has its own development style. DTS
*cannot* be merged there, so combining these series is not welcomed and
leads to issues (like DRM applying DTS!).
> compatible = "brcm,bcm7271-l2-intc";
> reg = <0x7d508380 0x10>;
> interrupts = <GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>;
> @@ -344,7 +344,7 @@ bsc_irq: intc@7d508380 {
> #interrupt-cells = <1>;
> };
>
> - main_irq: intc@7d508400 {
> + main_irq: interrupt-controller@7d508400 {
> compatible = "brcm,bcm7271-l2-intc";
> reg = <0x7d508400 0x10>;
> interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>;
> @@ -352,7 +352,7 @@ main_irq: intc@7d508400 {
> #interrupt-cells = <1>;
> };
Best regards,
Krzysztof
