Skip to content

Commit c2d3306

Browse files
torvaldstorvalds
committed
Merge tag 'gpio-v3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull GPIO changes from Linus Walleij: "Here is the bulk of GPIO changes for the v3.13 development cycle. I've got ACKs for the things that affect other subsystems (or it's my own subsystem, like pinctrl). Most of that pertain to an attempt from my side to consolidate and get rid of custom GPIO implementations in the ARM tree. I will continue doing this. The main change this time is the new GPIO descriptor API, background for this can be found in Corbet's summary from this january in LWN: http://lwn.net/Articles/533632/ Summary: - Merged the GPIO descriptor API from Alexandre Courbot. This is a first step toward trying to get rid of the global GPIO numberspace for the future. - Add an API so that driver can flag that a certain GPIO line is being used by a irqchip backend for generating IRQs, so that we can enforce checks, like not allowing users to switch that line to an output at runtime, since this makes no sense. Implemented corresponding calls in a few select drivers. - ACPI GPIO cleanups, refactorings and switch to using the descriptor-based interface. - Support for the TPS80036 Palmas GPIO variant. - A new driver for the Broadcom Kona GPIO SoC IP block. - Device tree support for the PCF857x driver. - A set of ARM GPIO refactorings with the goal of getting rid of a bunch of custom GPIO implementations from the arch/arm/* tree: * Move the IOP GPIO driver to the GPIO subsystem and fix all users to use the gpiolib API for accessing GPIOs. Delete the old custom GPIO implementation. * Delete the unused custom PXA GPIO implemention. * Convert all users of the IXP4 custom GPIO implementation to use gpiolib and delete the custom implementation. * Delete the custom Gemini GPIO implementation, also completely unused. - Various cleanups and renamings" * tag 'gpio-v3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (85 commits) gpio: gpio-mxs: Remove unneeded dt checks gpio: pl061: don't depend on CONFIG_ARM gpio: bcm-kona: add missing .owner to struct gpio_chip gpiolib: provide a declaration of seq_file in gpio/driver.h gpiolib: include gpio/consumer.h in of_gpio.h for desc_to_gpio() gpio: provide stubs for devres gpio functions gpiolib: devres: add missing headers gpiolib: make GPIO_DEVRES depend on GPIOLIB gpiolib: devres: fix devm_gpiod_get_index() gpiolib / ACPI: document the GPIO descriptor based interface gpiolib / ACPI: allow passing GPIOF_ACTIVE_LOW for GpioInt resources gpiolib / ACPI: add ACPI support for gpiod_get_index() gpiolib / ACPI: convert to gpiod interfaces gpiolib: add gpiod_get() and gpiod_put() functions gpiolib: port of_ functions to use gpiod gpiolib: export descriptor-based GPIO interface Fixup "MAINTAINERS: GPIO-INTEL-MID: add maintainer" gpio: bcm281xx: Don't print addresses of GPIO area in probe() gpio: tegra: use new gpio_lock_as_irq() API gpio: rcar: Include linux/of.h header ...
2 parents 8a5dc58 + 9935712 commit c2d3306

74 files changed

Lines changed: 3199 additions & 1455 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/acpi/enumeration.txt‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,6 @@ These GPIO numbers are controller relative and path "\\_SB.PCI0.GPI0"
295295
specifies the path to the controller. In order to use these GPIOs in Linux
296296
we need to translate them to the Linux GPIO numbers.
297297

298-
The driver can do this by including <linux/acpi_gpio.h> and then calling
299-
acpi_get_gpio(path, gpio). This will return the Linux GPIO number or
300-
negative errno if there was no translation found.
301-
302298
In a simple case of just getting the Linux GPIO number from device
303299
resources one can use acpi_get_gpio_by_index() helper function. It takes
304300
pointer to the device and index of the GpioIo/GpioInt descriptor in the
@@ -322,3 +318,25 @@ suitable to the gpiolib before passing them.
322318

323319
In case of GpioInt resource an additional call to gpio_to_irq() must be
324320
done before calling request_irq().
321+
322+
Note that the above API is ACPI specific and not recommended for drivers
323+
that need to support non-ACPI systems. The recommended way is to use
324+
the descriptor based GPIO interfaces. The above example looks like this
325+
when converted to the GPIO desc:
326+
327+
#include <linux/gpio/consumer.h>
328+
...
329+
330+
struct gpio_desc *irq_desc, *power_desc;
331+
332+
irq_desc = gpiod_get_index(dev, NULL, 1);
333+
if (IS_ERR(irq_desc))
334+
/* handle error */
335+
336+
power_desc = gpiod_get_index(dev, NULL, 0);
337+
if (IS_ERR(power_desc))
338+
/* handle error */
339+
340+
/* Now we can use the GPIO descriptors */
341+
342+
See also Documentation/gpio.txt.

‎Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
Broadcom Kona Family GPIO
2+
=========================
3+
4+
This GPIO driver is used in the following Broadcom SoCs:
5+
BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
6+
7+
The Broadcom GPIO Controller IP can be configured prior to synthesis to
8+
support up to 8 banks of 32 GPIOs where each bank has its own IRQ. The
9+
GPIO controller only supports edge, not level, triggering of interrupts.
10+
11+
Required properties
12+
-------------------
13+
14+
- compatible: "brcm,bcm11351-gpio", "brcm,kona-gpio"
15+
- reg: Physical base address and length of the controller's registers.
16+
- interrupts: The interrupt outputs from the controller. There is one GPIO
17+
interrupt per GPIO bank. The number of interrupts listed depends on the
18+
number of GPIO banks on the SoC. The interrupts must be ordered by bank,
19+
starting with bank 0. There is always a 1:1 mapping between banks and
20+
IRQs.
21+
- #gpio-cells: Should be <2>. The first cell is the pin number, the second
22+
cell is used to specify optional parameters:
23+
- bit 0 specifies polarity (0 for normal, 1 for inverted)
24+
See also "gpio-specifier" in .../devicetree/bindings/gpio/gpio.txt.
25+
- #interrupt-cells: Should be <2>. The first cell is the GPIO number. The
26+
second cell is used to specify flags. The following subset of flags is
27+
supported:
28+
- trigger type (bits[1:0]):
29+
1 = low-to-high edge triggered.
30+
2 = high-to-low edge triggered.
31+
3 = low-to-high or high-to-low edge triggered
32+
Valid values are 1, 2, 3
33+
See also .../devicetree/bindings/interrupt-controller/interrupts.txt.
34+
- gpio-controller: Marks the device node as a GPIO controller.
35+
- interrupt-controller: Marks the device node as an interrupt controller.
36+
37+
Example:
38+
gpio: gpio@35003000 {
39+
compatible = "brcm,bcm11351-gpio", "brcm,kona-gpio";
40+
reg = <0x35003000 0x800>;
41+
interrupts =
42+
<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH
43+
GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH
44+
GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH
45+
GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
46+
GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
47+
GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
48+
#gpio-cells = <2>;
49+
#interrupt-cells = <2>;
50+
gpio-controller;
51+
interrupt-controller;
52+
};

‎Documentation/devicetree/bindings/gpio/gpio-pcf857x.txt‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
* PCF857x-compatible I/O expanders
2+
3+
The PCF857x-compatible chips have "quasi-bidirectional" I/O lines that can be
4+
driven high by a pull-up current source or driven low to ground. This combines
5+
the direction and output level into a single bit per line, which can't be read
6+
back. We can't actually know at initialization time whether a line is configured
7+
(a) as output and driving the signal low/high, or (b) as input and reporting a
8+
low/high value, without knowing the last value written since the chip came out
9+
of reset (if any). The only reliable solution for setting up line direction is
10+
thus to do it explicitly.
11+
12+
Required Properties:
13+
14+
- compatible: should be one of the following.
15+
- "maxim,max7328": For the Maxim MAX7378
16+
- "maxim,max7329": For the Maxim MAX7329
17+
- "nxp,pca8574": For the NXP PCA8574
18+
- "nxp,pca8575": For the NXP PCA8575
19+
- "nxp,pca9670": For the NXP PCA9670
20+
- "nxp,pca9671": For the NXP PCA9671
21+
- "nxp,pca9672": For the NXP PCA9672
22+
- "nxp,pca9673": For the NXP PCA9673
23+
- "nxp,pca9674": For the NXP PCA9674
24+
- "nxp,pca9675": For the NXP PCA9675
25+
- "nxp,pcf8574": For the NXP PCF8574
26+
- "nxp,pcf8574a": For the NXP PCF8574A
27+
- "nxp,pcf8575": For the NXP PCF8575
28+
- "ti,tca9554": For the TI TCA9554
29+
30+
- reg: I2C slave address.
31+
32+
- gpio-controller: Marks the device node as a gpio controller.
33+
- #gpio-cells: Should be 2. The first cell is the GPIO number and the second
34+
cell specifies GPIO flags, as defined in <dt-bindings/gpio/gpio.h>. Only the
35+
GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW flags are supported.
36+
37+
Optional Properties:
38+
39+
- lines-initial-states: Bitmask that specifies the initial state of each
40+
line. When a bit is set to zero, the corresponding line will be initialized to
41+
the input (pulled-up) state. When the bit is set to one, the line will be
42+
initialized the the low-level output state. If the property is not specified
43+
all lines will be initialized to the input state.
44+
45+
The I/O expander can detect input state changes, and thus optionally act as
46+
an interrupt controller. When the expander interrupt line is connected all the
47+
following properties must be set. For more information please see the
48+
interrupt controller device tree bindings documentation available at
49+
Documentation/devicetree/bindings/interrupt-controller/interrupts.txt.
50+
51+
- interrupt-controller: Identifies the node as an interrupt controller.
52+
- #interrupt-cells: Number of cells to encode an interrupt source, shall be 2.
53+
- interrupt-parent: phandle of the parent interrupt controller.
54+
- interrupts: Interrupt specifier for the controllers interrupt.
55+
56+
57+
Please refer to gpio.txt in this directory for details of the common GPIO
58+
bindings used by client devices.
59+
60+
Example: PCF8575 I/O expander node
61+
62+
pcf8575: gpio@20 {
63+
compatible = "nxp,pcf8575";
64+
reg = <0x20>;
65+
interrupt-parent = <&irqpin2>;
66+
interrupts = <3 0>;
67+
gpio-controller;
68+
#gpio-cells = <2>;
69+
interrupt-controller;
70+
#interrupt-cells = <2>;
71+
};

‎MAINTAINERS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4440,6 +4440,12 @@ F: Documentation/networking/ixgbevf.txt
44404440
F: Documentation/networking/i40e.txt
44414441
F: drivers/net/ethernet/intel/
44424442

4443+
INTEL-MID GPIO DRIVER
4444+
M: David Cohen <david.a.cohen@linux.intel.com>
4445+
L: linux-gpio@vger.kernel.org
4446+
S: Maintained
4447+
F: drivers/gpio/gpio-intel-mid.c
4448+
44434449
INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
44444450
M: Stanislav Yakovlev <stas.yakovlev@gmail.com>
44454451
L: linux-wireless@vger.kernel.org

‎arch/arm/Kconfig‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ config ARCH_GEMINI
389389
select CLKSRC_MMIO
390390
select CPU_FA526
391391
select GENERIC_CLOCKEVENTS
392-
select NEED_MACH_GPIO_H
393392
help
394393
Support for the Cortina Systems Gemini family SoCs
395394

@@ -458,7 +457,7 @@ config ARCH_IOP32X
458457
depends on MMU
459458
select ARCH_REQUIRE_GPIOLIB
460459
select CPU_XSCALE
461-
select NEED_MACH_GPIO_H
460+
select GPIO_IOP
462461
select NEED_RET_TO_USER
463462
select PCI
464463
select PLAT_IOP
@@ -471,7 +470,7 @@ config ARCH_IOP33X
471470
depends on MMU
472471
select ARCH_REQUIRE_GPIOLIB
473472
select CPU_XSCALE
474-
select NEED_MACH_GPIO_H
473+
select GPIO_IOP
475474
select NEED_RET_TO_USER
476475
select PCI
477476
select PLAT_IOP
@@ -560,7 +559,6 @@ config ARCH_MMP
560559
select GPIO_PXA
561560
select IRQ_DOMAIN
562561
select MULTI_IRQ_HANDLER
563-
select NEED_MACH_GPIO_H
564562
select PINCTRL
565563
select PLAT_PXA
566564
select SPARSE_IRQ
@@ -623,7 +621,6 @@ config ARCH_PXA
623621
select GPIO_PXA
624622
select HAVE_IDE
625623
select MULTI_IRQ_HANDLER
626-
select NEED_MACH_GPIO_H
627624
select PLAT_PXA
628625
select SPARSE_IRQ
629626
help

‎arch/arm/include/asm/hardware/iop3xx-gpio.h‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎arch/arm/include/asm/hardware/iop3xx.h‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,9 @@
1818
/*
1919
* IOP3XX GPIO handling
2020
*/
21-
#define GPIO_IN 0
22-
#define GPIO_OUT 1
23-
#define GPIO_LOW 0
24-
#define GPIO_HIGH 1
2521
#define IOP3XX_GPIO_LINE(x) (x)
2622

2723
#ifndef __ASSEMBLY__
28-
extern void gpio_line_config(int line, int direction);
29-
extern int gpio_line_get(int line);
30-
extern void gpio_line_set(int line, int value);
3124
extern int init_atu;
3225
extern int iop3xx_get_init_atu(void);
3326
#endif
@@ -168,11 +161,6 @@ extern int iop3xx_get_init_atu(void);
168161
/* PERCR0 DOESN'T EXIST - index from 1! */
169162
#define IOP3XX_PERCR0 (volatile u32 *)IOP3XX_REG_ADDR(0x0710)
170163

171-
/* General Purpose I/O */
172-
#define IOP3XX_GPOE (volatile u32 *)IOP3XX_GPIO_REG(0x0000)
173-
#define IOP3XX_GPID (volatile u32 *)IOP3XX_GPIO_REG(0x0004)
174-
#define IOP3XX_GPOD (volatile u32 *)IOP3XX_GPIO_REG(0x0008)
175-
176164
/* Timers */
177165
#define IOP3XX_TU_TMR0 (volatile u32 *)IOP3XX_TIMER_REG(0x0000)
178166
#define IOP3XX_TU_TMR1 (volatile u32 *)IOP3XX_TIMER_REG(0x0004)

‎arch/arm/mach-gemini/gpio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#include <mach/hardware.h>
2323
#include <mach/irqs.h>
24-
#include <mach/gpio.h>
2524

2625
#define GPIO_BASE(x) IO_ADDRESS(GEMINI_GPIO_BASE(x))
26+
#define irq_to_gpio(x) ((x) - GPIO_IRQ_BASE)
2727

2828
/* GPIO registers definition */
2929
#define GPIO_DATA_OUT 0x0

‎arch/arm/mach-gemini/include/mach/gpio.h‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎arch/arm/mach-iop32x/em7210.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <asm/mach/time.h>
3333
#include <asm/mach-types.h>
3434
#include <mach/time.h>
35+
#include "gpio-iop32x.h"
3536

3637
static void __init em7210_timer_init(void)
3738
{
@@ -183,6 +184,7 @@ void em7210_power_off(void)
183184

184185
static void __init em7210_init_machine(void)
185186
{
187+
register_iop32x_gpio();
186188
platform_device_register(&em7210_serial_device);
187189
platform_device_register(&iop3xx_i2c0_device);
188190
platform_device_register(&iop3xx_i2c1_device);

0 commit comments

Comments
 (0)