[PATCH 0/3] Meson8 GPIO interrupt support

[PATCH 0/3] Meson8 GPIO interrupt support

[Martin Blumenstingl]

This is a simple follow-up of two series from Jerome:
- "irqchip: meson: add support for the gpio interrupt controller"
- "ARM: meson: enable gpio interrupt controller"

This fills in the missing bits to have GPIO interrupt support on Meson8,
which includes:
- a new binding in the driver with the correct IRQ number
- enabling the GPIO interrupt controller in meson8.dts
- enabling the GPIO interrupt controller via Kconfig for MACH_MESON8


Martin Blumenstingl (3):
  irqchip/meson-gpio: add support for Meson8 SoCs
  ARM: dts: meson8: enable the GPIO interrupt controller
  ARM: meson: enable MESON_IRQ_GPIO also for MACH_MESON8

 .../bindings/interrupt-controller/amlogic,meson-gpio-intc.txt        | 1 +
 arch/arm/boot/dts/meson8.dtsi                                        | 5 +++++
 arch/arm/mach-meson/Kconfig                                          | 1 +
 drivers/irqchip/irq-meson-gpio.c                                     | 5 +++++
 4 files changed, 12 insertions(+)

-- 
2.14.3

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/3] irqchip/meson-gpio: add support for Meson8 SoCs

[Martin Blumenstingl]

Meson8 uses the same GPIO interrupt controller IP block as the other
Meson SoCs. A total of 134 pins can be spied on, which is the sum of:
- 22 pins on bank GPIOX
- 17 pins on bank GPIOY
- 30 pins on bank GPIODV
- 10 pins on bank GPIOH
- 15 pins on bank GPIOZ
- 7 pins on bank CARD
- 19 pins on bank BOOT
- 14 pins in the AO domain

Signed-off-by: Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
---
 .../bindings/interrupt-controller/amlogic,meson-gpio-intc.txt        | 1 +
 drivers/irqchip/irq-meson-gpio.c                                     | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
index 633e21ce4b17..a83f9a5734ca 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
@@ -10,6 +10,7 @@ number of interrupt exposed depends on the SoC.
 Required properties:
 
 - compatible : must have "amlogic,meson8-gpio-intc” and either
+   “amlogic,meson8-gpio-intc” for meson8 SoCs (S802) or
    “amlogic,meson8b-gpio-intc” for meson8b SoCs (S805) or
    “amlogic,meson-gxbb-gpio-intc” for GXBB SoCs (S905) or
    “amlogic,meson-gxl-gpio-intc” for GXL SoCs (S905X, S912)
diff --git a/drivers/irqchip/irq-meson-gpio.c b/drivers/irqchip/irq-meson-gpio.c
index c7cc7e37a23c..a59bdbc0b9bb 100644
--- a/drivers/irqchip/irq-meson-gpio.c
+++ b/drivers/irqchip/irq-meson-gpio.c
@@ -47,6 +47,10 @@ struct meson_gpio_irq_params {
 	unsigned int nr_hwirq;
 };
 
+static const struct meson_gpio_irq_params meson8_params = {
+	.nr_hwirq = 134,
+};
+
 static const struct meson_gpio_irq_params meson8b_params = {
 	.nr_hwirq = 119,
 };
@@ -60,6 +64,7 @@ static const struct meson_gpio_irq_params gxl_params = {
 };
 
 static const struct of_device_id meson_irq_gpio_matches[] = {
+	{ .compatible = "amlogic,meson8-gpio-intc", .data = &meson8_params },
 	{ .compatible = "amlogic,meson8b-gpio-intc", .data = &meson8b_params },
 	{ .compatible = "amlogic,meson-gxbb-gpio-intc", .data = &gxbb_params },
 	{ .compatible = "amlogic,meson-gxl-gpio-intc", .data = &gxl_params },
-- 
2.14.3

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/3] ARM: dts: meson8: enable the GPIO interrupt controller

[Martin Blumenstingl]

