Commit 8ab47d3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin control fixes from Linus Walleij:
 "This is a set of pin control fixes I have collected over the last few
  days.  Some have rotated more than others in linux-next, but they were
  rebased on v3.14-rc5 due to sloppy commit messages.  I am quite
  convinced that they are all good fixes that only hit this or that
  individual driver and not the entire subsystem.

   - Fix chained interrupts, interrupt masking and register offset
     calculation for the sunxi driver

   - Make MSM a bool rather than a tristate to stop build problems to
     happen - chained interrupt controllers cannot currently be defined
     in modules

   - Fix a clock in the PFC driver

   - Fix a kernel panic in the sirf driver"

* tag 'pinctrl-v3.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: sirf: fix kernel panic in gpio_lock_as_irq
  pinctrl: sh-pfc: r8a7791: SD1_CLK fix
  pinctrl: msm: make PINCTRL_MSM bool instead of tristate
  pinctrl: sunxi: Fix interrupt register offset calculation
  pinctrl: sunxi: Fix masking when setting irq type
  pinctrl: sunxi: use chained_irq_{enter, exit} for GIC compatibility
parents ee693507 e291fd20

drivers/pinctrl/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ config PINCTRL_IMX28 
	select PINCTRL_MXS



config PINCTRL_MSM

	tristate

	bool

	select PINMUX

	select PINCONF

	select GENERIC_PINCONF

drivers/pinctrl/pinctrl-sunxi.c

+5 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/clk.h>

#include <linux/gpio.h>

#include <linux/irqdomain.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_address.h>
@@ -584,7 +585,7 @@ static int sunxi_pinctrl_irq_set_type(struct irq_data *d, 
	spin_lock_irqsave(&pctl->lock, flags);



	regval = readl(pctl->membase + reg);

	regval &= ~IRQ_CFG_IRQ_MASK;

	regval &= ~(IRQ_CFG_IRQ_MASK << index);

	writel(regval | (mode << index), pctl->membase + reg);



	spin_unlock_irqrestore(&pctl->lock, flags);
@@ -665,6 +666,7 @@ static struct irq_chip sunxi_pinctrl_irq_chip = { 


static void sunxi_pinctrl_irq_handler(unsigned irq, struct irq_desc *desc)

{

	struct irq_chip *chip = irq_get_chip(irq);

	struct sunxi_pinctrl *pctl = irq_get_handler_data(irq);

	const unsigned long reg = readl(pctl->membase + IRQ_STATUS_REG);
@@ -674,10 +676,12 @@ static void sunxi_pinctrl_irq_handler(unsigned irq, struct irq_desc *desc) 
	if (reg) {

		int irqoffset;



		chained_irq_enter(chip, desc);

		for_each_set_bit(irqoffset, &reg, SUNXI_IRQ_NUMBER) {

			int pin_irq = irq_find_mapping(pctl->domain, irqoffset);

			generic_handle_irq(pin_irq);

		}

		chained_irq_exit(chip, desc);

	}

}

drivers/pinctrl/pinctrl-sunxi.h

+3 −3
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static inline u32 sunxi_pull_offset(u16 pin) 


static inline u32 sunxi_irq_cfg_reg(u16 irq)

{

	u8 reg = irq / IRQ_CFG_IRQ_PER_REG;

	u8 reg = irq / IRQ_CFG_IRQ_PER_REG * 0x04;

	return reg + IRQ_CFG_REG;

}
@@ -523,7 +523,7 @@ static inline u32 sunxi_irq_cfg_offset(u16 irq) 


static inline u32 sunxi_irq_ctrl_reg(u16 irq)

{

	u8 reg = irq / IRQ_CTRL_IRQ_PER_REG;

	u8 reg = irq / IRQ_CTRL_IRQ_PER_REG * 0x04;

	return reg + IRQ_CTRL_REG;

}
@@ -535,7 +535,7 @@ static inline u32 sunxi_irq_ctrl_offset(u16 irq) 


static inline u32 sunxi_irq_status_reg(u16 irq)

{

	u8 reg = irq / IRQ_STATUS_IRQ_PER_REG;

	u8 reg = irq / IRQ_STATUS_IRQ_PER_REG * 0x04;

	return reg + IRQ_STATUS_REG;

}

drivers/pinctrl/sh-pfc/pfc-r8a7791.c

+4 −2
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ enum { 


	/* GPSR6 */

	FN_IP13_10, FN_IP13_11, FN_IP13_12, FN_IP13_13, FN_IP13_14,

	FN_IP13_15, FN_IP13_18_16, FN_IP13_21_19, FN_IP13_22, FN_IP13_24_23,

	FN_IP13_15, FN_IP13_18_16, FN_IP13_21_19,

	FN_IP13_22, FN_IP13_24_23, FN_SD1_CLK,

	FN_IP13_25, FN_IP13_26, FN_IP13_27, FN_IP13_30_28, FN_IP14_1_0,

	FN_IP14_2, FN_IP14_3, FN_IP14_4, FN_IP14_5, FN_IP14_6, FN_IP14_7,

	FN_IP14_10_8, FN_IP14_13_11, FN_IP14_16_14, FN_IP14_19_17,
@@ -788,6 +789,7 @@ static const u16 pinmux_data[] = { 
	PINMUX_DATA(USB1_PWEN_MARK, FN_USB1_PWEN),

	PINMUX_DATA(USB1_OVC_MARK, FN_USB1_OVC),

	PINMUX_DATA(DU0_DOTCLKIN_MARK, FN_DU0_DOTCLKIN),

	PINMUX_DATA(SD1_CLK_MARK, FN_SD1_CLK),



	/* IPSR0 */

	PINMUX_IPSR_DATA(IP0_0, D0),
@@ -3825,7 +3827,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { 
		GP_6_11_FN, FN_IP13_25,

		GP_6_10_FN, FN_IP13_24_23,

		GP_6_9_FN, FN_IP13_22,

		0, 0,

		GP_6_8_FN, FN_SD1_CLK,

		GP_6_7_FN, FN_IP13_21_19,

		GP_6_6_FN, FN_IP13_18_16,

		GP_6_5_FN, FN_IP13_15,

drivers/pinctrl/sirf/pinctrl-sirf.c

+2 −2
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static unsigned int sirfsoc_gpio_irq_startup(struct irq_data *d) 
{

	struct sirfsoc_gpio_bank *bank = irq_data_get_irq_chip_data(d);



	if (gpio_lock_as_irq(&bank->chip.gc, d->hwirq))

	if (gpio_lock_as_irq(&bank->chip.gc, d->hwirq % SIRFSOC_GPIO_BANK_SIZE))

		dev_err(bank->chip.gc.dev,

			"unable to lock HW IRQ %lu for IRQ\n",

			d->hwirq);
@@ -611,7 +611,7 @@ static void sirfsoc_gpio_irq_shutdown(struct irq_data *d) 
	struct sirfsoc_gpio_bank *bank = irq_data_get_irq_chip_data(d);



	sirfsoc_gpio_irq_mask(d);

	gpio_unlock_as_irq(&bank->chip.gc, d->hwirq);

	gpio_unlock_as_irq(&bank->chip.gc, d->hwirq % SIRFSOC_GPIO_BANK_SIZE);

}



static struct irq_chip sirfsoc_irq_chip = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE