Skip to content

Commit

Permalink
Merge tag 'soc-fixes-5.16-5' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/git/soc/soc

Pull ARM SoC fix from Olof Johansson:
 "One more fix for 5.16

  I had missed one patch when I sent up what I thought was the last
  batch of fixes for this release. This one fixes issues on the
  Raspberry Pi platforms due to gpio init changes this release, so
  hopefully we can get it merged before final release is cut"

* tag 'soc-fixes-5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: dts: gpio-ranges property is now required
  • Loading branch information
Linus Torvalds committed Jan 9, 2022
2 parents 9a12a5a + c801335 commit 9535012
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/bcm2711.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,8 @@
<GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;

gpio-ranges = <&gpio 0 0 58>;

gpclk0_gpio49: gpclk0_gpio49 {
pin-gpclk {
pins = "gpio49";
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/bcm283x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@
interrupt-controller;
#interrupt-cells = <2>;

gpio-ranges = <&gpio 0 0 54>;

/* Defines common pin muxing groups
*
* While each pin can have its mux selected
Expand Down

0 comments on commit 9535012

Please sign in to comment.