This enables the GPIO interrupt controller for the Meson8 SoCs.
Interrupt support on the GPIOs can be used by the MMC framework to
detect when an SD card is inserted/removed or by the input framework to
detect button presses.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
---
 arch/arm/boot/dts/meson8.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
index eb3f8161eef0..bedcbebc2433 100644
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -286,6 +286,11 @@
 	clock-names = "stmmaceth";
 };
 
+&gpio_intc {
+	compatible = "amlogic,meson8-gpio-intc", "amlogic,meson-gpio-intc";
+	status = "okay";
+};
+
 &hwrng {
 	compatible = "amlogic,meson8-rng", "amlogic,meson-rng";
 	clocks = <&clkc CLKID_RNG0>;
-- 
2.14.3

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/3] ARM: meson: enable MESON_IRQ_GPIO also for MACH_MESON8

[Martin Blumenstingl]

Now that the GPIO interrupt controller also supports the Meson8 SoCs we
can enable it via Kconfig.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
---
 arch/arm/mach-meson/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index aff6164b2083..d90f61e6254f 100644
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -23,6 +23,7 @@ config MACH_MESON8
 	default ARCH_MESON
 	select MESON6_TIMER
 	select COMMON_CLK_MESON8B
+	select MESON_IRQ_GPIO
 
 config MACH_MESON8B
 	bool "Amlogic Meson8b SoCs support"
-- 
2.14.3

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/3] Meson8 GPIO interrupt support

[Marc Zyngier]

On Mon, Oct 30 2017 at 12:05:20 am GMT, Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> wrote:
> This is a simple follow-up of two series from Jerome:
> - "irqchip: meson: add support for the gpio interrupt controller"
> - "ARM: meson: enable gpio interrupt controller"
>
> This fills in the missing bits to have GPIO interrupt support on Meson8,
> which includes:
> - a new binding in the driver with the correct IRQ number
> - enabling the GPIO interrupt controller in meson8.dts
> - enabling the GPIO interrupt controller via Kconfig for MACH_MESON8
>
>
> Martin Blumenstingl (3):
>   irqchip/meson-gpio: add support for Meson8 SoCs
>   ARM: dts: meson8: enable the GPIO interrupt controller
>   ARM: meson: enable MESON_IRQ_GPIO also for MACH_MESON8
>
>  .../bindings/interrupt-controller/amlogic,meson-gpio-intc.txt        | 1 +
>  arch/arm/boot/dts/meson8.dtsi                                        | 5 +++++
>  arch/arm/mach-meson/Kconfig                                          | 1 +
>  drivers/irqchip/irq-meson-gpio.c                                     | 5 +++++
>  4 files changed, 12 insertions(+)

Kevin, Carlos: Are you OK with this one? It seems pretty minor, and I'm
happy to queue it if I get an Ack for it. If you'd rather get it through
via armsoc, let me know.

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/3] Meson8 GPIO interrupt support

[Kevin Hilman]

Marc Zyngier <marc.zyngier-5wv7dgnIgG8@public.gmane.org> writes:

> On Mon, Oct 30 2017 at 12:05:20 am GMT, Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> wrote:
>> This is a simple follow-up of two series from Jerome:
>> - "irqchip: meson: add support for the gpio interrupt controller"
>> - "ARM: meson: enable gpio interrupt controller"
>>
>> This fills in the missing bits to have GPIO interrupt support on Meson8,
>> which includes:
>> - a new binding in the driver with the correct IRQ number
>> - enabling the GPIO interrupt controller in meson8.dts
>> - enabling the GPIO interrupt controller via Kconfig for MACH_MESON8
>>
>>
>> Martin Blumenstingl (3):
>>   irqchip/meson-gpio: add support for Meson8 SoCs
>>   ARM: dts: meson8: enable the GPIO interrupt controller
>>   ARM: meson: enable MESON_IRQ_GPIO also for MACH_MESON8
>>
>>  .../bindings/interrupt-controller/amlogic,meson-gpio-intc.txt        | 1 +
>>  arch/arm/boot/dts/meson8.dtsi                                        | 5 +++++
>>  arch/arm/mach-meson/Kconfig                                          | 1 +
>>  drivers/irqchip/irq-meson-gpio.c                                     | 5 +++++
>>  4 files changed, 12 insertions(+)
>
> Kevin, Carlos: Are you OK with this one? It seems pretty minor, and I'm
> happy to queue it if I get an Ack for it. If you'd rather get it through
> via armsoc, let me know.

