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

Commit bcae8880 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'queue/irq/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into devel

parents 3685bbce bdac2b6d

drivers/gpio/gpio-bcm-kona.c

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static void bcm_kona_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) 
	void __iomem *reg_base;

	int bit, bank_id;

	unsigned long sta;

	struct bcm_kona_gpio_bank *bank = irq_get_handler_data(irq);

	struct bcm_kona_gpio_bank *bank = irq_desc_get_handler_data(desc);

	struct irq_chip *chip = irq_desc_get_chip(desc);



	chained_irq_enter(chip, desc);

drivers/gpio/gpio-davinci.c

+9 −10
Original line number Diff line number Diff line
@@ -65,11 +65,11 @@ static struct davinci_gpio_regs __iomem *gpio2regs(unsigned gpio) 
	return ptr;

}



static inline struct davinci_gpio_regs __iomem *irq2regs(int irq)

static inline struct davinci_gpio_regs __iomem *irq2regs(struct irq_data *d)

{

	struct davinci_gpio_regs __iomem *g;



	g = (__force struct davinci_gpio_regs __iomem *)irq_get_chip_data(irq);

	g = (__force struct davinci_gpio_regs __iomem *)irq_data_get_irq_chip_data(d);



	return g;

}
@@ -287,7 +287,7 @@ static int davinci_gpio_probe(struct platform_device *pdev) 


static void gpio_irq_disable(struct irq_data *d)

{

	struct davinci_gpio_regs __iomem *g = irq2regs(d->irq);

	struct davinci_gpio_regs __iomem *g = irq2regs(d);

	u32 mask = (u32) irq_data_get_irq_handler_data(d);



	writel_relaxed(mask, &g->clr_falling);
@@ -296,7 +296,7 @@ static void gpio_irq_disable(struct irq_data *d) 


static void gpio_irq_enable(struct irq_data *d)

{

	struct davinci_gpio_regs __iomem *g = irq2regs(d->irq);

	struct davinci_gpio_regs __iomem *g = irq2regs(d);

	u32 mask = (u32) irq_data_get_irq_handler_data(d);

	unsigned status = irqd_get_trigger_type(d);
@@ -327,8 +327,9 @@ static struct irq_chip gpio_irqchip = { 
};



static void

gpio_irq_handler(unsigned irq, struct irq_desc *desc)

gpio_irq_handler(unsigned __irq, struct irq_desc *desc)

{

	unsigned int irq = irq_desc_get_irq(desc);

	struct davinci_gpio_regs __iomem *g;

	u32 mask = 0xffff;

	struct davinci_gpio_controller *d;
@@ -396,7 +397,7 @@ static int gpio_irq_type_unbanked(struct irq_data *data, unsigned trigger) 
	struct davinci_gpio_regs __iomem *g;

	u32 mask;



	d = (struct davinci_gpio_controller *)data->handler_data;

	d = (struct davinci_gpio_controller *)irq_data_get_irq_handler_data(data);

	g = (struct davinci_gpio_regs __iomem *)d->regs;

	mask = __gpio_mask(data->irq - d->gpio_irq);
@@ -578,15 +579,13 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) 
		writel_relaxed(~0, &g->clr_falling);

		writel_relaxed(~0, &g->clr_rising);



		/* set up all irqs in this bank */

		irq_set_chained_handler(bank_irq, gpio_irq_handler);



		/*

		 * Each chip handles 32 gpios, and each irq bank consists of 16

		 * gpio irqs. Pass the irq bank's corresponding controller to

		 * the chained irq handler.

		 */

		irq_set_handler_data(bank_irq, &chips[gpio / 32]);

		irq_set_chained_handler_and_data(bank_irq, gpio_irq_handler,

						 &chips[gpio / 32]);



		binten |= BIT(bank);

	}

drivers/gpio/gpio-dwapb.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static u32 dwapb_do_irq(struct dwapb_gpio *gpio) 


static void dwapb_irq_handler(u32 irq, struct irq_desc *desc)

{

	struct dwapb_gpio *gpio = irq_get_handler_data(irq);

	struct dwapb_gpio *gpio = irq_desc_get_handler_data(desc);

	struct irq_chip *chip = irq_desc_get_chip(desc);



	dwapb_do_irq(gpio);

drivers/gpio/gpio-ep93xx.c

+4 −2
Original line number Diff line number Diff line
@@ -100,13 +100,15 @@ static void ep93xx_gpio_ab_irq_handler(unsigned int irq, struct irq_desc *desc) 
	}

}



static void ep93xx_gpio_f_irq_handler(unsigned int irq, struct irq_desc *desc)

static void ep93xx_gpio_f_irq_handler(unsigned int __irq,

				      struct irq_desc *desc)

{

	/*

	 * map discontiguous hw irq range to continuous sw irq range:

	 *

	 *  IRQ_EP93XX_GPIO{0..7}MUX -> gpio_to_irq(EP93XX_GPIO_LINE_F({0..7})

	 */

	unsigned int irq = irq_desc_get_irq(desc);

	int port_f_idx = ((irq + 1) & 7) ^ 4; /* {19..22,47..50} -> {0..7} */

	int gpio_irq = gpio_to_irq(EP93XX_GPIO_LINE_F(0)) + port_f_idx;
@@ -208,7 +210,7 @@ static int ep93xx_gpio_irq_type(struct irq_data *d, unsigned int type) 
		return -EINVAL;

	}



	__irq_set_handler_locked(d->irq, handler);

	irq_set_handler_locked(d, handler);



	gpio_int_enabled[port] |= port_mask;

drivers/gpio/gpio-mpc8xxx.c

+3 −4
Original line number Diff line number Diff line
@@ -396,8 +396,8 @@ static int mpc8xxx_probe(struct platform_device *pdev) 
	out_be32(mm_gc->regs + GPIO_IER, 0xffffffff);

	out_be32(mm_gc->regs + GPIO_IMR, 0);



	irq_set_handler_data(mpc8xxx_gc->irqn, mpc8xxx_gc);

	irq_set_chained_handler(mpc8xxx_gc->irqn, mpc8xxx_gpio_irq_cascade);

	irq_set_chained_handler_and_data(mpc8xxx_gc->irqn,

					 mpc8xxx_gpio_irq_cascade, mpc8xxx_gc);



	return 0;

}
@@ -407,8 +407,7 @@ static int mpc8xxx_remove(struct platform_device *pdev) 
	struct mpc8xxx_gpio_chip *mpc8xxx_gc = platform_get_drvdata(pdev);



	if (mpc8xxx_gc->irq) {

		irq_set_handler_data(mpc8xxx_gc->irqn, NULL);

		irq_set_chained_handler(mpc8xxx_gc->irqn, NULL);

		irq_set_chained_handler_and_data(mpc8xxx_gc->irqn, NULL, NULL);

		irq_domain_remove(mpc8xxx_gc->irq);

	}