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

Commit 3912a677 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-fixes-for-v3.9' of... 

Merge tag 'pinctrl-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull pinctrl fixes from Linus Walleij:
 "Here are a few pinctrl fixes for the v3.9 rc series:
   - Usecount bounds checking so we do not go below zero on mux
     usecounts.
   - Loop range checking in GPIO ranges in the DT range parser.
   - Proper print in debugfs for pinconf state.
   - Fix compilation bug in generic pinconf code.
   - Minor bugfixes to abx500 and mvebu drivers."

* tag 'pinctrl-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinmux: forbid mux_usecount to be set at UINT_MAX
  pinctrl: mvebu: fix checking for SoC specific controls
  pinctrl: generic: Fix compilation error
  pinctrl: Print the correct information in debugfs pinconf-state file
  pinctrl: abx500: Fix checking if pin use AlternateFunction register
  gpio: fix wrong checking condition for gpio range
parents 33b73e9b 740924a2

drivers/gpio/gpiolib-of.c

+2 −3
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void of_gpiochip_add_pin_range(struct gpio_chip *chip) 
	if (!np)

		return;



	do {

	for (;; index++) {

		ret = of_parse_phandle_with_args(np, "gpio-ranges",

				"#gpio-range-cells", index, &pinspec);

		if (ret)
@@ -222,8 +222,7 @@ static void of_gpiochip_add_pin_range(struct gpio_chip *chip) 


		if (ret)

			break;



	} while (index++);

	}

}



#else

drivers/pinctrl/mvebu/pinctrl-mvebu.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ int mvebu_pinctrl_probe(struct platform_device *pdev) 


		/* special soc specific control */

		if (ctrl->mpp_get || ctrl->mpp_set) {

			if (!ctrl->name || !ctrl->mpp_set || !ctrl->mpp_set) {

			if (!ctrl->name || !ctrl->mpp_get || !ctrl->mpp_set) {

				dev_err(&pdev->dev, "wrong soc control info\n");

				return -EINVAL;

			}

drivers/pinctrl/pinconf.c

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static const struct file_operations pinconf_dbg_pinname_fops = { 
static int pinconf_dbg_state_print(struct seq_file *s, void *d)

{

	if (strlen(dbg_state_name))

		seq_printf(s, "%s\n", dbg_pinname);

		seq_printf(s, "%s\n", dbg_state_name);

	else

		seq_printf(s, "No pin state set\n");

	return 0;

drivers/pinctrl/pinconf.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static inline void pinconf_init_device_debugfs(struct dentry *devroot, 
 * pin config.

 */



#ifdef CONFIG_GENERIC_PINCONF

#if defined(CONFIG_GENERIC_PINCONF) && defined(CONFIG_DEBUG_FS)



void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev,

			      struct seq_file *s, unsigned pin);

drivers/pinctrl/pinctrl-abx500.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static u8 abx500_get_mode(struct pinctrl_dev *pctldev, struct gpio_chip *chip, 
	}



	/* check if pin use AlternateFunction register */

	if ((af.alt_bit1 == UNUSED) && (af.alt_bit1 == UNUSED))

	if ((af.alt_bit1 == UNUSED) && (af.alt_bit2 == UNUSED))

		return mode;

	/*

	 * if pin GPIOSEL bit is set and pin supports alternate function,