Can you take the drivers/irqchip and bindings patch (PATCH 1/3) and I'll
take the rest to avoid conflicts with a bunch of other moving parts we
have in arch/arm.

For the driver, feel free to add

Acked-by: Kevin Hilman <khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>

Kevin


--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/3] Meson8 GPIO interrupt support

[Marc Zyngier]

On Tue, Oct 31 2017 at 11:13:57 am GMT, Kevin Hilman <khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> wrote:
> Marc Zyngier <marc.zyngier-5wv7dgnIgG8@public.gmane.org> writes:
>
>> On Mon, Oct 30 2017 at 12:05:20 am GMT, Martin Blumenstingl
>> <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> wrote:
>>> This is a simple follow-up of two series from Jerome:
>>> - "irqchip: meson: add support for the gpio interrupt controller"
>>> - "ARM: meson: enable gpio interrupt controller"
>>>
>>> This fills in the missing bits to have GPIO interrupt support on Meson8,
>>> which includes:
>>> - a new binding in the driver with the correct IRQ number
>>> - enabling the GPIO interrupt controller in meson8.dts
>>> - enabling the GPIO interrupt controller via Kconfig for MACH_MESON8
>>>
>>>
>>> Martin Blumenstingl (3):
>>>   irqchip/meson-gpio: add support for Meson8 SoCs
>>>   ARM: dts: meson8: enable the GPIO interrupt controller
>>>   ARM: meson: enable MESON_IRQ_GPIO also for MACH_MESON8
>>>
>>>  .../bindings/interrupt-controller/amlogic,meson-gpio-intc.txt        | 1 +
>>>  arch/arm/boot/dts/meson8.dtsi                                        | 5 +++++
>>>  arch/arm/mach-meson/Kconfig                                          | 1 +
>>>  drivers/irqchip/irq-meson-gpio.c                                     | 5 +++++
>>>  4 files changed, 12 insertions(+)
>>
>> Kevin, Carlos: Are you OK with this one? It seems pretty minor, and I'm
>> happy to queue it if I get an Ack for it. If you'd rather get it through
>> via armsoc, let me know.
>
> Can you take the drivers/irqchip and bindings patch (PATCH 1/3) and I'll
> take the rest to avoid conflicts with a bunch of other moving parts we
> have in arch/arm.

Sure, no problem.

> For the driver, feel free to add
>
> Acked-by: Kevin Hilman <khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] irqchip/meson-gpio: add support for Meson8 SoCs

[Rob Herring]

On Mon, Oct 30, 2017 at 12:05:21AM +0100, Martin Blumenstingl wrote:
> Meson8 uses the same GPIO interrupt controller IP block as the other
> Meson SoCs. A total of 134 pins can be spied on, which is the sum of:
> - 22 pins on bank GPIOX
> - 17 pins on bank GPIOY
> - 30 pins on bank GPIODV
> - 10 pins on bank GPIOH
> - 15 pins on bank GPIOZ
> - 7 pins on bank CARD
> - 19 pins on bank BOOT
> - 14 pins in the AO domain
> 
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
> ---
>  .../bindings/interrupt-controller/amlogic,meson-gpio-intc.txt        | 1 +
>  drivers/irqchip/irq-meson-gpio.c                                     | 5 +++++
>  2 files changed, 6 insertions(+)

Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/3] Meson8 GPIO interrupt support

[Martin Blumenstingl]

Hi Kevin,

