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

Commit c4ccac46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pinctrl fixes from Linus Walleij:
 "Allright allright I've been lazy over christmas and New Years.  Here
  are a few collected pin control fixes eventually.  Details:

  A set of assorted pin control fixes for the Rockchip and STi drivers"

* tag 'pinctrl-v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: st: Add irq_disable hook to st_gpio_irqchip
  pinctrl: st: avoid multiple mutex lock
  pinctrl: rockchip: Fix enable/disable/mask/unmask
  pinctrl: rockchip: Handle wakeup pins
parents 74e59ea0 fce7fcc7

drivers/pinctrl/pinctrl-rockchip.c

+54 −3
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ struct rockchip_iomux { 
 * @reg_pull: optional separate register for additional pull settings

 * @clk: clock of the gpio bank

 * @irq: interrupt of the gpio bank

 * @saved_enables: Saved content of GPIO_INTEN at suspend time.

 * @pin_base: first pin number

 * @nr_pins: number of pins in this bank

 * @name: name of the bank
@@ -107,6 +108,7 @@ struct rockchip_pin_bank { 
	struct regmap			*regmap_pull;

	struct clk			*clk;

	int				irq;

	u32				saved_enables;

	u32				pin_base;

	u8				nr_pins;

	char				*name;
@@ -1543,6 +1545,51 @@ static int rockchip_irq_set_type(struct irq_data *d, unsigned int type) 
	return 0;

}



static void rockchip_irq_suspend(struct irq_data *d)

{

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);

	struct rockchip_pin_bank *bank = gc->private;



	bank->saved_enables = irq_reg_readl(gc, GPIO_INTEN);

	irq_reg_writel(gc, gc->wake_active, GPIO_INTEN);

}



static void rockchip_irq_resume(struct irq_data *d)

{

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);

	struct rockchip_pin_bank *bank = gc->private;



	irq_reg_writel(gc, bank->saved_enables, GPIO_INTEN);

}



static void rockchip_irq_disable(struct irq_data *d)

{

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);

	u32 val;



	irq_gc_lock(gc);



	val = irq_reg_readl(gc, GPIO_INTEN);

	val &= ~d->mask;

	irq_reg_writel(gc, val, GPIO_INTEN);



	irq_gc_unlock(gc);

}



static void rockchip_irq_enable(struct irq_data *d)

{

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);

	u32 val;



	irq_gc_lock(gc);



	val = irq_reg_readl(gc, GPIO_INTEN);

	val |= d->mask;

	irq_reg_writel(gc, val, GPIO_INTEN);



	irq_gc_unlock(gc);

}



static int rockchip_interrupts_register(struct platform_device *pdev,

						struct rockchip_pinctrl *info)

{
@@ -1581,12 +1628,16 @@ static int rockchip_interrupts_register(struct platform_device *pdev, 
		gc = irq_get_domain_generic_chip(bank->domain, 0);

		gc->reg_base = bank->reg_base;

		gc->private = bank;

		gc->chip_types[0].regs.mask = GPIO_INTEN;

		gc->chip_types[0].regs.mask = GPIO_INTMASK;

		gc->chip_types[0].regs.ack = GPIO_PORTS_EOI;

		gc->chip_types[0].chip.irq_ack = irq_gc_ack_set_bit;

		gc->chip_types[0].chip.irq_mask = irq_gc_mask_clr_bit;

		gc->chip_types[0].chip.irq_unmask = irq_gc_mask_set_bit;

		gc->chip_types[0].chip.irq_mask = irq_gc_mask_set_bit;

		gc->chip_types[0].chip.irq_unmask = irq_gc_mask_clr_bit;

		gc->chip_types[0].chip.irq_enable = rockchip_irq_enable;

		gc->chip_types[0].chip.irq_disable = rockchip_irq_disable;

		gc->chip_types[0].chip.irq_set_wake = irq_gc_set_wake;

		gc->chip_types[0].chip.irq_suspend = rockchip_irq_suspend;

		gc->chip_types[0].chip.irq_resume = rockchip_irq_resume;

		gc->chip_types[0].chip.irq_set_type = rockchip_irq_set_type;

		gc->wake_enabled = IRQ_MSK(bank->nr_pins);

drivers/pinctrl/pinctrl-st.c

+4 −1
Original line number Diff line number Diff line
@@ -1012,8 +1012,10 @@ static void st_pinconf_dbg_show(struct pinctrl_dev *pctldev, 
				   struct seq_file *s, unsigned pin_id)

{

	unsigned long config;

	st_pinconf_get(pctldev, pin_id, &config);



	mutex_unlock(&pctldev->mutex);

	st_pinconf_get(pctldev, pin_id, &config);

	mutex_lock(&pctldev->mutex);

	seq_printf(s, "[OE:%ld,PU:%ld,OD:%ld]\n"

		"\t\t[retime:%ld,invclk:%ld,clknotdat:%ld,"

		"de:%ld,rt-clk:%ld,rt-delay:%ld]",
@@ -1443,6 +1445,7 @@ static struct gpio_chip st_gpio_template = { 


static struct irq_chip st_gpio_irqchip = {

	.name		= "GPIO",

	.irq_disable	= st_gpio_irq_mask,

	.irq_mask	= st_gpio_irq_mask,

	.irq_unmask	= st_gpio_irq_unmask,

	.irq_set_type	= st_gpio_irq_set_type,