Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15e27b10 authored by Lee Jones's avatar Lee Jones Committed by Samuel Ortiz
Browse files

mfd: Provide the tc3589x with its own IRQ domain 



In preparation for Device Tree enablement all IRQ controllers
should control their own IRQ domain. This patch provides just
that.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 8d249378

drivers/mfd/tc3589x.c

+47 −26
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/mfd/core.h>

#include <linux/mfd/core.h>
@@ -168,8 +169,9 @@ static irqreturn_t tc3589x_irq(int irq, void *data) 




	while (status) {

	while (status) {

		int bit = __ffs(status);

		int bit = __ffs(status);

		int virq = irq_create_mapping(tc3589x->domain, bit);





		handle_nested_irq(tc3589x->irq_base + bit);

		handle_nested_irq(virq);

		status &= ~(1 << bit);

		status &= ~(1 << bit);

	}

	}
@@ -186,38 +188,60 @@ static irqreturn_t tc3589x_irq(int irq, void *data) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}





static int tc3589x_irq_init(struct tc3589x *tc3589x)

static int tc3589x_irq_map(struct irq_domain *d, unsigned int virq,

				irq_hw_number_t hwirq)

{

{

	int base = tc3589x->irq_base;

	struct tc3589x *tc3589x = d->host_data;

	int irq;





	for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) {

	irq_set_chip_data(virq, tc3589x);

		irq_set_chip_data(irq, tc3589x);

	irq_set_chip_and_handler(virq, &dummy_irq_chip,

		irq_set_chip_and_handler(irq, &dummy_irq_chip,

				handle_edge_irq);

				handle_edge_irq);

		irq_set_nested_thread(irq, 1);

	irq_set_nested_thread(virq, 1);

#ifdef CONFIG_ARM

#ifdef CONFIG_ARM

		set_irq_flags(irq, IRQF_VALID);

	set_irq_flags(virq, IRQF_VALID);

#else

#else

		irq_set_noprobe(irq);

	irq_set_noprobe(virq);

#endif

#endif

	}





	return 0;

	return 0;

}

}





static void tc3589x_irq_remove(struct tc3589x *tc3589x)

static void tc3589x_irq_unmap(struct irq_domain *d, unsigned int virq)

{

{

	int base = tc3589x->irq_base;

	int irq;



	for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) {

#ifdef CONFIG_ARM

#ifdef CONFIG_ARM

		set_irq_flags(irq, 0);

	set_irq_flags(virq, 0);

#endif

#endif

		irq_set_chip_and_handler(irq, NULL, NULL);

	irq_set_chip_and_handler(virq, NULL, NULL);

		irq_set_chip_data(irq, NULL);

	irq_set_chip_data(virq, NULL);

}

}



static struct irq_domain_ops tc3589x_irq_ops = {

        .map    = tc3589x_irq_map,

	.unmap  = tc3589x_irq_unmap,

        .xlate  = irq_domain_xlate_twocell,

};



static int tc3589x_irq_init(struct tc3589x *tc3589x)

{

	int base = tc3589x->irq_base;



	if (base) {

		tc3589x->domain = irq_domain_add_legacy(

			NULL, TC3589x_NR_INTERNAL_IRQS, base,

			0, &tc3589x_irq_ops, tc3589x);

	}

	else {

		tc3589x->domain = irq_domain_add_linear(

			NULL, TC3589x_NR_INTERNAL_IRQS,

			&tc3589x_irq_ops, tc3589x);

	}



	if (!tc3589x->domain) {

		dev_err(tc3589x->dev, "Failed to create irqdomain\n");

		return -ENOSYS;

	}



	return 0;

}

}





static int tc3589x_chip_init(struct tc3589x *tc3589x)

static int tc3589x_chip_init(struct tc3589x *tc3589x)
@@ -263,7 +287,7 @@ static int __devinit tc3589x_device_init(struct tc3589x *tc3589x) 
	if (blocks & TC3589x_BLOCK_GPIO) {

	if (blocks & TC3589x_BLOCK_GPIO) {

		ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_gpio,

		ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_gpio,

				      ARRAY_SIZE(tc3589x_dev_gpio), NULL,

				      ARRAY_SIZE(tc3589x_dev_gpio), NULL,

				      tc3589x->irq_base, NULL);

				      tc3589x->irq_base, tc3589x->domain);

		if (ret) {

		if (ret) {

			dev_err(tc3589x->dev, "failed to add gpio child\n");

			dev_err(tc3589x->dev, "failed to add gpio child\n");

			return ret;

			return ret;
@@ -274,7 +298,7 @@ static int __devinit tc3589x_device_init(struct tc3589x *tc3589x) 
	if (blocks & TC3589x_BLOCK_KEYPAD) {

	if (blocks & TC3589x_BLOCK_KEYPAD) {

		ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_keypad,

		ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_keypad,

				      ARRAY_SIZE(tc3589x_dev_keypad), NULL,

				      ARRAY_SIZE(tc3589x_dev_keypad), NULL,

				      tc3589x->irq_base, NULL);

				      tc3589x->irq_base, tc3589x->domain);

		if (ret) {

		if (ret) {

			dev_err(tc3589x->dev, "failed to keypad child\n");

			dev_err(tc3589x->dev, "failed to keypad child\n");

			return ret;

			return ret;
@@ -323,7 +347,7 @@ static int __devinit tc3589x_probe(struct i2c_client *i2c, 
				   "tc3589x", tc3589x);

				   "tc3589x", tc3589x);

	if (ret) {

	if (ret) {

		dev_err(tc3589x->dev, "failed to request IRQ: %d\n", ret);

		dev_err(tc3589x->dev, "failed to request IRQ: %d\n", ret);

		goto out_removeirq;

		goto out_free;

	}

	}





	ret = tc3589x_device_init(tc3589x);

	ret = tc3589x_device_init(tc3589x);
@@ -336,8 +360,6 @@ static int __devinit tc3589x_probe(struct i2c_client *i2c, 




out_freeirq:

out_freeirq:

	free_irq(tc3589x->i2c->irq, tc3589x);

	free_irq(tc3589x->i2c->irq, tc3589x);

out_removeirq:

	tc3589x_irq_remove(tc3589x);

out_free:

out_free:

	kfree(tc3589x);

	kfree(tc3589x);

	return ret;

	return ret;
@@ -350,7 +372,6 @@ static int __devexit tc3589x_remove(struct i2c_client *client) 
	mfd_remove_devices(tc3589x->dev);

	mfd_remove_devices(tc3589x->dev);





	free_irq(tc3589x->i2c->irq, tc3589x);

	free_irq(tc3589x->i2c->irq, tc3589x);

	tc3589x_irq_remove(tc3589x);





	kfree(tc3589x);

	kfree(tc3589x);

include/linux/mfd/tc3589x.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,7 @@ struct tc3589x { 
	struct mutex lock;

	struct mutex lock;

	struct device *dev;

	struct device *dev;

	struct i2c_client *i2c;

	struct i2c_client *i2c;

	struct irq_domain *domain;





	int irq_base;

	int irq_base;

	int num_gpio;

	int num_gpio;