| Message ID | 20211122222440.21177-1-j@jannau.net |
|---|---|
| Headers | show |
| Series | Apple Arm patform device tree and bindings fixes | expand |
> From: Janne Grunau <j@jannau.net> > Date: Mon, 22 Nov 2021 23:24:40 +0100 > > Required for devices trying to use pinctrl devices as interrupt > controller. > > Fixes: 0a8282b83119 ("arm64: apple: Add pinctrl nodes") > Signed-off-by: Janne Grunau <j@jannau.net> > Cc: Mark Kettenis <kettenis@openbsd.org> > Reviewed-by: Sven Peter <sven@svenpeter.dev> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> > --- > arch/arm64/boot/dts/apple/t8103.dtsi | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi > index fc8b2bb06ffe..c320c8baeb41 100644 > --- a/arch/arm64/boot/dts/apple/t8103.dtsi > +++ b/arch/arm64/boot/dts/apple/t8103.dtsi > @@ -143,6 +143,7 @@ pinctrl_ap: pinctrl@23c100000 { > apple,npins = <212>; > > interrupt-controller; > + #interrupt-cells = <2>; > interrupt-parent = <&aic>; > interrupts = <AIC_IRQ 190 IRQ_TYPE_LEVEL_HIGH>, > <AIC_IRQ 191 IRQ_TYPE_LEVEL_HIGH>, > @@ -169,6 +170,7 @@ pinctrl_aop: pinctrl@24a820000 { > apple,npins = <42>; > > interrupt-controller; > + #interrupt-cells = <2>; > interrupt-parent = <&aic>; > interrupts = <AIC_IRQ 268 IRQ_TYPE_LEVEL_HIGH>, > <AIC_IRQ 269 IRQ_TYPE_LEVEL_HIGH>, > @@ -189,6 +191,7 @@ pinctrl_nub: pinctrl@23d1f0000 { > apple,npins = <23>; > > interrupt-controller; > + #interrupt-cells = <2>; > interrupt-parent = <&aic>; > interrupts = <AIC_IRQ 330 IRQ_TYPE_LEVEL_HIGH>, > <AIC_IRQ 331 IRQ_TYPE_LEVEL_HIGH>, > @@ -209,6 +212,7 @@ pinctrl_smc: pinctrl@23e820000 { > apple,npins = <16>; > > interrupt-controller; > + #interrupt-cells = <2>; > interrupt-parent = <&aic>; > interrupts = <AIC_IRQ 391 IRQ_TYPE_LEVEL_HIGH>, > <AIC_IRQ 392 IRQ_TYPE_LEVEL_HIGH>, > -- > 2.34.0 > >
On 23/11/2021 07.24, Janne Grunau wrote: > Hej All, > > this series fixes small issues in the device tree bindings and files > for the Apple Arm platform in v5.16-rc1. The fixes are non-critical > but make things easier moving forward. > > Changes since v1: > - replaced single value enum in apple,i2c.yaml with const > - added Sven Peter's Reviewed-by tags to Patch 2 and 3 > > thanks > Janne > > The series is available as branch at > https://github.com/jannau/linux/tree/apple_m1/dt-fixes-for-5.16_v2 > > Janne Grunau (3): > arm64: dts: apple: change ethernet0 device type to ethernet > dt-bindings: i2c: apple,i2c: allow multiple compatibles > arm64: dts: apple: add #interrupt-cells property to pinctrl nodes > > Documentation/devicetree/bindings/i2c/apple,i2c.yaml | 8 ++++---- > arch/arm64/boot/dts/apple/t8103-j274.dts | 2 +- > arch/arm64/boot/dts/apple/t8103.dtsi | 4 ++++ > 3 files changed, 9 insertions(+), 5 deletions(-) > Acked-by: Hector Martin <marcan@marcan.st> Thanks! I'll apply this to asahi-soc once Rob acks the binding change.