On Tue, Oct 31, 2017 at 11:13 AM, Kevin Hilman <khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> wrote:
> Marc Zyngier <marc.zyngier-5wv7dgnIgG8@public.gmane.org> writes:
>
>> On Mon, Oct 30 2017 at 12:05:20 am GMT, Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> wrote:
>>> This is a simple follow-up of two series from Jerome:
>>> - "irqchip: meson: add support for the gpio interrupt controller"
>>> - "ARM: meson: enable gpio interrupt controller"
>>>
>>> This fills in the missing bits to have GPIO interrupt support on Meson8,
>>> which includes:
>>> - a new binding in the driver with the correct IRQ number
>>> - enabling the GPIO interrupt controller in meson8.dts
>>> - enabling the GPIO interrupt controller via Kconfig for MACH_MESON8
>>>
>>>
>>> Martin Blumenstingl (3):
>>>   irqchip/meson-gpio: add support for Meson8 SoCs
>>>   ARM: dts: meson8: enable the GPIO interrupt controller
>>>   ARM: meson: enable MESON_IRQ_GPIO also for MACH_MESON8
>>>
>>>  .../bindings/interrupt-controller/amlogic,meson-gpio-intc.txt        | 1 +
>>>  arch/arm/boot/dts/meson8.dtsi                                        | 5 +++++
>>>  arch/arm/mach-meson/Kconfig                                          | 1 +
>>>  drivers/irqchip/irq-meson-gpio.c                                     | 5 +++++
>>>  4 files changed, 12 insertions(+)
>>
>> Kevin, Carlos: Are you OK with this one? It seems pretty minor, and I'm
>> happy to queue it if I get an Ack for it. If you'd rather get it through
>> via armsoc, let me know.
>
> Can you take the drivers/irqchip and bindings patch (PATCH 1/3) and I'll
> take the rest to avoid conflicts with a bunch of other moving parts we
> have in arch/arm.
PATCH 1/3 even made it into v4.15
can you please queue the remaining two patches for v4.16 - or do you
want me to re-send these?


thank you!
Martin
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/3] Meson8 GPIO interrupt support

[Kevin Hilman]

Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> writes:

> Hi Kevin,
>
> On Tue, Oct 31, 2017 at 11:13 AM, Kevin Hilman <khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> wrote:
>> Marc Zyngier <marc.zyngier-5wv7dgnIgG8@public.gmane.org> writes:
>>
>>> On Mon, Oct 30 2017 at 12:05:20 am GMT, Martin Blumenstingl <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> wrote:
>>>> This is a simple follow-up of two series from Jerome:
>>>> - "irqchip: meson: add support for the gpio interrupt controller"
>>>> - "ARM: meson: enable gpio interrupt controller"
>>>>
>>>> This fills in the missing bits to have GPIO interrupt support on Meson8,
>>>> which includes:
>>>> - a new binding in the driver with the correct IRQ number
>>>> - enabling the GPIO interrupt controller in meson8.dts
>>>> - enabling the GPIO interrupt controller via Kconfig for MACH_MESON8
>>>>
>>>>
>>>> Martin Blumenstingl (3):
>>>>   irqchip/meson-gpio: add support for Meson8 SoCs
>>>>   ARM: dts: meson8: enable the GPIO interrupt controller
>>>>   ARM: meson: enable MESON_IRQ_GPIO also for MACH_MESON8
>>>>
>>>>  .../bindings/interrupt-controller/amlogic,meson-gpio-intc.txt        | 1 +
>>>>  arch/arm/boot/dts/meson8.dtsi                                        | 5 +++++
>>>>  arch/arm/mach-meson/Kconfig                                          | 1 +
>>>>  drivers/irqchip/irq-meson-gpio.c                                     | 5 +++++
>>>>  4 files changed, 12 insertions(+)
>>>
>>> Kevin, Carlos: Are you OK with this one? It seems pretty minor, and I'm
>>> happy to queue it if I get an Ack for it. If you'd rather get it through
>>> via armsoc, let me know.
>>
>> Can you take the drivers/irqchip and bindings patch (PATCH 1/3) and I'll
>> take the rest to avoid conflicts with a bunch of other moving parts we
>> have in arch/arm.
> PATCH 1/3 even made it into v4.15
> can you please queue the remaining two patches for v4.16 - or do you
> want me to re-send these?

No need to resend, I've applied them to v4.16/dt.

Thanks for following up.

Kevin
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html