Commit 93a0d340 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull pin control fixes from Linus Walleij:
 "Here are three pin control fixes.

  The Intel fixes are the most serious and important things I had queued
  since it affects a large portion of deployed Chromebooks.

   - Two major fixes for the Intel Cherryview and Sunrisepoint pin
     controllers, adjusting numberspaces so that they get aligned with
     various messed-up numbers encoded into the BIOS.

   - A fix for the Meson driver GPIO pin range"

* tag 'pinctrl-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: sunrisepoint: Align GPIO number space with Windows
  pinctrl: cherryview: Associate IRQ descriptors to irqdomain
  pinctrl: meson-axg: fix the range of aobus bank
parents 89240c67 c41eb2c7
...@@ -1622,22 +1622,30 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq) ...@@ -1622,22 +1622,30 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
if (!need_valid_mask) { if (!need_valid_mask) {
irq_base = devm_irq_alloc_descs(pctrl->dev, -1, 0, irq_base = devm_irq_alloc_descs(pctrl->dev, -1, 0,
chip->ngpio, NUMA_NO_NODE); community->npins, NUMA_NO_NODE);
if (irq_base < 0) { if (irq_base < 0) {
dev_err(pctrl->dev, "Failed to allocate IRQ numbers\n"); dev_err(pctrl->dev, "Failed to allocate IRQ numbers\n");
return irq_base; return irq_base;
} }
} else {
irq_base = 0;
} }
ret = gpiochip_irqchip_add(chip, &chv_gpio_irqchip, irq_base, ret = gpiochip_irqchip_add(chip, &chv_gpio_irqchip, 0,
handle_bad_irq, IRQ_TYPE_NONE); handle_bad_irq, IRQ_TYPE_NONE);
if (ret) { if (ret) {
dev_err(pctrl->dev, "failed to add IRQ chip\n"); dev_err(pctrl->dev, "failed to add IRQ chip\n");
return ret; return ret;
} }
if (!need_valid_mask) {
for (i = 0; i < community->ngpio_ranges; i++) {
range = &community->gpio_ranges[i];
irq_domain_associate_many(chip->irq.domain, irq_base,
range->base, range->npins);
irq_base += range->npins;
}
}
gpiochip_set_chained_irqchip(chip, &chv_gpio_irqchip, irq, gpiochip_set_chained_irqchip(chip, &chv_gpio_irqchip, irq,
chv_gpio_irq_handler); chv_gpio_irq_handler);
return 0; return 0;
......
...@@ -36,6 +36,27 @@ ...@@ -36,6 +36,27 @@
.npins = ((e) - (s) + 1), \ .npins = ((e) - (s) + 1), \
} }
#define SPTH_GPP(r, s, e, g) \
{ \
.reg_num = (r), \
.base = (s), \
.size = ((e) - (s) + 1), \
.gpio_base = (g), \
}
#define SPTH_COMMUNITY(b, s, e, g) \
{ \
.barno = (b), \
.padown_offset = SPT_PAD_OWN, \
.padcfglock_offset = SPT_PADCFGLOCK, \
.hostown_offset = SPT_HOSTSW_OWN, \
.ie_offset = SPT_GPI_IE, \
.pin_base = (s), \
.npins = ((e) - (s) + 1), \
.gpps = (g), \
.ngpps = ARRAY_SIZE(g), \
}
/* Sunrisepoint-LP */ /* Sunrisepoint-LP */
static const struct pinctrl_pin_desc sptlp_pins[] = { static const struct pinctrl_pin_desc sptlp_pins[] = {
/* GPP_A */ /* GPP_A */
...@@ -531,10 +552,28 @@ static const struct intel_function spth_functions[] = { ...@@ -531,10 +552,28 @@ static const struct intel_function spth_functions[] = {
FUNCTION("i2c2", spth_i2c2_groups), FUNCTION("i2c2", spth_i2c2_groups),
}; };
static const struct intel_padgroup spth_community0_gpps[] = {
SPTH_GPP(0, 0, 23, 0), /* GPP_A */
SPTH_GPP(1, 24, 47, 24), /* GPP_B */
};
static const struct intel_padgroup spth_community1_gpps[] = {
SPTH_GPP(0, 48, 71, 48), /* GPP_C */
SPTH_GPP(1, 72, 95, 72), /* GPP_D */
SPTH_GPP(2, 96, 108, 96), /* GPP_E */
SPTH_GPP(3, 109, 132, 120), /* GPP_F */
SPTH_GPP(4, 133, 156, 144), /* GPP_G */
SPTH_GPP(5, 157, 180, 168), /* GPP_H */
};
static const struct intel_padgroup spth_community3_gpps[] = {
SPTH_GPP(0, 181, 191, 192), /* GPP_I */
};
static const struct intel_community spth_communities[] = { static const struct intel_community spth_communities[] = {
SPT_COMMUNITY(0, 0, 47), SPTH_COMMUNITY(0, 0, 47, spth_community0_gpps),
SPT_COMMUNITY(1, 48, 180), SPTH_COMMUNITY(1, 48, 180, spth_community1_gpps),
SPT_COMMUNITY(2, 181, 191), SPTH_COMMUNITY(2, 181, 191, spth_community3_gpps),
}; };
static const struct intel_pinctrl_soc_data spth_soc_data = { static const struct intel_pinctrl_soc_data spth_soc_data = {
......
...@@ -898,7 +898,7 @@ static struct meson_bank meson_axg_periphs_banks[] = { ...@@ -898,7 +898,7 @@ static struct meson_bank meson_axg_periphs_banks[] = {
static struct meson_bank meson_axg_aobus_banks[] = { static struct meson_bank meson_axg_aobus_banks[] = {
/* name first last irq pullen pull dir out in */ /* name first last irq pullen pull dir out in */
BANK("AO", GPIOAO_0, GPIOAO_9, 0, 13, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0), BANK("AO", GPIOAO_0, GPIOAO_13, 0, 13, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0),
}; };
static struct meson_pmx_bank meson_axg_periphs_pmx_banks[] = { static struct meson_pmx_bank meson_axg_periphs_pmx_banks[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment