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

Commit 85f91d5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more pin control fixes from Linus Walleij:
 "Here is a bunch of pin control fixes again

  A bit more than I'd like for this subsystem at this point, but what
  can I do. They are all driver fixes for hardware issues, as like "we
  forgot", "we didn't think of the fact that this could happen", "oops
  that one goes there" etc

   - Kconfig fixup for the TI IOdelay pinctrl-single add-on

   - fix up a typo in the meson i2c ao groups

   - switch a remapping back to use devm_ioremap() as
     devm_ioremap_resource() does not allow for sharing memory regions

   - do not clear the Qualcomm irq status bit in irq_unmask(), as this
     can lead to missing interrupts while the irq handler is executing

   - add irq_request/release_resources() on the ST driver

   - add a bunch of mysteriously missing pingroups for high numbered
     pins in the Qualcomm ipq4019 driver"

* tag 'pinctrl-v4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: qcom: ipq4019: add missing pingroups for pins > 70
  pinctrl: st: add irq_request/release_resources callbacks
  pinctrl: qcom: Don't clear status bit on irq_unmask
  pinctrl: samsung: Fix memory mapping code
  pinctrl: meson-gxbb: Fix typo in i2c ao groups
  pinctrl: ti: The IODelay driver is a DRA7xxx feature so depend on that SoC
parents d3e68cef d7402de4

drivers/pinctrl/meson/pinctrl-meson-gxbb.c

+2 −2
Original line number Diff line number Diff line
@@ -667,11 +667,11 @@ static const char * const uart_ao_b_groups[] = { 
};



static const char * const i2c_ao_groups[] = {

	"i2c_sdk_ao", "i2c_sda_ao",

	"i2c_sck_ao", "i2c_sda_ao",

};



static const char * const i2c_slave_ao_groups[] = {

	"i2c_slave_sdk_ao", "i2c_slave_sda_ao",

	"i2c_slave_sck_ao", "i2c_slave_sda_ao",

};



static const char * const remote_input_ao_groups[] = {

drivers/pinctrl/pinctrl-st.c

+24 −6
Original line number Diff line number Diff line
@@ -1285,6 +1285,22 @@ static void st_gpio_irq_unmask(struct irq_data *d) 
	writel(BIT(d->hwirq), bank->base + REG_PIO_SET_PMASK);

}



static int st_gpio_irq_request_resources(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);



	st_gpio_direction_input(gc, d->hwirq);



	return gpiochip_lock_as_irq(gc, d->hwirq);

}



static void st_gpio_irq_release_resources(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);



	gpiochip_unlock_as_irq(gc, d->hwirq);

}



static int st_gpio_irq_set_type(struct irq_data *d, unsigned type)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
@@ -1439,6 +1455,8 @@ static struct gpio_chip st_gpio_template = { 


static struct irq_chip st_gpio_irqchip = {

	.name			= "GPIO",

	.irq_request_resources	= st_gpio_irq_request_resources,

	.irq_release_resources	= st_gpio_irq_release_resources,

	.irq_disable		= st_gpio_irq_mask,

	.irq_mask		= st_gpio_irq_mask,

	.irq_unmask		= st_gpio_irq_unmask,

drivers/pinctrl/qcom/pinctrl-ipq4019.c

+30 −0
Original line number Diff line number Diff line
@@ -405,6 +405,36 @@ static const struct msm_pingroup ipq4019_groups[] = { 
	PINGROUP(67, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(68, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(69, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(70, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(71, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(72, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(73, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(74, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(75, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(76, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(77, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(78, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(79, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(80, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(81, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(82, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(83, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(84, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(85, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(86, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(87, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(88, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(89, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(90, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(91, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(92, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(93, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(94, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(95, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(96, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(97, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(98, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	PINGROUP(99, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),

};



static const struct msm_pinctrl_soc_data ipq4019_pinctrl = {

drivers/pinctrl/qcom/pinctrl-msm.c

+0 −4
Original line number Diff line number Diff line
@@ -609,10 +609,6 @@ static void msm_gpio_irq_unmask(struct irq_data *d) 


	raw_spin_lock_irqsave(&pctrl->lock, flags);



	val = readl(pctrl->regs + g->intr_status_reg);

	val &= ~BIT(g->intr_status_bit);

	writel(val, pctrl->regs + g->intr_status_reg);



	val = readl(pctrl->regs + g->intr_cfg_reg);

	val |= BIT(g->intr_enable_bit);

	writel(val, pctrl->regs + g->intr_cfg_reg);

drivers/pinctrl/samsung/pinctrl-samsung.c

+10 −3
Original line number Diff line number Diff line
@@ -988,9 +988,16 @@ samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, 


	for (i = 0; i < ctrl->nr_ext_resources + 1; i++) {

		res = platform_get_resource(pdev, IORESOURCE_MEM, i);

		virt_base[i] = devm_ioremap_resource(&pdev->dev, res);

		if (IS_ERR(virt_base[i]))

			return ERR_CAST(virt_base[i]);

		if (!res) {

			dev_err(&pdev->dev, "failed to get mem%d resource\n", i);

			return ERR_PTR(-EINVAL);

		}

		virt_base[i] = devm_ioremap(&pdev->dev, res->start,

						resource_size(res));

		if (!virt_base[i]) {

			dev_err(&pdev->dev, "failed to ioremap %pR\n", res);

			return ERR_PTR(-EIO);

		}

	}



	bank = d->pin_banks;