Commit 4672a4a9 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'devel' into for-next

parents 93e0272a a6175e89
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ Required properties:
	nxp,pca9698
	nxp,pcal6416
	nxp,pcal6524
	nxp,pcal9535
	nxp,pcal9555a
	maxim,max7310
	maxim,max7312
+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ Required properties:
			  - First cell is the GPIO line number
			  - Second cell is used to specify optional
			    parameters (unused)
- compatible		: Should be "xlnx,zynq-gpio-1.0" or "xlnx,zynqmp-gpio-1.0"
- compatible		: Should be "xlnx,zynq-gpio-1.0" or
			  "xlnx,zynqmp-gpio-1.0" or "xlnx,versal-gpio-1.0
			  or "xlnx,pmc-gpio-1.0
- clocks		: Clock specifier (see clock bindings for details)
- gpio-controller	: Marks the device node as a GPIO controller.
- interrupts		: Interrupt specifier (see interrupt bindings for
+7 −0
Original line number Diff line number Diff line
@@ -89,6 +89,13 @@ hardware descriptions such as device tree or ACPI:
  Consumer Electronics Control bus using only GPIO. It is used to communicate
  with devices on the HDMI bus.

- gpio-charger: drivers/power/supply/gpio-charger.c is used if you need to do
  battery charging and all you have to go by to check the presence of the
  AC charger or more complex tasks such as indicating charging status using
  nothing but GPIO lines, this driver provides that and also a clearly defined
  way to pass the charging parameters from hardware descriptions such as the
  device tree.

Apart from this there are special GPIO drivers in subsystems like MMC/SD to
read card detect and write protect GPIO lines, and in the TTY serial subsystem
to emulate MCTRL (modem control) signals CTS/RTS by using two GPIO lines. The
+2 −6
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ static void orion_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)

	struct orion_gpio_chip *ochip = gpiochip_get_data(chip);
	u32 out, io_conf, blink, in_pol, data_in, cause, edg_msk, lvl_msk;
	const char *label;
	int i;

	out	= readl_relaxed(GPIO_OUT(ochip));
@@ -453,15 +454,10 @@ static void orion_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
	edg_msk	= readl_relaxed(GPIO_EDGE_MASK(ochip));
	lvl_msk	= readl_relaxed(GPIO_LEVEL_MASK(ochip));

	for (i = 0; i < chip->ngpio; i++) {
		const char *label;
	for_each_requested_gpio(chip, i, label) {
		u32 msk;
		bool is_out;

		label = gpiochip_is_requested(chip, i);
		if (!label)
			continue;

		msk = 1 << i;
		is_out = !(io_conf & msk);

+2 −2
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ config GPIO_MXS

config GPIO_OCTEON
	tristate "Cavium OCTEON GPIO"
	depends on GPIOLIB && CAVIUM_OCTEON_SOC
	depends on CAVIUM_OCTEON_SOC
	default y
	help
	  Say yes here to support the on-chip GPIO lines on the OCTEON
@@ -1117,7 +1117,7 @@ config GPIO_DLN2

config HTC_EGPIO
	bool "HTC EGPIO support"
	depends on GPIOLIB && ARM
	depends on ARM
	help
	  This driver supports the CPLD egpio chip present on
	  several HTC phones.  It provides basic support for input
Loading