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

Commit 0caf14e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin-control fixes from Linus Walleij:
 "My first (a bit delayed) pack of pin control fixes for the v3.17
  series, only driver fixes:

   - SH-PFC (Renesas) r8a7791 CAN bus pin group problem
   - Rockchip (GPIO0 configuration)
   - Tegra-xusb (interrupt handling)
   - Exynos (GPIO interrupt locking)
   - Qualcomm (fix misleading example interrupts)
   - minor non-critical fixes for abx500 and AT91 also sneaked in,
     because I initially intended this pull for post RC-1, hope it's
     still OK"

* tag 'pinctrl-v3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: qcom: apq8064: Correct interrupts in example
  pinctrl: exynos: Lock GPIOs as interrupts when used as EINTs
  pinctrl: pinctrl-at91.c: fix decimal printf format specifiers prefixed with 0x
  pinctrl: abx500: remove useless check
  pinctrl: tegra-xusb: testing wrong variable in probe()
  pinctrl: tegra-xusb: fix an off by one test
  pinctrl: rockchip: fix rk3288 gpio0 configuration
  sh-pfc: r8a7791: fix CAN pin groups
parents daf543b1 0252d6a2

Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Example: 
		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

		interrupts = <0 32 0x4>;

		interrupts = <0 16 0x4>;



		pinctrl-names = "default";

		pinctrl-0 = <&gsbi5_uart_default>;

drivers/pinctrl/nomadik/pinctrl-abx500.c

+1 −2
Original line number Diff line number Diff line
@@ -620,7 +620,6 @@ static void abx500_gpio_dbg_show_one(struct seq_file *s, 
	} else

		seq_printf(s, " %-9s", chip->get(chip, offset) ? "hi" : "lo");



	if (pctldev)

	mode = abx500_get_mode(pctldev, chip, offset);



	seq_printf(s, " %s", (mode < 0) ? "unknown" : modes[mode]);

drivers/pinctrl/pinctrl-at91.c

+2 −2
Original line number Diff line number Diff line
@@ -497,10 +497,10 @@ static struct at91_pinctrl_mux_ops at91sam9x5_ops = { 
static void at91_pin_dbg(const struct device *dev, const struct at91_pmx_pin *pin)

{

	if (pin->mux) {

		dev_dbg(dev, "pio%c%d configured as periph%c with conf = 0x%lu\n",

		dev_dbg(dev, "pio%c%d configured as periph%c with conf = 0x%lx\n",

			pin->bank + 'A', pin->pin, pin->mux - 1 + 'A', pin->conf);

	} else {

		dev_dbg(dev, "pio%c%d configured as gpio with conf = 0x%lu\n",

		dev_dbg(dev, "pio%c%d configured as gpio with conf = 0x%lx\n",

			pin->bank + 'A', pin->pin, pin->conf);

	}

}

drivers/pinctrl/pinctrl-rockchip.c

+9 −6
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) 
	int reg, ret, mask;

	unsigned long flags;

	u8 bit;

	u32 data;

	u32 data, rmask;



	if (iomux_num > 3)

		return -EINVAL;
@@ -478,8 +478,9 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) 
	spin_lock_irqsave(&bank->slock, flags);



	data = (mask << (bit + 16));

	rmask = data | (data >> 16);

	data |= (mux & mask) << bit;

	ret = regmap_write(regmap, reg, data);

	ret = regmap_update_bits(regmap, reg, rmask, data);



	spin_unlock_irqrestore(&bank->slock, flags);
@@ -634,7 +635,7 @@ static int rk3288_set_drive(struct rockchip_pin_bank *bank, int pin_num, 
	struct regmap *regmap;

	unsigned long flags;

	int reg, ret, i;

	u32 data;

	u32 data, rmask;

	u8 bit;



	rk3288_calc_drv_reg_and_bit(bank, pin_num, &regmap, &reg, &bit);
@@ -657,9 +658,10 @@ static int rk3288_set_drive(struct rockchip_pin_bank *bank, int pin_num, 


	/* enable the write to the equivalent lower bits */

	data = ((1 << RK3288_DRV_BITS_PER_PIN) - 1) << (bit + 16);

	rmask = data | (data >> 16);

	data |= (ret << bit);



	ret = regmap_write(regmap, reg, data);

	ret = regmap_update_bits(regmap, reg, rmask, data);

	spin_unlock_irqrestore(&bank->slock, flags);



	return ret;
@@ -722,7 +724,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, 
	int reg, ret;

	unsigned long flags;

	u8 bit;

	u32 data;

	u32 data, rmask;



	dev_dbg(info->dev, "setting pull of GPIO%d-%d to %d\n",

		 bank->bank_num, pin_num, pull);
@@ -750,6 +752,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, 


		/* enable the write to the equivalent lower bits */

		data = ((1 << RK3188_PULL_BITS_PER_PIN) - 1) << (bit + 16);

		rmask = data | (data >> 16);



		switch (pull) {

		case PIN_CONFIG_BIAS_DISABLE:
@@ -770,7 +773,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, 
			return -EINVAL;

		}



		ret = regmap_write(regmap, reg, data);

		ret = regmap_update_bits(regmap, reg, rmask, data);



		spin_unlock_irqrestore(&bank->slock, flags);

		break;

drivers/pinctrl/pinctrl-tegra-xusb.c

+3 −2
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ static struct phy *tegra_xusb_padctl_xlate(struct device *dev, 
	if (args->args_count <= 0)

		return ERR_PTR(-EINVAL);



	if (index > ARRAY_SIZE(padctl->phys))

	if (index >= ARRAY_SIZE(padctl->phys))

		return ERR_PTR(-EINVAL);



	return padctl->phys[index];
@@ -930,7 +930,8 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) 


	padctl->provider = devm_of_phy_provider_register(&pdev->dev,

							 tegra_xusb_padctl_xlate);

	if (err < 0) {

	if (IS_ERR(padctl->provider)) {

		err = PTR_ERR(padctl->provider);

		dev_err(&pdev->dev, "failed to register PHYs: %d\n", err);

		goto unregister;

	}