Skip to content

Commit 4acd8a4

Browse files
Saravana KannanMarc Zyngier
authored andcommitted
irqchip/qcom-pdc: Switch to IRQCHIP_PLATFORM_DRIVER and allow as a module
This patch revives changes from Saravana Kannan to switch the qcom-pdc driver to use IRQCHIP_PLATFORM_DRIVER helper macros, and allows qcom-pdc driver to be loaded as a permanent module. Earlier attempts at this ran into trouble with loading dependencies, but with Saravana's fw_devlink=on set by default now we should avoid those. [jstultz: Folded in with my changes to allow the driver to be loadable as a permenent module] Cc: Andy Gross <agross@kernel.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Joerg Roedel <joro@8bytes.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <maz@kernel.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Maulik Shah <mkshah@codeaurora.org> Cc: Lina Iyer <ilina@codeaurora.org> Cc: Saravana Kannan <saravanak@google.com> Cc: Todd Kjos <tkjos@google.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-arm-msm@vger.kernel.org Cc: iommu@lists.linux-foundation.org Cc: linux-gpio@vger.kernel.org Signed-off-by: Saravana Kannan <saravanak@google.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20210518211922.3474368-1-john.stultz@linaro.org
1 parent 8124c8a commit 4acd8a4

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

drivers/irqchip/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ config GOLDFISH_PIC
415415
for Goldfish based virtual platforms.
416416

417417
config QCOM_PDC
418-
bool "QCOM PDC"
418+
tristate "QCOM PDC"
419419
depends on ARCH_QCOM
420420
select IRQ_DOMAIN_HIERARCHY
421421
help

drivers/irqchip/qcom-pdc.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
#include <linux/irqdomain.h>
1212
#include <linux/io.h>
1313
#include <linux/kernel.h>
14+
#include <linux/module.h>
1415
#include <linux/of.h>
1516
#include <linux/of_address.h>
1617
#include <linux/of_device.h>
18+
#include <linux/of_irq.h>
1719
#include <linux/soc/qcom/irq.h>
1820
#include <linux/spinlock.h>
1921
#include <linux/slab.h>
@@ -459,4 +461,8 @@ static int qcom_pdc_init(struct device_node *node, struct device_node *parent)
459461
return ret;
460462
}
461463

462-
IRQCHIP_DECLARE(qcom_pdc, "qcom,pdc", qcom_pdc_init);
464+
IRQCHIP_PLATFORM_DRIVER_BEGIN(qcom_pdc)
465+
IRQCHIP_MATCH("qcom,pdc", qcom_pdc_init)
466+
IRQCHIP_PLATFORM_DRIVER_END(qcom_pdc)
467+
MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Power Domain Controller");
468+
MODULE_LICENSE("GPL v2");

0 commit comments

Comments
 (0)