Commit 82b719b1 authored by Mark Brown's avatar Mark Brown
Browse files

mfd: Revert "mfd: add irq domain support for max8997 interrupts" 



This reverts commit 98d8618a as it
breaks the build of the muic driver.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 575f690d

arch/arm/mach-exynos/mach-nuri.c

+4 −0
Original line number Diff line number Diff line
@@ -1079,8 +1079,12 @@ static struct platform_device nuri_max8903_device = { 
static void __init nuri_power_init(void)

{

	int gpio;

	int irq_base = IRQ_GPIO_END + 1;

	int ta_en = 0;



	nuri_max8997_pdata.irq_base = irq_base;

	irq_base += MAX8997_IRQ_NR;



	gpio = EXYNOS4_GPX0(7);

	gpio_request(gpio, "AP_PMIC_IRQ");

	s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf));

arch/arm/mach-exynos/mach-origen.c

+1 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ static struct max8997_platform_data __initdata origen_max8997_pdata = { 
	.buck1_gpiodvs	= false,

	.buck2_gpiodvs	= false,

	.buck5_gpiodvs	= false,

	.irq_base	= IRQ_GPIO_END + 1,



	.ignore_gpiodvs_side_effect = true,

	.buck125_default_idx = 0x0,

drivers/mfd/max8997-irq.c

+25 −36
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ static void max8997_irq_sync_unlock(struct irq_data *data) 
static const inline struct max8997_irq_data *

irq_to_max8997_irq(struct max8997_dev *max8997, int irq)

{

	struct irq_data *data = irq_get_irq_data(irq);

	return &max8997_irqs[data->hwirq];

	return &max8997_irqs[irq - max8997->irq_base];

}



static void max8997_irq_mask(struct irq_data *data)
@@ -183,7 +182,7 @@ static irqreturn_t max8997_irq_thread(int irq, void *data) 
	u8 irq_reg[MAX8997_IRQ_GROUP_NR] = {};

	u8 irq_src;

	int ret;

	int i, cur_irq;

	int i;



	ret = max8997_read_reg(max8997->i2c, MAX8997_REG_INTSRC, &irq_src);

	if (ret < 0) {
@@ -270,11 +269,8 @@ static irqreturn_t max8997_irq_thread(int irq, void *data) 


	/* Report */

	for (i = 0; i < MAX8997_IRQ_NR; i++) {

		if (irq_reg[max8997_irqs[i].group] & max8997_irqs[i].mask) {

			cur_irq = irq_find_mapping(max8997->irq_domain, i);

			if (cur_irq)

				handle_nested_irq(cur_irq);

		}

		if (irq_reg[max8997_irqs[i].group] & max8997_irqs[i].mask)

			handle_nested_irq(max8997->irq_base + i);

	}



	return IRQ_HANDLED;
@@ -282,40 +278,26 @@ static irqreturn_t max8997_irq_thread(int irq, void *data) 


int max8997_irq_resume(struct max8997_dev *max8997)

{

	if (max8997->irq && max8997->irq_domain)

		max8997_irq_thread(0, max8997);

	return 0;

}



static int max8997_irq_domain_map(struct irq_domain *d, unsigned int irq,

					irq_hw_number_t hw)

{

	struct max8997_dev *max8997 = d->host_data;



	irq_set_chip_data(irq, max8997);

	irq_set_chip_and_handler(irq, &max8997_irq_chip, handle_edge_irq);

	irq_set_nested_thread(irq, 1);

#ifdef CONFIG_ARM

	set_irq_flags(irq, IRQF_VALID);

#else

	irq_set_noprobe(irq);

#endif

	if (max8997->irq && max8997->irq_base)

		max8997_irq_thread(max8997->irq_base, max8997);

	return 0;

}



static struct irq_domain_ops max8997_irq_domain_ops = {

	.map = max8997_irq_domain_map,

};



int max8997_irq_init(struct max8997_dev *max8997)

{

	struct irq_domain *domain;

	int i;

	int cur_irq;

	int ret;

	u8 val;



	if (!max8997->irq) {

		dev_warn(max8997->dev, "No interrupt specified.\n");

		max8997->irq_base = 0;

		return 0;

	}



	if (!max8997->irq_base) {

		dev_err(max8997->dev, "No interrupt base specified.\n");

		return 0;

	}
@@ -345,11 +327,18 @@ int max8997_irq_init(struct max8997_dev *max8997) 
					true : false;

	}



	domain = irq_domain_add_linear(NULL, MAX8997_IRQ_NR,

					&max8997_irq_domain_ops, &max8997);

	if (!domain) {

		dev_err(max8997->dev, "could not create irq domain\n");

		return -ENODEV;

	/* Register with genirq */

	for (i = 0; i < MAX8997_IRQ_NR; i++) {

		cur_irq = i + max8997->irq_base;

		irq_set_chip_data(cur_irq, max8997);

		irq_set_chip_and_handler(cur_irq, &max8997_irq_chip,

				handle_edge_irq);

		irq_set_nested_thread(cur_irq, 1);

#ifdef CONFIG_ARM

		set_irq_flags(cur_irq, IRQF_VALID);

#else

		irq_set_noprobe(cur_irq);

#endif

	}



	ret = request_threaded_irq(max8997->irq, NULL, max8997_irq_thread,

drivers/mfd/max8997.c

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c, 
	if (!pdata)

		goto err;



	max8997->irq_base = pdata->irq_base;

	max8997->ono = pdata->ono;



	mutex_init(&max8997->iolock);

include/linux/mfd/max8997-private.h

+1 −3
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#define __LINUX_MFD_MAX8997_PRIV_H



#include <linux/i2c.h>

#include <linux/export.h>

#include <linux/irqdomain.h>



#define MAX8997_REG_INVALID	(0xff)
@@ -327,7 +325,7 @@ struct max8997_dev { 


	int irq;

	int ono;

	struct irq_domain *irq_domain;

	int irq_base;

	struct mutex irqlock;

	int irq_masks_cur[MAX8997_IRQ_GROUP_NR];

	int irq_masks_cache[MAX8997_IRQ_GROUP_NR];