diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-08 23:19:06 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-08 23:19:21 -0800 |
| commit | 20bb4685983732b669f4c827022cccfba16a2aed (patch) | |
| tree | 44b88211b7c2ec6a21c90bd4dff60ae8605409b1 /include | |
| parent | 86a37e52bb04acf6add7936bc45d53c3f3b83caa (diff) | |
| parent | f777ba1780584b100ab9664cc06d04f3bb273a84 (diff) | |
Merge tag 'omap-for-v3.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
OMAP device tree changes from Tony Lindgren:
Device tree related changes for omaps with minor code
changes also to platform data quirks that are still needed
for some features.
* tag 'omap-for-v3.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (60 commits)
ARM: dts: omap4+: Add DMM bindings
ARM: dts: am43x-gp-evm: Add matrix gpio keys.
ARM: dts: am43xx: add support for parallel NAND flash
ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt
ARM: dts: am335x-evm: NAND: update MTD partition table
ARM: OMAP2+: gpmc: update gpmc_hwecc_bch_capable() for new platforms and ECC schemes
ARM: dts: omap3-gta04: Add bma180 accelerometer
ARM: dts: omap3-gta04: Enable mmc2 for wifi
ARM: dts: omap3-gta04: Add basic sound support
ARM: dts: omap3-gta04: Add twl4030 charger
ARM: dts: omap3-gta04: Add touchscreen properties
ARM: dts: omap3-gta04: Add support for magnetometer
ARM: dts: am437x-gp-evm: Enable gpio.
ARM: dts: am437x-gp-evm: Add pwm backlight support.
ARM: dts: am437x-gp-evm: Add gp dts.
ARM: dts: am43x-epos-evm: Add SPI data.
ARM: dts: am43x-epos-evm: Add I2C2 data.
pinctrl: am43xx: dt-bindings: add MUX_MODE8
ARM: dts: am43x-epos-evm: Add pwm backlight support.
ARM: dts: am4372: Add pwm-cells property for ecap device.
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/pinctrl/am43xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/dt-bindings/pinctrl/am43xx.h b/include/dt-bindings/pinctrl/am43xx.h index eb6c366adfba..9c2e4f82381e 100644 --- a/include/dt-bindings/pinctrl/am43xx.h +++ b/include/dt-bindings/pinctrl/am43xx.h @@ -13,6 +13,7 @@ #define MUX_MODE5 5 #define MUX_MODE6 6 #define MUX_MODE7 7 +#define MUX_MODE8 8 #define PULL_DISABLE (1 << 16) #define PULL_UP (1 << 17) |