Commit 3f173bde authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin control fixes from Linus Walleij:
 "Here is an overdue pull request for pin control fixes, the most
  prominent feature is to make Intel Chromebooks (and I suspect any
  other Cherryview-based Intel thing) happy again, which we really want
  to see.

  There is a patch hitting drivers/firmware/* that I was uncertain to
  who actually manages, but I got Andy Shevchenko's and Dmitry Torokov's
  review tags on it and I trust them both 100% to do the right thing for
  Intel platform drivers.

  Summary:

   - Make a few Intel Chromebooks with Cherryview DMI firmware work
     smoothly.

   - A fix for some bogus allocations in the generic group management
     code.

   - Some GPIO descriptor lookup table stubs. Merged through the pin
     control tree for administrative reasons.

   - Revert the "bi-directional" and "output-enable" generic properties:
     we need more discussions around this. It seems other SoCs are using
     input/output gate enablement and these terms are not correct.

   - Fix mux and drive strength atomically in the MXS driver.

   - Fix the SPDIF function on sunxi A83T.

   - OF table terminators and other small fixes"

* tag 'pinctrl-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: sunxi: Fix SPDIF function name for A83T
  pinctrl: mxs: atomically switch mux and drive strength config
  pinctrl: cherryview: Extend the Chromebook DMI quirk to Intel_Strago systems
  firmware: dmi: Add DMI_PRODUCT_FAMILY identification string
  pinctrl: core: Fix warning by removing bogus code
  gpiolib: Add stubs for gpiod lookup table interface
  Revert "pinctrl: generic: Add bi-directional and output-enable"
  pinctrl: cherryview: Add terminate entry for dmi_system_id tables
parents b0f5a8f3 7903d4f5

Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

+0 −2
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ bias-bus-hold - latch weakly 
bias-pull-up		- pull up the pin

bias-pull-down		- pull down the pin

bias-pull-pin-default	- use pin-default pull state

bi-directional		- pin supports simultaneous input/output operations

drive-push-pull		- drive actively high and low

drive-open-drain	- drive with open drain

drive-open-source	- drive with open source
@@ -260,7 +259,6 @@ input-debounce - debounce mode with debound time X 
power-source		- select between different power supplies

low-power-enable	- enable low power mode

low-power-disable	- disable low power mode

output-enable		- enable output on pin regardless of output value

output-low		- set the pin to output mode with low level

output-high		- set the pin to output mode with high level

slew-rate		- set the slew rate

drivers/firmware/dmi-id.c

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ DEFINE_DMI_ATTR_WITH_SHOW(product_name, 0444, DMI_PRODUCT_NAME); 
DEFINE_DMI_ATTR_WITH_SHOW(product_version,	0444, DMI_PRODUCT_VERSION);

DEFINE_DMI_ATTR_WITH_SHOW(product_serial,	0400, DMI_PRODUCT_SERIAL);

DEFINE_DMI_ATTR_WITH_SHOW(product_uuid,		0400, DMI_PRODUCT_UUID);

DEFINE_DMI_ATTR_WITH_SHOW(product_family,	0400, DMI_PRODUCT_FAMILY);

DEFINE_DMI_ATTR_WITH_SHOW(board_vendor,		0444, DMI_BOARD_VENDOR);

DEFINE_DMI_ATTR_WITH_SHOW(board_name,		0444, DMI_BOARD_NAME);

DEFINE_DMI_ATTR_WITH_SHOW(board_version,	0444, DMI_BOARD_VERSION);
@@ -191,6 +192,7 @@ static void __init dmi_id_init_attr_table(void) 
	ADD_DMI_ATTR(product_version,   DMI_PRODUCT_VERSION);

	ADD_DMI_ATTR(product_serial,    DMI_PRODUCT_SERIAL);

	ADD_DMI_ATTR(product_uuid,      DMI_PRODUCT_UUID);

	ADD_DMI_ATTR(product_family,      DMI_PRODUCT_FAMILY);

	ADD_DMI_ATTR(board_vendor,      DMI_BOARD_VENDOR);

	ADD_DMI_ATTR(board_name,        DMI_BOARD_NAME);

	ADD_DMI_ATTR(board_version,     DMI_BOARD_VERSION);

drivers/firmware/dmi_scan.c

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy) 
		dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);

		dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);

		dmi_save_uuid(dm, DMI_PRODUCT_UUID, 8);

		dmi_save_ident(dm, DMI_PRODUCT_FAMILY, 26);

		break;

	case 2:		/* Base Board Information */

		dmi_save_ident(dm, DMI_BOARD_VENDOR, 4);

drivers/pinctrl/core.c

+3 −17
Original line number Diff line number Diff line
@@ -680,30 +680,16 @@ EXPORT_SYMBOL_GPL(pinctrl_generic_remove_group); 
 * pinctrl_generic_free_groups() - removes all pin groups

 * @pctldev: pin controller device

 *

 * Note that the caller must take care of locking.

 * Note that the caller must take care of locking. The pinctrl groups

 * are allocated with devm_kzalloc() so no need to free them here.

 */

static void pinctrl_generic_free_groups(struct pinctrl_dev *pctldev)

{

	struct radix_tree_iter iter;

	struct group_desc *group;

	unsigned long *indices;

	void **slot;

	int i = 0;



	indices = devm_kzalloc(pctldev->dev, sizeof(*indices) *

			       pctldev->num_groups, GFP_KERNEL);

	if (!indices)

		return;



	radix_tree_for_each_slot(slot, &pctldev->pin_group_tree, &iter, 0)

		indices[i++] = iter.index;



	for (i = 0; i < pctldev->num_groups; i++) {

		group = radix_tree_lookup(&pctldev->pin_group_tree,

					  indices[i]);

		radix_tree_delete(&pctldev->pin_group_tree, indices[i]);

		devm_kfree(pctldev->dev, group);

	}

		radix_tree_delete(&pctldev->pin_group_tree, iter.index);



	pctldev->num_groups = 0;

}

drivers/pinctrl/freescale/pinctrl-mxs.c

+12 −4
Original line number Diff line number Diff line
@@ -194,6 +194,16 @@ static int mxs_pinctrl_get_func_groups(struct pinctrl_dev *pctldev, 
	return 0;

}



static void mxs_pinctrl_rmwl(u32 value, u32 mask, u8 shift, void __iomem *reg)

{

	u32 tmp;



	tmp = readl(reg);

	tmp &= ~(mask << shift);

	tmp |= value << shift;

	writel(tmp, reg);

}



static int mxs_pinctrl_set_mux(struct pinctrl_dev *pctldev, unsigned selector,

			       unsigned group)

{
@@ -211,8 +221,7 @@ static int mxs_pinctrl_set_mux(struct pinctrl_dev *pctldev, unsigned selector, 
		reg += bank * 0x20 + pin / 16 * 0x10;

		shift = pin % 16 * 2;



		writel(0x3 << shift, reg + CLR);

		writel(g->muxsel[i] << shift, reg + SET);

		mxs_pinctrl_rmwl(g->muxsel[i], 0x3, shift, reg);

	}



	return 0;
@@ -279,8 +288,7 @@ static int mxs_pinconf_group_set(struct pinctrl_dev *pctldev, 
			/* mA */

			if (config & MA_PRESENT) {

				shift = pin % 8 * 4;

				writel(0x3 << shift, reg + CLR);

				writel(ma << shift, reg + SET);

				mxs_pinctrl_rmwl(ma, 0x3, shift, reg);

			}



			/* vol */

CRA Git | Maintained and supported by SUSTech CRA and CCSE