* [PATCH 0/2] Apple M1 pinctrl DT bindings
@ 2021-05-16 18:32 Mark Kettenis
2021-05-16 18:32 ` [PATCH v2 1/2] dt-bindings: pinctrl: Add DT bindings for apple,pinctrl Mark Kettenis
2021-05-16 18:32 ` [PATCH v2 2/2] arm64: apple: Add pinctrl nodes Mark Kettenis
0 siblings, 2 replies; 5+ messages in thread
From: Mark Kettenis @ 2021-05-16 18:32 UTC (permalink / raw)
To: devicetree
Cc: Mark Kettenis, Hector Martin, Linus Walleij, Rob Herring,
linux-arm-kernel, linux-gpio, linux-kernel
From: Mark Kettenis <kettenis@openbsd.org>
This small series adds bindings for the pin and GPIO controller found
on the Apple M1 SoC.
At this point, the primary consumer for these bindings is U-Boot.
With the help of these bindings U-Boot can bring up the PCIe root
complex into a state where the OS use it without having to deal with
the GPIO pins. A Linux driver may be implemented later to support
power management and/or other devices that need GPIO control. Since
the binding is based on standard pinmux node bindings this should be
relatively easy.
Changelog:
v2: - Fix typo in DT schema
Mark Kettenis (2):
dt-bindings: pinctrl: Add DT bindings for apple,pinctrl
arm64: apple: Add pinctrl nodes
.../bindings/pinctrl/apple,pinctrl.yaml | 103 ++++++++++++++++++
MAINTAINERS | 2 +
arch/arm64/boot/dts/apple/t8103.dtsi | 83 ++++++++++++++
include/dt-bindings/pinctrl/apple.h | 13 +++
4 files changed, 201 insertions(+)
create mode 100644 Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
create mode 100644 include/dt-bindings/pinctrl/apple.h
--
2.31.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] dt-bindings: pinctrl: Add DT bindings for apple,pinctrl
2021-05-16 18:32 [PATCH 0/2] Apple M1 pinctrl DT bindings Mark Kettenis
@ 2021-05-16 18:32 ` Mark Kettenis
2021-05-18 13:43 ` Rob Herring
2021-05-16 18:32 ` [PATCH v2 2/2] arm64: apple: Add pinctrl nodes Mark Kettenis
1 sibling, 1 reply; 5+ messages in thread
From: Mark Kettenis @ 2021-05-16 18:32 UTC (permalink / raw)
To: devicetree
Cc: Mark Kettenis, Hector Martin, Linus Walleij, Rob Herring,
linux-arm-kernel, linux-gpio, linux-kernel
From: Mark Kettenis <kettenis@openbsd.org>
The Apple GPIO controller is a simple combined pin and GPIO conroller
present on Apple ARM SoC platforms, including various iPhone and iPad
devices and the "Apple Silicon" Macs.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
---
.../bindings/pinctrl/apple,pinctrl.yaml | 103 ++++++++++++++++++
MAINTAINERS | 2 +
include/dt-bindings/pinctrl/apple.h | 13 +++
3 files changed, 118 insertions(+)
create mode 100644 Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
create mode 100644 include/dt-bindings/pinctrl/apple.h
diff --git a/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
new file mode 100644
index 000000000000..fae23e1d845e
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
@@ -0,0 +1,103 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/apple,pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Apple GPIO controller
+
+maintainers:
+ - Mark Kettenis <kettenis@openbsd.org>
+
+description: |
+ The Apple GPIO controller is a simple combined pin and GPIO
+ controller present on Apple ARM SoC platforms, including various
+ iPhone and iPad devices and the "Apple Silicon" Macs.
+
+properties:
+ compatible:
+ items:
+ - const: apple,t8103-pinctrl
+ - const: apple,pinctrl
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+ gpio-controller: true
+
+ '#gpio-cells':
+ const: 2
+
+ gpio-ranges:
+ maxItems: 1
+
+ interrupts:
+ minItems: 1
+ maxItems: 7
+
+ interrupt-controller: true
+
+patternProperties:
+ '-pins$':
+ type: object
+ $ref: pinmux-node.yaml#
+
+ properties:
+ pinmux:
+ description:
+ Values are constructed from pin number and alternate function
+ configuration number using the APPLE_PINMUX() helper macro
+ defined in include/dt-bindings/pinctrl/apple.h.
+
+ required:
+ - pinmux
+
+ additionalProperties: false
+
+required:
+ - compatible
+ - reg
+ - gpio-controller
+ - '#gpio-cells'
+ - gpio-ranges
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/apple-aic.h>
+ #include <dt-bindings/pinctrl/apple.h>
+
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ pinctrl: pinctrl@23c100000 {
+ compatible = "apple,t8103-pinctrl", "apple,pinctrl";
+ reg = <0x2 0x3c100000 0x0 0x100000>;
+ clocks = <&gpio_clk>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pinctrl 0 0 212>;
+
+ interrupt-controller;
+ interrupt-parent = <&aic>;
+ interrupts = <AIC_IRQ 16 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 17 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 18 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 19 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 20 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 21 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 22 IRQ_TYPE_LEVEL_HIGH>;
+
+ pcie_pins: pcie-pins {
+ pinmux = <APPLE_PINMUX(150, 1)>,
+ <APPLE_PINMUX(151, 1)>,
+ <APPLE_PINMUX(32, 1)>;
+ };
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index ad0e9be66885..7327c9b778f1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1654,9 +1654,11 @@ C: irc://chat.freenode.net/asahi-dev
T: git https://github.com/AsahiLinux/linux.git
F: Documentation/devicetree/bindings/arm/apple.yaml
F: Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
+F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
F: arch/arm64/boot/dts/apple/
F: drivers/irqchip/irq-apple-aic.c
F: include/dt-bindings/interrupt-controller/apple-aic.h
+F: include/dt-bindings/pinctrl/apple.h
ARM/ARTPEC MACHINE SUPPORT
M: Jesper Nilsson <jesper.nilsson@axis.com>
diff --git a/include/dt-bindings/pinctrl/apple.h b/include/dt-bindings/pinctrl/apple.h
new file mode 100644
index 000000000000..ea0a6f466592
--- /dev/null
+++ b/include/dt-bindings/pinctrl/apple.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR MIT */
+/*
+ * This header provides constants for Apple pinctrl bindings.
+ */
+
+#ifndef _DT_BINDINGS_PINCTRL_APPLE_H
+#define _DT_BINDINGS_PINCTRL_APPLE_H
+
+#define APPLE_PINMUX(pin, func) ((pin) | ((func) << 16))
+#define APPLE_PIN(pinmux) ((pinmux) & 0xffff)
+#define APPLE_FUNC(pinmux) ((pinmux) >> 16)
+
+#endif /* _DT_BINDINGS_PINCTRL_APPLE_H */
--
2.31.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] arm64: apple: Add pinctrl nodes
2021-05-16 18:32 [PATCH 0/2] Apple M1 pinctrl DT bindings Mark Kettenis
2021-05-16 18:32 ` [PATCH v2 1/2] dt-bindings: pinctrl: Add DT bindings for apple,pinctrl Mark Kettenis
@ 2021-05-16 18:32 ` Mark Kettenis
1 sibling, 0 replies; 5+ messages in thread
From: Mark Kettenis @ 2021-05-16 18:32 UTC (permalink / raw)
To: devicetree
Cc: Mark Kettenis, Hector Martin, Linus Walleij, Rob Herring,
linux-arm-kernel, linux-gpio, linux-kernel
From: Mark Kettenis <kettenis@openbsd.org>
Add pinctrl nodes corresponding to the gpio,t8101 nodes in the
Apple device tree for the Mac mini (M1, 2020).
Clock references are left out at the moment and will be added once
the appropriate bindings have been settled upon.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
---
arch/arm64/boot/dts/apple/t8103.dtsi | 83 ++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
index a1e22a2ea2e5..503a76fc30e6 100644
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -9,6 +9,7 @@
#include <dt-bindings/interrupt-controller/apple-aic.h>
#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/pinctrl/apple.h>
/ {
compatible = "apple,t8103", "apple,arm-platform";
@@ -131,5 +132,87 @@ aic: interrupt-controller@23b100000 {
interrupt-controller;
reg = <0x2 0x3b100000 0x0 0x8000>;
};
+
+ pinctrl_ap: pinctrl@23c100000 {
+ compatible = "apple,t8103-pinctrl", "apple,pinctrl";
+ reg = <0x2 0x3c100000 0x0 0x100000>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pinctrl_ap 0 0 212>;
+
+ interrupt-controller;
+ interrupt-parent = <&aic>;
+ interrupts = <AIC_IRQ 190 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 191 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 192 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 193 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 194 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 195 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 196 IRQ_TYPE_LEVEL_HIGH>;
+
+ pcie_pins: pcie-pins {
+ pinmux = <APPLE_PINMUX(150, 1)>,
+ <APPLE_PINMUX(151, 1)>,
+ <APPLE_PINMUX(32, 1)>;
+ };
+ };
+
+ pinctrl_aop: pinctrl@24a820000 {
+ compatible = "apple,t8103-pinctrl", "apple,pinctrl";
+ reg = <0x2 0x4a820000 0x0 0x4000>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pinctrl_aop 0 0 42>;
+
+ interrupt-controller;
+ interrupt-parent = <&aic>;
+ interrupts = <AIC_IRQ 268 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 269 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 270 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 271 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 272 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 273 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 274 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ pinctrl_nub: pinctrl@23d1f0000 {
+ compatible = "apple,t8103-pinctrl", "apple,pinctrl";
+ reg = <0x2 0x3d1f0000 0x0 0x4000>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pinctrl_nub 0 0 23>;
+
+ interrupt-controller;
+ interrupt-parent = <&aic>;
+ interrupts = <AIC_IRQ 330 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 331 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 332 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 333 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 334 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 335 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 336 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ pinctrl_smc: pinctrl@23e820000 {
+ compatible = "apple,t8103-pinctrl", "apple,pinctrl";
+ reg = <0x2 0x3e820000 0x0 0x4000>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pinctrl_smc 0 0 16>;
+
+ interrupt-controller;
+ interrupt-parent = <&aic>;
+ interrupts = <AIC_IRQ 391 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 392 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 393 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 394 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 395 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 396 IRQ_TYPE_LEVEL_HIGH>,
+ <AIC_IRQ 397 IRQ_TYPE_LEVEL_HIGH>;
+ };
};
};
--
2.31.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: pinctrl: Add DT bindings for apple,pinctrl
2021-05-16 18:32 ` [PATCH v2 1/2] dt-bindings: pinctrl: Add DT bindings for apple,pinctrl Mark Kettenis
@ 2021-05-18 13:43 ` Rob Herring
2021-05-20 11:15 ` Mark Kettenis
0 siblings, 1 reply; 5+ messages in thread
From: Rob Herring @ 2021-05-18 13:43 UTC (permalink / raw)
To: Mark Kettenis
Cc: devicetree, Mark Kettenis, Hector Martin, Linus Walleij,
linux-arm-kernel, linux-gpio, linux-kernel
On Sun, May 16, 2021 at 08:32:17PM +0200, Mark Kettenis wrote:
> From: Mark Kettenis <kettenis@openbsd.org>
>
> The Apple GPIO controller is a simple combined pin and GPIO conroller
> present on Apple ARM SoC platforms, including various iPhone and iPad
> devices and the "Apple Silicon" Macs.
>
> Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
> ---
> .../bindings/pinctrl/apple,pinctrl.yaml | 103 ++++++++++++++++++
> MAINTAINERS | 2 +
> include/dt-bindings/pinctrl/apple.h | 13 +++
> 3 files changed, 118 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
> create mode 100644 include/dt-bindings/pinctrl/apple.h
>
> diff --git a/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
> new file mode 100644
> index 000000000000..fae23e1d845e
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
> @@ -0,0 +1,103 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/pinctrl/apple,pinctrl.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Apple GPIO controller
> +
> +maintainers:
> + - Mark Kettenis <kettenis@openbsd.org>
> +
> +description: |
> + The Apple GPIO controller is a simple combined pin and GPIO
> + controller present on Apple ARM SoC platforms, including various
> + iPhone and iPad devices and the "Apple Silicon" Macs.
> +
> +properties:
> + compatible:
> + items:
> + - const: apple,t8103-pinctrl
> + - const: apple,pinctrl
> +
> + reg:
> + maxItems: 1
> +
> + clocks:
> + maxItems: 1
> +
> + gpio-controller: true
> +
> + '#gpio-cells':
> + const: 2
> +
> + gpio-ranges:
> + maxItems: 1
> +
> + interrupts:
> + minItems: 1
> + maxItems: 7
Add some description about what each interrupt is.
Is this really 1-7 or either 1 or 7?
> +
> + interrupt-controller: true
> +
> +patternProperties:
> + '-pins$':
> + type: object
> + $ref: pinmux-node.yaml#
> +
> + properties:
> + pinmux:
> + description:
> + Values are constructed from pin number and alternate function
> + configuration number using the APPLE_PINMUX() helper macro
> + defined in include/dt-bindings/pinctrl/apple.h.
> +
> + required:
> + - pinmux
> +
> + additionalProperties: false
> +
> +required:
> + - compatible
> + - reg
> + - gpio-controller
> + - '#gpio-cells'
> + - gpio-ranges
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/apple-aic.h>
> + #include <dt-bindings/pinctrl/apple.h>
> +
> + soc {
> + #address-cells = <2>;
> + #size-cells = <2>;
> +
> + pinctrl: pinctrl@23c100000 {
> + compatible = "apple,t8103-pinctrl", "apple,pinctrl";
> + reg = <0x2 0x3c100000 0x0 0x100000>;
> + clocks = <&gpio_clk>;
> +
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&pinctrl 0 0 212>;
> +
> + interrupt-controller;
> + interrupt-parent = <&aic>;
> + interrupts = <AIC_IRQ 16 IRQ_TYPE_LEVEL_HIGH>,
> + <AIC_IRQ 17 IRQ_TYPE_LEVEL_HIGH>,
> + <AIC_IRQ 18 IRQ_TYPE_LEVEL_HIGH>,
> + <AIC_IRQ 19 IRQ_TYPE_LEVEL_HIGH>,
> + <AIC_IRQ 20 IRQ_TYPE_LEVEL_HIGH>,
> + <AIC_IRQ 21 IRQ_TYPE_LEVEL_HIGH>,
> + <AIC_IRQ 22 IRQ_TYPE_LEVEL_HIGH>;
> +
> + pcie_pins: pcie-pins {
> + pinmux = <APPLE_PINMUX(150, 1)>,
> + <APPLE_PINMUX(151, 1)>,
> + <APPLE_PINMUX(32, 1)>;
> + };
> + };
> + };
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ad0e9be66885..7327c9b778f1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1654,9 +1654,11 @@ C: irc://chat.freenode.net/asahi-dev
> T: git https://github.com/AsahiLinux/linux.git
> F: Documentation/devicetree/bindings/arm/apple.yaml
> F: Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
> +F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
> F: arch/arm64/boot/dts/apple/
> F: drivers/irqchip/irq-apple-aic.c
> F: include/dt-bindings/interrupt-controller/apple-aic.h
> +F: include/dt-bindings/pinctrl/apple.h
>
> ARM/ARTPEC MACHINE SUPPORT
> M: Jesper Nilsson <jesper.nilsson@axis.com>
> diff --git a/include/dt-bindings/pinctrl/apple.h b/include/dt-bindings/pinctrl/apple.h
> new file mode 100644
> index 000000000000..ea0a6f466592
> --- /dev/null
> +++ b/include/dt-bindings/pinctrl/apple.h
> @@ -0,0 +1,13 @@
> +/* SPDX-License-Identifier: GPL-2.0+ OR MIT */
> +/*
> + * This header provides constants for Apple pinctrl bindings.
> + */
> +
> +#ifndef _DT_BINDINGS_PINCTRL_APPLE_H
> +#define _DT_BINDINGS_PINCTRL_APPLE_H
> +
> +#define APPLE_PINMUX(pin, func) ((pin) | ((func) << 16))
> +#define APPLE_PIN(pinmux) ((pinmux) & 0xffff)
> +#define APPLE_FUNC(pinmux) ((pinmux) >> 16)
> +
> +#endif /* _DT_BINDINGS_PINCTRL_APPLE_H */
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: pinctrl: Add DT bindings for apple,pinctrl
2021-05-18 13:43 ` Rob Herring
@ 2021-05-20 11:15 ` Mark Kettenis
0 siblings, 0 replies; 5+ messages in thread
From: Mark Kettenis @ 2021-05-20 11:15 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, kettenis, marcan, linus.walleij, linux-arm-kernel,
linux-gpio, linux-kernel
> Date: Tue, 18 May 2021 08:43:56 -0500
> From: Rob Herring <robh@kernel.org>
>
> On Sun, May 16, 2021 at 08:32:17PM +0200, Mark Kettenis wrote:
> > From: Mark Kettenis <kettenis@openbsd.org>
> >
> > The Apple GPIO controller is a simple combined pin and GPIO conroller
> > present on Apple ARM SoC platforms, including various iPhone and iPad
> > devices and the "Apple Silicon" Macs.
> >
> > Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
> > ---
> > .../bindings/pinctrl/apple,pinctrl.yaml | 103 ++++++++++++++++++
> > MAINTAINERS | 2 +
> > include/dt-bindings/pinctrl/apple.h | 13 +++
> > 3 files changed, 118 insertions(+)
> > create mode 100644 Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
> > create mode 100644 include/dt-bindings/pinctrl/apple.h
> >
> > diff --git a/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
> > new file mode 100644
> > index 000000000000..fae23e1d845e
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
> > @@ -0,0 +1,103 @@
> > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/pinctrl/apple,pinctrl.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: Apple GPIO controller
> > +
> > +maintainers:
> > + - Mark Kettenis <kettenis@openbsd.org>
> > +
> > +description: |
> > + The Apple GPIO controller is a simple combined pin and GPIO
> > + controller present on Apple ARM SoC platforms, including various
> > + iPhone and iPad devices and the "Apple Silicon" Macs.
> > +
> > +properties:
> > + compatible:
> > + items:
> > + - const: apple,t8103-pinctrl
> > + - const: apple,pinctrl
> > +
> > + reg:
> > + maxItems: 1
> > +
> > + clocks:
> > + maxItems: 1
> > +
> > + gpio-controller: true
> > +
> > + '#gpio-cells':
> > + const: 2
> > +
> > + gpio-ranges:
> > + maxItems: 1
> > +
> > + interrupts:
> > + minItems: 1
> > + maxItems: 7
>
> Add some description about what each interrupt is.
Will do. This aspect of the hardware is somewhat interesting. Pins
can be assigned to one of (up to 7) interrupt groups, each with their
own interrupt.
> Is this really 1-7 or either 1 or 7?
The intention is 1-7, to cater for the case where less than 7
interrupt groups are supported by a particular instance of this
hardware block. For the M1, it seems there always are 7 interrupt
groups, but I found a device tree for the iBridge2,1 where one of the
instances only supports 3 interrupt groups and therefore only provides
three interrupts.
> > +
> > + interrupt-controller: true
> > +
> > +patternProperties:
> > + '-pins$':
> > + type: object
> > + $ref: pinmux-node.yaml#
> > +
> > + properties:
> > + pinmux:
> > + description:
> > + Values are constructed from pin number and alternate function
> > + configuration number using the APPLE_PINMUX() helper macro
> > + defined in include/dt-bindings/pinctrl/apple.h.
> > +
> > + required:
> > + - pinmux
> > +
> > + additionalProperties: false
> > +
> > +required:
> > + - compatible
> > + - reg
> > + - gpio-controller
> > + - '#gpio-cells'
> > + - gpio-ranges
> > +
> > +additionalProperties: false
> > +
> > +examples:
> > + - |
> > + #include <dt-bindings/interrupt-controller/apple-aic.h>
> > + #include <dt-bindings/pinctrl/apple.h>
> > +
> > + soc {
> > + #address-cells = <2>;
> > + #size-cells = <2>;
> > +
> > + pinctrl: pinctrl@23c100000 {
> > + compatible = "apple,t8103-pinctrl", "apple,pinctrl";
> > + reg = <0x2 0x3c100000 0x0 0x100000>;
> > + clocks = <&gpio_clk>;
> > +
> > + gpio-controller;
> > + #gpio-cells = <2>;
> > + gpio-ranges = <&pinctrl 0 0 212>;
> > +
> > + interrupt-controller;
> > + interrupt-parent = <&aic>;
> > + interrupts = <AIC_IRQ 16 IRQ_TYPE_LEVEL_HIGH>,
> > + <AIC_IRQ 17 IRQ_TYPE_LEVEL_HIGH>,
> > + <AIC_IRQ 18 IRQ_TYPE_LEVEL_HIGH>,
> > + <AIC_IRQ 19 IRQ_TYPE_LEVEL_HIGH>,
> > + <AIC_IRQ 20 IRQ_TYPE_LEVEL_HIGH>,
> > + <AIC_IRQ 21 IRQ_TYPE_LEVEL_HIGH>,
> > + <AIC_IRQ 22 IRQ_TYPE_LEVEL_HIGH>;
> > +
> > + pcie_pins: pcie-pins {
> > + pinmux = <APPLE_PINMUX(150, 1)>,
> > + <APPLE_PINMUX(151, 1)>,
> > + <APPLE_PINMUX(32, 1)>;
> > + };
> > + };
> > + };
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index ad0e9be66885..7327c9b778f1 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -1654,9 +1654,11 @@ C: irc://chat.freenode.net/asahi-dev
> > T: git https://github.com/AsahiLinux/linux.git
> > F: Documentation/devicetree/bindings/arm/apple.yaml
> > F: Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
> > +F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
> > F: arch/arm64/boot/dts/apple/
> > F: drivers/irqchip/irq-apple-aic.c
> > F: include/dt-bindings/interrupt-controller/apple-aic.h
> > +F: include/dt-bindings/pinctrl/apple.h
> >
> > ARM/ARTPEC MACHINE SUPPORT
> > M: Jesper Nilsson <jesper.nilsson@axis.com>
> > diff --git a/include/dt-bindings/pinctrl/apple.h b/include/dt-bindings/pinctrl/apple.h
> > new file mode 100644
> > index 000000000000..ea0a6f466592
> > --- /dev/null
> > +++ b/include/dt-bindings/pinctrl/apple.h
> > @@ -0,0 +1,13 @@
> > +/* SPDX-License-Identifier: GPL-2.0+ OR MIT */
> > +/*
> > + * This header provides constants for Apple pinctrl bindings.
> > + */
> > +
> > +#ifndef _DT_BINDINGS_PINCTRL_APPLE_H
> > +#define _DT_BINDINGS_PINCTRL_APPLE_H
> > +
> > +#define APPLE_PINMUX(pin, func) ((pin) | ((func) << 16))
> > +#define APPLE_PIN(pinmux) ((pinmux) & 0xffff)
> > +#define APPLE_FUNC(pinmux) ((pinmux) >> 16)
> > +
> > +#endif /* _DT_BINDINGS_PINCTRL_APPLE_H */
> > --
> > 2.31.1
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-20 11:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-16 18:32 [PATCH 0/2] Apple M1 pinctrl DT bindings Mark Kettenis
2021-05-16 18:32 ` [PATCH v2 1/2] dt-bindings: pinctrl: Add DT bindings for apple,pinctrl Mark Kettenis
2021-05-18 13:43 ` Rob Herring
2021-05-20 11:15 ` Mark Kettenis
2021-05-16 18:32 ` [PATCH v2 2/2] arm64: apple: Add pinctrl nodes Mark Kettenis
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).