diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-11 15:23:24 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-11 15:23:24 +0200 |
| commit | 1e86355adc6df3e228e7fd053d25e301fe768094 (patch) | |
| tree | 0b60218aee72e8bdc1cdf6f2ff933d814577330c /include/dt-bindings | |
| parent | 63ef577d9ae51a2c4c34670f8f1eeded0be629b2 (diff) | |
| parent | ed05637c30e6d13e5793aab64d6a6e57e30228af (diff) | |
Merge tag 'omap-for-v4.3/dt-pt3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Omap device tree changes for v4.3 merge window. Pretty much all
just trivial additions to configure devices for various SoCs and
boards:
- Updates for omap3-devkit8000 board support
- M3 coprosessor, regulator, mux, RTC and eMMC updates for am437x
- MMC, regmap, mux and dwc3 updates for dra7 and omap5
* tag 'omap-for-v4.3/dt-pt3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits)
ARM: dts: omap3-devkit8000: Add ADS7846 Touchscreen support
ARM: dts: omap3-devkit8000: add LCD panels
ARM: dts: omap3-devkit8000: Add DSS' DVI support
ARM: dts: omap3-devkit8000: Add S-video output support
ARM: dts: omap3-devkit8000: Add keymap support
ARM: dts: omap3-devkit8000: Add PMU stat support
ARM: dts: omap3-devkit8000: Add user button support
ARM: dts: am437x-gp-evm: Add regulator-always-on and regulator-boot-on for RTC DCDCs
ARM: dts: AM4372: Reorder the rtc compatible string
ARM: dts: am437x-gp-evm: Add eMMC support
ARM: dts: am437x-gp-evm: Add gpio-hog for configuring eMMC/NAND driver
ARM: dts: am43xx: Introduce MUX_MODE9 for pinctrl
ARM: dts: dra72-evm: Fix spurious card insert/removal interrupt
ARM: dts: dra7-evm: Fix spurious card insert/removal interrupt
ARM: dts: am57xx-beagle-x15: mmc1: remove redundant pbias-supply property
ARM: dts: dra7-evm: Add MMCSD card removal GPIO
ARM: dts: dra72-evm: Set max clock frequency of MMC1 and MMC2
ARM: dts: dra7-evm: add evm_3v3_sd regulator
ARM: dts: dra72-evm: add evm_3v3_sd regulator
ARM: dts: AM4372: Add the wkup_m3_ipc node
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/dt-bindings')
| -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 b00bbc9c60b4..774dc1e843c5 100644 --- a/include/dt-bindings/pinctrl/am43xx.h +++ b/include/dt-bindings/pinctrl/am43xx.h @@ -14,6 +14,7 @@ #define MUX_MODE6 6 #define MUX_MODE7 7 #define MUX_MODE8 8 +#define MUX_MODE9 9 #define PULL_DISABLE (1 << 16) #define PULL_UP (1 << 17) |