Fixes up errors on HDMI and interrupt controllers that weren't
noticed before merging.
Fixes: de9bc2dba3db ("arm64: dts: broadcom: Add display pipeline support to BCM2712")
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
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 {
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>;
};
- hdmi0: hdmi@7ef00700 {
+ hdmi0: hdmi@7c701400 {
compatible = "brcm,bcm2712-hdmi0";
reg = <0x7c701400 0x300>,
<0x7c701000 0x200>,
@@ -381,7 +381,7 @@ hdmi0: hdmi@7ef00700 {
ddc = <&ddc0>;
};
- hdmi1: hdmi@7ef05700 {
+ hdmi1: hdmi@7c706400 {
compatible = "brcm,bcm2712-hdmi1";
reg = <0x7c706400 0x300>,
<0x7c706000 0x200>,
--
2.34.1
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@raspberrypi.com>
> ---
> 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
On 12/2/24 07:20, Krzysztof Kozlowski wrote:
> 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@raspberrypi.com>
>> ---
>> 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!).
That is not what was done, I took the DTS patches via the Broadcom ARM
SoC tree, as I usually do, unless someone tells me otherwise.
We got a number of DTS warnings after I took Dave's patches so I asked
for those to be fixed, as it turns out there are binding and DTS fixes.
I intend to squash these fixes with their original commit, so all of
those commit messages will be discarded, they are only meant to be
transitional.
--
Florian
On Mon, Dec 02, 2024 at 04:20:46PM +0100, Krzysztof Kozlowski wrote:
> 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@raspberrypi.com>
> > ---
> > 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!).
When did that ever happen?
Maxime
© 2016 - 2026 Red Hat, Inc.