Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pinctrl-v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pinctrl fixes from Linus Walleij:
"Two smaller pin control fixes for the v4.11 series:
- Add a get_direction() function to the qcom driver
- Fix two pin names in the uniphier driver"
* tag 'pinctrl-v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: uniphier: change pin names of aio/xirq for LD11
pinctrl: qcom: add get_direction function
+21
-6
+15
drivers/pinctrl/qcom/pinctrl-msm.c
+15
drivers/pinctrl/qcom/pinctrl-msm.c
···
422
422
return 0;
423
423
}
424
424
425
+
static int msm_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
426
+
{
427
+
struct msm_pinctrl *pctrl = gpiochip_get_data(chip);
428
+
const struct msm_pingroup *g;
429
+
u32 val;
430
+
431
+
g = &pctrl->soc->groups[offset];
432
+
433
+
val = readl(pctrl->regs + g->ctl_reg);
434
+
435
+
/* 0 = output, 1 = input */
436
+
return val & BIT(g->oe_bit) ? 0 : 1;
437
+
}
438
+
425
439
static int msm_gpio_get(struct gpio_chip *chip, unsigned offset)
426
440
{
427
441
const struct msm_pingroup *g;
···
524
510
static struct gpio_chip msm_gpio_template = {
525
511
.direction_input = msm_gpio_direction_input,
526
512
.direction_output = msm_gpio_direction_output,
513
+
.get_direction = msm_gpio_get_direction,
527
514
.get = msm_gpio_get,
528
515
.set = msm_gpio_set,
529
516
.request = gpiochip_generic_request,
+6
-6
drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
+6
-6
drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
···
390
390
UNIPHIER_PINCTRL_PIN(140, "AO1D0", 140,
391
391
140, UNIPHIER_PIN_DRV_1BIT,
392
392
140, UNIPHIER_PIN_PULL_DOWN),
393
-
UNIPHIER_PINCTRL_PIN(141, "TCON0", 141,
393
+
UNIPHIER_PINCTRL_PIN(141, "AO1D1", 141,
394
394
141, UNIPHIER_PIN_DRV_1BIT,
395
395
141, UNIPHIER_PIN_PULL_DOWN),
396
-
UNIPHIER_PINCTRL_PIN(142, "TCON1", 142,
396
+
UNIPHIER_PINCTRL_PIN(142, "AO1D2", 142,
397
397
142, UNIPHIER_PIN_DRV_1BIT,
398
398
142, UNIPHIER_PIN_PULL_DOWN),
399
-
UNIPHIER_PINCTRL_PIN(143, "TCON2", 143,
399
+
UNIPHIER_PINCTRL_PIN(143, "XIRQ9", 143,
400
400
143, UNIPHIER_PIN_DRV_1BIT,
401
401
143, UNIPHIER_PIN_PULL_DOWN),
402
-
UNIPHIER_PINCTRL_PIN(144, "TCON3", 144,
402
+
UNIPHIER_PINCTRL_PIN(144, "XIRQ10", 144,
403
403
144, UNIPHIER_PIN_DRV_1BIT,
404
404
144, UNIPHIER_PIN_PULL_DOWN),
405
-
UNIPHIER_PINCTRL_PIN(145, "TCON4", 145,
405
+
UNIPHIER_PINCTRL_PIN(145, "XIRQ11", 145,
406
406
145, UNIPHIER_PIN_DRV_1BIT,
407
407
145, UNIPHIER_PIN_PULL_DOWN),
408
-
UNIPHIER_PINCTRL_PIN(146, "TCON5", 146,
408
+
UNIPHIER_PINCTRL_PIN(146, "XIRQ13", 146,
409
409
146, UNIPHIER_PIN_DRV_1BIT,
410
410
146, UNIPHIER_PIN_PULL_DOWN),
411
411
UNIPHIER_PINCTRL_PIN(147, "PWMA", 147,