* [PATCH 0/3] Apple Arm patform device tree and bindings fixes @ 2021-11-21 17:15 Janne Grunau 2021-11-21 17:15 ` [PATCH RESEND 1/3] arm64: dts: apple: change ethernet0 device type to ethernet Janne Grunau ` (2 more replies) 0 siblings, 3 replies; 8+ messages in thread From: Janne Grunau @ 2021-11-21 17:15 UTC (permalink / raw) To: Hector Martin, Sven Peter, Alyssa Rosenzweig, Rob Herring, Marc Zyngier, Mark Kettenis, Olof Johansson, Wolfram Sang, Arnd Bergmann, Linus Walleij Cc: linux-arm-kernel, devicetree, linux-i2c, linux-kernel 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. Patch 1/3 was previously sent, annotated with a "Fixes" tag and Mark's "Reviewed-by". Thanks Janne 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 | 9 +++++---- arch/arm64/boot/dts/apple/t8103-j274.dts | 2 +- arch/arm64/boot/dts/apple/t8103.dtsi | 4 ++++ 3 files changed, 10 insertions(+), 5 deletions(-) -- 2.33.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH RESEND 1/3] arm64: dts: apple: change ethernet0 device type to ethernet 2021-11-21 17:15 [PATCH 0/3] Apple Arm patform device tree and bindings fixes Janne Grunau @ 2021-11-21 17:15 ` Janne Grunau 2021-11-21 17:15 ` [PATCH 2/3] dt-bindings: i2c: apple,i2c: allow multiple compatibles Janne Grunau 2021-11-21 17:15 ` [PATCH 3/3] arm64: dts: apple: add #interrupt-cells property to pinctrl nodes Janne Grunau 2 siblings, 0 replies; 8+ messages in thread From: Janne Grunau @ 2021-11-21 17:15 UTC (permalink / raw) To: Hector Martin, Sven Peter, Alyssa Rosenzweig, Rob Herring, Marc Zyngier Cc: Mark Kettenis, linux-arm-kernel, devicetree, linux-kernel Fixes make dtbs_check errors for t8103-j274.dts due to missing pci properties. Fixes: e1bebf978151 ("arm64: dts: apple: j274: Expose PCI node for the Ethernet MAC address") Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Signed-off-by: Janne Grunau <j@jannau.net> --- arch/arm64/boot/dts/apple/t8103-j274.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/apple/t8103-j274.dts b/arch/arm64/boot/dts/apple/t8103-j274.dts index 33a80f9501dc..02c36301e985 100644 --- a/arch/arm64/boot/dts/apple/t8103-j274.dts +++ b/arch/arm64/boot/dts/apple/t8103-j274.dts @@ -60,7 +60,7 @@ &port01 { &port02 { bus-range = <3 3>; - ethernet0: pci@0,0 { + ethernet0: ethernet@0,0 { reg = <0x30000 0x0 0x0 0x0 0x0>; /* To be filled by the loader */ local-mac-address = [00 10 18 00 00 00]; -- 2.34.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] dt-bindings: i2c: apple,i2c: allow multiple compatibles 2021-11-21 17:15 [PATCH 0/3] Apple Arm patform device tree and bindings fixes Janne Grunau 2021-11-21 17:15 ` [PATCH RESEND 1/3] arm64: dts: apple: change ethernet0 device type to ethernet Janne Grunau @ 2021-11-21 17:15 ` Janne Grunau 2021-11-21 20:22 ` [PATCH 2/3] dt-bindings: i2c: apple, i2c: " Sven Peter 2021-11-21 17:15 ` [PATCH 3/3] arm64: dts: apple: add #interrupt-cells property to pinctrl nodes Janne Grunau 2 siblings, 1 reply; 8+ messages in thread From: Janne Grunau @ 2021-11-21 17:15 UTC (permalink / raw) To: Hector Martin, Sven Peter, Alyssa Rosenzweig, Rob Herring, Wolfram Sang, Olof Johansson, Arnd Bergmann Cc: Mark Kettenis, Rob Herring, linux-arm-kernel, linux-i2c, devicetree, linux-kernel The intention was to have a SoC-specific and base compatible string to allow forward compatibility and SoC specific quirks, Fixes: df7c4a8c1b47 ("dt-bindings: i2c: Add Apple I2C controller bindings") Signed-off-by: Janne Grunau <j@jannau.net> Cc: Mark Kettenis <kettenis@openbsd.org> --- Documentation/devicetree/bindings/i2c/apple,i2c.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml index 22fc8483256f..f1cb96c08212 100644 --- a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml +++ b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml @@ -20,9 +20,10 @@ allOf: properties: compatible: - enum: - - apple,t8103-i2c - - apple,i2c + items: + - enum: + - apple,t8103-i2c + - const: apple,i2c reg: maxItems: 1 @@ -51,7 +52,7 @@ unevaluatedProperties: false examples: - | i2c@35010000 { - compatible = "apple,t8103-i2c"; + compatible = "apple,t8103-i2c", "apple,i2c"; reg = <0x35010000 0x4000>; interrupt-parent = <&aic>; interrupts = <0 627 4>; -- 2.34.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] dt-bindings: i2c: apple, i2c: allow multiple compatibles 2021-11-21 17:15 ` [PATCH 2/3] dt-bindings: i2c: apple,i2c: allow multiple compatibles Janne Grunau @ 2021-11-21 20:22 ` Sven Peter 2021-11-22 17:59 ` [PATCH 2/3] dt-bindings: i2c: apple,i2c: " Janne Grunau 0 siblings, 1 reply; 8+ messages in thread From: Sven Peter @ 2021-11-21 20:22 UTC (permalink / raw) To: Janne Grunau, Hector Martin, Alyssa Rosenzweig, Rob Herring, Wolfram Sang, Olof Johansson, Arnd Bergmann Cc: Mark Kettenis, Rob Herring, linux-arm-kernel, linux-i2c, devicetree, linux-kernel Hi, On Sun, Nov 21, 2021, at 18:15, Janne Grunau wrote: > The intention was to have a SoC-specific and base compatible string > to allow forward compatibility and SoC specific quirks, > > Fixes: df7c4a8c1b47 ("dt-bindings: i2c: Add Apple I2C controller bindings") > Signed-off-by: Janne Grunau <j@jannau.net> > Cc: Mark Kettenis <kettenis@openbsd.org> > --- Yeah, this should've been "apple,t8103-i2c", "apple,i2c" all along :/ Given that we have no i2c nodes in the dts yet and that this binding was only added for -rc1 I think it's fine to just drop "apple,t8103-i2c" here instead of marking it as deprecated and keeping it around forever if Mark Kettenis also agrees. > Documentation/devicetree/bindings/i2c/apple,i2c.yaml | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml > b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml > index 22fc8483256f..f1cb96c08212 100644 > --- a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml > +++ b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml > @@ -20,9 +20,10 @@ allOf: > > properties: > compatible: > - enum: > - - apple,t8103-i2c > - - apple,i2c > + items: > + - enum: > + - apple,t8103-i2c > + - const: apple,i2c Nit: the enum makes sense once we add t6000-i2c but right now properties: compatible: items: - const: apple,t8103-i2c - const: apple,i2c also works and look a bit less weird. Either way, Reviewed-by: Sven Peter <sven@svenpeter.dev> Sven _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] dt-bindings: i2c: apple,i2c: allow multiple compatibles 2021-11-21 20:22 ` [PATCH 2/3] dt-bindings: i2c: apple, i2c: " Sven Peter @ 2021-11-22 17:59 ` Janne Grunau 2021-11-22 20:48 ` [PATCH 2/3] dt-bindings: i2c: apple, i2c: " Sven Peter 0 siblings, 1 reply; 8+ messages in thread From: Janne Grunau @ 2021-11-22 17:59 UTC (permalink / raw) To: Sven Peter Cc: Hector Martin, Alyssa Rosenzweig, Rob Herring, Wolfram Sang, Olof Johansson, Arnd Bergmann, Mark Kettenis, Rob Herring, linux-arm-kernel, linux-i2c, devicetree, linux-kernel On 2021-11-21 21:22:47 +0100, Sven Peter wrote: > Hi, > > On Sun, Nov 21, 2021, at 18:15, Janne Grunau wrote: > > The intention was to have a SoC-specific and base compatible string > > to allow forward compatibility and SoC specific quirks, > > > > Fixes: df7c4a8c1b47 ("dt-bindings: i2c: Add Apple I2C controller bindings") > > Signed-off-by: Janne Grunau <j@jannau.net> > > Cc: Mark Kettenis <kettenis@openbsd.org> > > --- > > Yeah, this should've been "apple,t8103-i2c", "apple,i2c" all along :/ > Given that we have no i2c nodes in the dts yet and that this binding was > only added for -rc1 I think it's fine to just drop "apple,t8103-i2c" > here instead of marking it as deprecated and keeping it around forever > if Mark Kettenis also agrees. > > > Documentation/devicetree/bindings/i2c/apple,i2c.yaml | 9 +++++---- > > 1 file changed, 5 insertions(+), 4 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml > > b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml > > index 22fc8483256f..f1cb96c08212 100644 > > --- a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml > > +++ b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml > > @@ -20,9 +20,10 @@ allOf: > > > > properties: > > compatible: > > - enum: > > - - apple,t8103-i2c > > - - apple,i2c > > + items: > > + - enum: > > + - apple,t8103-i2c > > + - const: apple,i2c > > Nit: the enum makes sense once we add t6000-i2c but right now > > properties: > compatible: > items: > - const: apple,t8103-i2c > - const: apple,i2c > > also works and look a bit less weird. I split it from change which in addition added "apple,t6000-i2c" as second enum value. I have no strong preference but the weirdness will hopefully vanish soon. Janne _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] dt-bindings: i2c: apple, i2c: allow multiple compatibles 2021-11-22 17:59 ` [PATCH 2/3] dt-bindings: i2c: apple,i2c: " Janne Grunau @ 2021-11-22 20:48 ` Sven Peter 0 siblings, 0 replies; 8+ messages in thread From: Sven Peter @ 2021-11-22 20:48 UTC (permalink / raw) To: Janne Grunau Cc: Hector Martin, Alyssa Rosenzweig, Rob Herring, Wolfram Sang, Olof Johansson, Arnd Bergmann, Mark Kettenis, Rob Herring, linux-arm-kernel, linux-i2c, devicetree, linux-kernel On Mon, Nov 22, 2021, at 18:59, Janne Grunau wrote: > On 2021-11-21 21:22:47 +0100, Sven Peter wrote: >> Hi, >> >> On Sun, Nov 21, 2021, at 18:15, Janne Grunau wrote: >> > The intention was to have a SoC-specific and base compatible string >> > to allow forward compatibility and SoC specific quirks, >> > >> > Fixes: df7c4a8c1b47 ("dt-bindings: i2c: Add Apple I2C controller bindings") >> > Signed-off-by: Janne Grunau <j@jannau.net> >> > Cc: Mark Kettenis <kettenis@openbsd.org> >> > --- >> >> Yeah, this should've been "apple,t8103-i2c", "apple,i2c" all along :/ >> Given that we have no i2c nodes in the dts yet and that this binding was >> only added for -rc1 I think it's fine to just drop "apple,t8103-i2c" >> here instead of marking it as deprecated and keeping it around forever >> if Mark Kettenis also agrees. >> >> > Documentation/devicetree/bindings/i2c/apple,i2c.yaml | 9 +++++---- >> > 1 file changed, 5 insertions(+), 4 deletions(-) >> > >> > diff --git a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml >> > b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml >> > index 22fc8483256f..f1cb96c08212 100644 >> > --- a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml >> > +++ b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml >> > @@ -20,9 +20,10 @@ allOf: >> > >> > properties: >> > compatible: >> > - enum: >> > - - apple,t8103-i2c >> > - - apple,i2c >> > + items: >> > + - enum: >> > + - apple,t8103-i2c >> > + - const: apple,i2c >> >> Nit: the enum makes sense once we add t6000-i2c but right now >> >> properties: >> compatible: >> items: >> - const: apple,t8103-i2c >> - const: apple,i2c >> >> also works and look a bit less weird. > > I split it from change which in addition added "apple,t6000-i2c" as > second enum value. I have no strong preference but the weirdness will > hopefully vanish soon. I'm slightly in favor of not introducing the enum. You'd have to fix the indentation if you wanted to introduce it anyway [1] (checkpatch there also seems to complain about the commit hash for the Fixes tag but that looks like a spurious warning to me since df7c4a8c1b47 is in Linus' tree [2]): yamllint warnings/errors: ./Documentation/devicetree/bindings/i2c/apple,i2c.yaml:25:9: [warning] wrong indentation: expected 10 but found 8 (indentation) Best, Sven [1] http://patchwork.ozlabs.org/project/devicetree-bindings/patch/20211121171545.27402-3-j@jannau.net/ [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=df7c4a8c1b47 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] arm64: dts: apple: add #interrupt-cells property to pinctrl nodes 2021-11-21 17:15 [PATCH 0/3] Apple Arm patform device tree and bindings fixes Janne Grunau 2021-11-21 17:15 ` [PATCH RESEND 1/3] arm64: dts: apple: change ethernet0 device type to ethernet Janne Grunau 2021-11-21 17:15 ` [PATCH 2/3] dt-bindings: i2c: apple,i2c: allow multiple compatibles Janne Grunau @ 2021-11-21 17:15 ` Janne Grunau 2021-11-21 20:26 ` Sven Peter 2 siblings, 1 reply; 8+ messages in thread From: Janne Grunau @ 2021-11-21 17:15 UTC (permalink / raw) To: Hector Martin, Sven Peter, Alyssa Rosenzweig, Rob Herring, Linus Walleij, Mark Kettenis, Marc Zyngier Cc: linux-arm-kernel, devicetree, linux-kernel 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> --- 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] arm64: dts: apple: add #interrupt-cells property to pinctrl nodes 2021-11-21 17:15 ` [PATCH 3/3] arm64: dts: apple: add #interrupt-cells property to pinctrl nodes Janne Grunau @ 2021-11-21 20:26 ` Sven Peter 0 siblings, 0 replies; 8+ messages in thread From: Sven Peter @ 2021-11-21 20:26 UTC (permalink / raw) To: Janne Grunau, Hector Martin, Alyssa Rosenzweig, Rob Herring, Linus Walleij, Mark Kettenis, Marc Zyngier Cc: linux-arm-kernel, devicetree, linux-kernel On Sun, Nov 21, 2021, at 18:15, Janne Grunau wrote: > 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> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-11-22 20:50 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-11-21 17:15 [PATCH 0/3] Apple Arm patform device tree and bindings fixes Janne Grunau 2021-11-21 17:15 ` [PATCH RESEND 1/3] arm64: dts: apple: change ethernet0 device type to ethernet Janne Grunau 2021-11-21 17:15 ` [PATCH 2/3] dt-bindings: i2c: apple,i2c: allow multiple compatibles Janne Grunau 2021-11-21 20:22 ` [PATCH 2/3] dt-bindings: i2c: apple, i2c: " Sven Peter 2021-11-22 17:59 ` [PATCH 2/3] dt-bindings: i2c: apple,i2c: " Janne Grunau 2021-11-22 20:48 ` [PATCH 2/3] dt-bindings: i2c: apple, i2c: " Sven Peter 2021-11-21 17:15 ` [PATCH 3/3] arm64: dts: apple: add #interrupt-cells property to pinctrl nodes Janne Grunau 2021-11-21 20:26 ` Sven Peter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).