From 1d4900ea6c8ab3e35fa6c0861d83adf0320a2a33 Mon Sep 17 00:00:00 2001 From: Xingyu Chen Date: Mon, 18 Jun 2018 14:45:20 +0800 Subject: [PATCH] irqchip: meson: add gpio IRQ support for txl PD#168480: irqchip: meson: add gpio IRQ support for txl Change-Id: I03b32a3ffe4a7e9b63631ac5e593bcbf346b8765 Signed-off-by: Xingyu Chen Signed-off-by: Bo Yang --- .../interrupt-controller/amlogic,meson-gpio-intc.txt | 1 + drivers/amlogic/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 01a587341449..284a36c2ea4c 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt @@ -17,6 +17,7 @@ Required properties: “amlogic,meson-axg-gpio-intc” for AXG SoCs (A113G, A113D) or “amlogic,meson-txlx-gpio-intc” for TXLX SoCs (T962X, T962E) “amlogic,meson-g12a-gpio-intc” for G12A SoCs (S905D2, S905X2, S905Y2) + “amlogic,meson-txl-gpio-intc” for TXL SoCs (T950, T952, T960, T962) - interrupt-parent : a phandle to the GIC the interrupts are routed to. Usually this is provided at the root level of the device tree as it is common to most of the SoC. diff --git a/drivers/amlogic/irqchip/irq-meson-gpio.c b/drivers/amlogic/irqchip/irq-meson-gpio.c index a9719c4b7971..a4ff87709615 100644 --- a/drivers/amlogic/irqchip/irq-meson-gpio.c +++ b/drivers/amlogic/irqchip/irq-meson-gpio.c @@ -75,6 +75,10 @@ static const struct meson_gpio_irq_params g12a_params = { .nr_hwirq = 100, }; +static const struct meson_gpio_irq_params txl_params = { + .nr_hwirq = 93, +}; + 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 }, @@ -83,6 +87,7 @@ static const struct of_device_id meson_irq_gpio_matches[] = { { .compatible = "amlogic,meson-axg-gpio-intc", .data = &axg_params }, { .compatible = "amlogic,meson-txlx-gpio-intc", .data = &txlx_params }, { .compatible = "amlogic,meson-g12a-gpio-intc", .data = &g12a_params }, + { .compatible = "amlogic,meson-txl-gpio-intc", .data = &txl_params }, { } };