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

Commit 09502d9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin control fixes from Linus Walleij:
 "Some pin control driver fixes came in.  One headed for stable and the
  other two are just ordinary merge window fixes.

   - Make the i.MX driver select REGMAP as a dependency
   - Fix up the Mediatek debounce time unit
   - Fix a real hairy ffs vs __ffs issue in the Single pinctrl driver"

* tag 'pinctrl-v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: single: Fix pcs_parse_bits_in_pinctrl_entry to use __ffs than ffs
  pinctrl: mediatek: correct debounce time unit in mtk_gpio_set_debounce
  pinctrl: imx: Kconfig: PINCTRL_IMX select REGMAP
parents ddce1921 56b367c0

drivers/pinctrl/freescale/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config PINCTRL_IMX 
	bool

	select PINMUX

	select PINCONF

	select REGMAP



config PINCTRL_IMX1_CORE

	bool

drivers/pinctrl/mediatek/pinctrl-mtk-common.c

+5 −4
Original line number Diff line number Diff line
@@ -1004,7 +1004,8 @@ static int mtk_gpio_set_debounce(struct gpio_chip *chip, unsigned offset, 
	struct mtk_pinctrl *pctl = dev_get_drvdata(chip->parent);

	int eint_num, virq, eint_offset;

	unsigned int set_offset, bit, clr_bit, clr_offset, rst, i, unmask, dbnc;

	static const unsigned int dbnc_arr[] = {0 , 1, 16, 32, 64, 128, 256};

	static const unsigned int debounce_time[] = {500, 1000, 16000, 32000, 64000,

						128000, 256000};

	const struct mtk_desc_pin *pin;

	struct irq_data *d;
@@ -1022,9 +1023,9 @@ static int mtk_gpio_set_debounce(struct gpio_chip *chip, unsigned offset, 
	if (!mtk_eint_can_en_debounce(pctl, eint_num))

		return -ENOSYS;



	dbnc = ARRAY_SIZE(dbnc_arr);

	for (i = 0; i < ARRAY_SIZE(dbnc_arr); i++) {

		if (debounce <= dbnc_arr[i]) {

	dbnc = ARRAY_SIZE(debounce_time);

	for (i = 0; i < ARRAY_SIZE(debounce_time); i++) {

		if (debounce <= debounce_time[i]) {

			dbnc = i;

			break;

		}

drivers/pinctrl/pinctrl-single.c

+3 −3
Original line number Diff line number Diff line
@@ -1280,9 +1280,9 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, 


		/* Parse pins in each row from LSB */

		while (mask) {

			bit_pos = ffs(mask);

			bit_pos = __ffs(mask);

			pin_num_from_lsb = bit_pos / pcs->bits_per_pin;

			mask_pos = ((pcs->fmask) << (bit_pos - 1));

			mask_pos = ((pcs->fmask) << bit_pos);

			val_pos = val & mask_pos;

			submask = mask & mask_pos;
@@ -1852,7 +1852,7 @@ static int pcs_probe(struct platform_device *pdev) 
	ret = of_property_read_u32(np, "pinctrl-single,function-mask",

				   &pcs->fmask);

	if (!ret) {

		pcs->fshift = ffs(pcs->fmask) - 1;

		pcs->fshift = __ffs(pcs->fmask);

		pcs->fmax = pcs->fmask >> pcs->fshift;

	} else {

		/* If mask property doesn't exist, function mux is invalid. */