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

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

Pull pin control fixes from Linus Walleij:
 "Late pin control fixes, would have been in the main pull request
  normally but hey I got lucky and we got another week to polish up
  v5.12 so here we go.

  One driver fix and one making the core debugfs work:

   - Fix the number of pins in the community of the Intel Lewisburg SoC

   - Show pin numbers for controllers with base = 0 in the new debugfs
     feature"

* tag 'pinctrl-v5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: core: Show pin numbers for the controllers with base = 0
  pinctrl: lewisburg: Update number of pins in community
parents e77a830c 482715ff

drivers/pinctrl/core.c

+8 −6
Original line number Diff line number Diff line
@@ -1604,8 +1604,8 @@ static int pinctrl_pins_show(struct seq_file *s, void *what) 
	unsigned i, pin;

#ifdef CONFIG_GPIOLIB

	struct pinctrl_gpio_range *range;

	unsigned int gpio_num;

	struct gpio_chip *chip;

	int gpio_num;

#endif



	seq_printf(s, "registered pins: %d\n", pctldev->desc->npins);
@@ -1625,7 +1625,7 @@ static int pinctrl_pins_show(struct seq_file *s, void *what) 
		seq_printf(s, "pin %d (%s) ", pin, desc->name);



#ifdef CONFIG_GPIOLIB

		gpio_num = 0;

		gpio_num = -1;

		list_for_each_entry(range, &pctldev->gpio_ranges, node) {

			if ((pin >= range->pin_base) &&

			    (pin < (range->pin_base + range->npins))) {
@@ -1633,10 +1633,12 @@ static int pinctrl_pins_show(struct seq_file *s, void *what) 
				break;

			}

		}

		if (gpio_num >= 0)

			chip = gpio_to_chip(gpio_num);

		if (chip && chip->gpiodev && chip->gpiodev->base)

			seq_printf(s, "%u:%s ", gpio_num -

				chip->gpiodev->base, chip->label);

		else

			chip = NULL;

		if (chip)

			seq_printf(s, "%u:%s ", gpio_num - chip->gpiodev->base, chip->label);

		else

			seq_puts(s, "0:? ");

#endif

drivers/pinctrl/intel/pinctrl-lewisburg.c

+3 −3
Original line number Diff line number Diff line
@@ -299,9 +299,9 @@ static const struct pinctrl_pin_desc lbg_pins[] = { 
static const struct intel_community lbg_communities[] = {

	LBG_COMMUNITY(0, 0, 71),

	LBG_COMMUNITY(1, 72, 132),

	LBG_COMMUNITY(3, 133, 144),

	LBG_COMMUNITY(4, 145, 180),

	LBG_COMMUNITY(5, 181, 246),

	LBG_COMMUNITY(3, 133, 143),

	LBG_COMMUNITY(4, 144, 178),

	LBG_COMMUNITY(5, 179, 246),

};



static const struct intel_pinctrl_soc_data lbg_soc_data = {