Commit c51e96da authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch irq/irqchip-driver-updates into irq/irqchip-next 

Various minor irqchip driver updates:

- QC PDC now compiles as a module
- HiSilicon MBIGEN fix for compile-time warning when !ACPI

* irq/irqchip-driver-updates:
  irqchip/mbigen: Fix compile warning when CONFIG_ACPI is disabled
  irqchip/qcom-pdc: Switch to IRQCHIP_PLATFORM_DRIVER and allow as a module
parents c64638d5 c96d6abb

drivers/irqchip/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ config GOLDFISH_PIC 
         for Goldfish based virtual platforms.



config QCOM_PDC

	bool "QCOM PDC"

	tristate "QCOM PDC"

	depends on ARCH_QCOM

	select IRQ_DOMAIN_HIERARCHY

	help

drivers/irqchip/irq-mbigen.c

+6 −6
Original line number Diff line number Diff line
@@ -273,6 +273,12 @@ static int mbigen_of_create_domain(struct platform_device *pdev, 
}



#ifdef CONFIG_ACPI

static const struct acpi_device_id mbigen_acpi_match[] = {

	{ "HISI0152", 0 },

	{}

};

MODULE_DEVICE_TABLE(acpi, mbigen_acpi_match);



static int mbigen_acpi_create_domain(struct platform_device *pdev,

				     struct mbigen_device *mgn_chip)

{
@@ -369,12 +375,6 @@ static const struct of_device_id mbigen_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, mbigen_of_match);



static const struct acpi_device_id mbigen_acpi_match[] = {

	{ "HISI0152", 0 },

	{}

};

MODULE_DEVICE_TABLE(acpi, mbigen_acpi_match);



static struct platform_driver mbigen_platform_driver = {

	.driver = {

		.name		= "Hisilicon MBIGEN-V2",

drivers/irqchip/qcom-pdc.c

+7 −1
Original line number Diff line number Diff line
@@ -11,9 +11,11 @@ 
#include <linux/irqdomain.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/soc/qcom/irq.h>

#include <linux/spinlock.h>

#include <linux/slab.h>
@@ -459,4 +461,8 @@ static int qcom_pdc_init(struct device_node *node, struct device_node *parent) 
	return ret;

}



IRQCHIP_DECLARE(qcom_pdc, "qcom,pdc", qcom_pdc_init);
 
IRQCHIP_PLATFORM_DRIVER_BEGIN(qcom_pdc)

IRQCHIP_MATCH("qcom,pdc", qcom_pdc_init)

IRQCHIP_PLATFORM_DRIVER_END(qcom_pdc)

MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Power Domain Controller");

MODULE_LICENSE("GPL v2");