mbox series

[GIT,PULL,1/1] Broadcom devicetree fixes for 5.16

Message ID 20211214033617.2979148-1-f.fainelli@gmail.com
State New
Headers show
Series [GIT,PULL,1/1] Broadcom devicetree fixes for 5.16 | expand

Pull-request

https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.16/devicetree-fixes-part2

Message

Florian Fainelli Dec. 14, 2021, 3:36 a.m. UTC
The following changes since commit 98481f3d72fb88cb5b973153434061015f094925:

  ARM: dts: bcm2711: Fix PCIe interrupts (2021-11-15 19:09:47 -0800)

are available in the Git repository at:

  https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.16/devicetree-fixes-part2

for you to fetch changes up to f1d8b8561e84c9caf3e01d726b874d80475b0ffe:

  Merge tag 'tags/bcm2835-dt-fixes-2021-12-13' into devicetree/fixes (2021-12-13 12:20:59 -0800)

----------------------------------------------------------------
This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
5.16, please pull the following:

- Stefan removes a fallback compatible string for the VCIHCQ node in
  preparation for allowing the VCIHCQ binding to be converted to YAML

- Phil fixes the GPIO expander labels for the Raspberry Pi 400 GPIO
  expander and adds the missing 'gpio-ranges' property for the BCM283x and
  BCM2711 Device Tree include files

----------------------------------------------------------------
Florian Fainelli (1):
      Merge tag 'tags/bcm2835-dt-fixes-2021-12-13' into devicetree/fixes

Phil Elwell (2):
      ARM: dts: bcm2711-rpi-400: Fix GPIO expander labels
      ARM: dts: gpio-ranges property is now required

Stefan Wahren (1):
      ARM: dts: bcm283x: Drop fallback compatible for vchiq

 arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++--
 arch/arm/boot/dts/bcm2711.dtsi        | 2 ++
 arch/arm/boot/dts/bcm2836-rpi.dtsi    | 2 +-
 arch/arm/boot/dts/bcm283x.dtsi        | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

Comments

Florian Fainelli Dec. 14, 2021, 5:13 p.m. UTC | #1
On 12/13/21 7:36 PM, Florian Fainelli wrote:
> The following changes since commit 98481f3d72fb88cb5b973153434061015f094925:
> 
>   ARM: dts: bcm2711: Fix PCIe interrupts (2021-11-15 19:09:47 -0800)
> 
> are available in the Git repository at:
> 
>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-5.16/devicetree-fixes-part2
> 
> for you to fetch changes up to f1d8b8561e84c9caf3e01d726b874d80475b0ffe:
> 
>   Merge tag 'tags/bcm2835-dt-fixes-2021-12-13' into devicetree/fixes (2021-12-13 12:20:59 -0800)
> 
> ----------------------------------------------------------------
> This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
> 5.16, please pull the following:
> 
> - Stefan removes a fallback compatible string for the VCIHCQ node in
>   preparation for allowing the VCIHCQ binding to be converted to YAML
> 
> - Phil fixes the GPIO expander labels for the Raspberry Pi 400 GPIO
>   expander and adds the missing 'gpio-ranges' property for the BCM283x and
>   BCM2711 Device Tree include files
> 
> ----------------------------------------------------------------
> Florian Fainelli (1):
>       Merge tag 'tags/bcm2835-dt-fixes-2021-12-13' into devicetree/fixes
> 
> Phil Elwell (2):
>       ARM: dts: bcm2711-rpi-400: Fix GPIO expander labels
>       ARM: dts: gpio-ranges property is now required

It looks like the change above needs to be accompanied by
pinctlr-bcm2835.c changes which have been applied into Linus W's tree.
Arnd, are you able to back out this pull request for the time being? I
don't believe any of those fixes are critical for v5.16.
Arnd Bergmann Dec. 14, 2021, 6:59 p.m. UTC | #2
On Tue, Dec 14, 2021 at 6:13 PM Florian Fainelli <f.fainelli@gmail.com> wrote:
> On 12/13/21 7:36 PM, Florian Fainelli wrote:
> > Florian Fainelli (1):
> >       Merge tag 'tags/bcm2835-dt-fixes-2021-12-13' into devicetree/fixes
> >
> > Phil Elwell (2):
> >       ARM: dts: bcm2711-rpi-400: Fix GPIO expander labels
> >       ARM: dts: gpio-ranges property is now required
>
> It looks like the change above needs to be accompanied by
> pinctlr-bcm2835.c changes which have been applied into Linus W's tree.
> Arnd, are you able to back out this pull request for the time being? I
> don't believe any of those fixes are critical for v5.16.

I was already holding off because of a comment I had on the vchiq patch,
as discussed on IRC. I assumed you had already seen the discussion there,
so I did not reply here.

        Arnd
Florian Fainelli Dec. 15, 2021, 5:20 p.m. UTC | #3
On 12/14/21 10:59 AM, Arnd Bergmann wrote:
> On Tue, Dec 14, 2021 at 6:13 PM Florian Fainelli <f.fainelli@gmail.com> wrote:
>> On 12/13/21 7:36 PM, Florian Fainelli wrote:
>>> Florian Fainelli (1):
>>>       Merge tag 'tags/bcm2835-dt-fixes-2021-12-13' into devicetree/fixes
>>>
>>> Phil Elwell (2):
>>>       ARM: dts: bcm2711-rpi-400: Fix GPIO expander labels
>>>       ARM: dts: gpio-ranges property is now required
>>
>> It looks like the change above needs to be accompanied by
>> pinctlr-bcm2835.c changes which have been applied into Linus W's tree.
>> Arnd, are you able to back out this pull request for the time being? I
>> don't believe any of those fixes are critical for v5.16.
> 
> I was already holding off because of a comment I had on the vchiq patch,
> as discussed on IRC. I assumed you had already seen the discussion there,
> so I did not reply here.

Thanks, I dropped this from my tree as well now. We will get those fixes
merged in a slightly different way to avoid breakage in linux-next. Thanks!