lkml.org 
[lkml]   [2021]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[irqchip: irq/irqchip-next] irqchip/irq-bcm7120-l2: Switch to IRQCHIP_PLATFORM_DRIVER
    The following commit has been merged into the irq/irqchip-next branch of irqchip:

    Commit-ID: 3ac268d5ed2233d4a2db541d8fd744ccc13f46b0
    Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/3ac268d5ed2233d4a2db541d8fd744ccc13f46b0
    Author: Florian Fainelli <f.fainelli@gmail.com>
    AuthorDate: Wed, 20 Oct 2021 11:48:56 -07:00
    Committer: Marc Zyngier <maz@kernel.org>
    CommitterDate: Wed, 20 Oct 2021 20:06:34 +01:00

    irqchip/irq-bcm7120-l2: Switch to IRQCHIP_PLATFORM_DRIVER

    Allow the user selection and building of this interrupt controller
    driver as a module since it is used on ARM/ARM64 based systems as a
    second level interrupt controller hanging off the ARM GIC and is
    therefore loadable during boot.

    To avoid using of_irq_count() which is not exported towards module,
    switch the driver to use the platform_device provided by the irqchip
    platform driver code and resolve the number of interrupts using
    platform_irq_count().

    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Marc Zyngier <maz@kernel.org>
    Link: https://lore.kernel.org/r/20211020184859.2705451-11-f.fainelli@gmail.com
    ---
    drivers/irqchip/Kconfig | 4 +++-
    drivers/irqchip/irq-bcm7120-l2.c | 21 +++++++++++++++------
    2 files changed, 18 insertions(+), 7 deletions(-)

    diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
    index 30018cc..b2f483b 100644
    --- a/drivers/irqchip/Kconfig
    +++ b/drivers/irqchip/Kconfig
    @@ -123,7 +123,9 @@ config BCM7038_L1_IRQ
    select GENERIC_IRQ_EFFECTIVE_AFF_MASK

    config BCM7120_L2_IRQ
    - bool
    + tristate "Broadcom STB 7120-style L2 interrupt controller driver"
    + depends on ARCH_BRCMSTB || BMIPS_GENERIC
    + default ARCH_BRCMSTB || BMIPS_GENERIC
    select GENERIC_IRQ_CHIP
    select IRQ_DOMAIN

    diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
    index f23d765..d80e67a 100644
    --- a/drivers/irqchip/irq-bcm7120-l2.c
    +++ b/drivers/irqchip/irq-bcm7120-l2.c
    @@ -220,6 +220,7 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn,
    {
    unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
    struct bcm7120_l2_intc_data *data;
    + struct platform_device *pdev;
    struct irq_chip_generic *gc;
    struct irq_chip_type *ct;
    int ret = 0;
    @@ -230,7 +231,13 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn,
    if (!data)
    return -ENOMEM;

    - data->num_parent_irqs = of_irq_count(dn);
    + pdev = of_find_device_by_node(dn);
    + if (!pdev) {
    + ret = -ENODEV;
    + goto out_free_data;
    + }
    +
    + data->num_parent_irqs = platform_irq_count(pdev);
    if (data->num_parent_irqs <= 0) {
    pr_err("invalid number of parent interrupts\n");
    ret = -ENOMEM;
    @@ -329,6 +336,7 @@ out_unmap:
    if (data->map_base[idx])
    iounmap(data->map_base[idx]);
    }
    +out_free_data:
    kfree(data);
    return ret;
    }
    @@ -347,8 +355,9 @@ static int __init bcm7120_l2_intc_probe_3380(struct device_node *dn,
    "BCM3380 L2");
    }

    -IRQCHIP_DECLARE(bcm7120_l2_intc, "brcm,bcm7120-l2-intc",
    - bcm7120_l2_intc_probe_7120);
    -
    -IRQCHIP_DECLARE(bcm3380_l2_intc, "brcm,bcm3380-l2-intc",
    - bcm7120_l2_intc_probe_3380);
    +IRQCHIP_PLATFORM_DRIVER_BEGIN(bcm7120_l2)
    +IRQCHIP_MATCH("brcm,bcm7120-l2-intc", bcm7120_l2_intc_probe_7120)
    +IRQCHIP_MATCH("brcm,bcm3380-l2-intc", bcm7120_l2_intc_probe_3380)
    +IRQCHIP_PLATFORM_DRIVER_END(bcm7120_l2)
    +MODULE_DESCRIPTION("Broadcom STB 7120-style L2 interrupt controller driver");
    +MODULE_LICENSE("GPL v2");
    \
     
     \ /
      Last update: 2021-10-20 23:13    [W:2.166 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site