diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-13 09:33:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-13 09:33:32 -0700 |
| commit | 98ead6e0011e66b8a3e14bc2f264460742ca79c1 (patch) | |
| tree | 29d536041d8a09b81508523ebb571e6be2b41a42 /include | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
| parent | d1f1ca36b566aa56effdd7df69750062ec735131 (diff) | |
| download | linux-98ead6e0011e66b8a3e14bc2f264460742ca79c1.tar.gz linux-98ead6e0011e66b8a3e14bc2f264460742ca79c1.tar.bz2 linux-98ead6e0011e66b8a3e14bc2f264460742ca79c1.zip | |
Merge tag 'fixes-against-v3.12-rc3-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
Few fixes for omap3 related hangs and errors that people have
noticed now that people are actually using the device tree
based booting for omap3.
Also one regression fix for timer compile for dra7xx when
omap5 is not selected, and a LED regression fix for n900.
* tag 'fixes-against-v3.12-rc3-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2: RX-51: Add missing max_current to rx51_lp5523_led_config
ARM: mach-omap2: board-generic: fix undefined symbol
ARM: dts: Fix pinctrl mask for omap3
ARM: OMAP3: Fix hardware detection for omap3630 when booted with device tree
ARM: OMAP2: gpmc-onenand: fix sync mode setup with DT
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/pinctrl/omap.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h index edbd250809cb..bed35e36fd27 100644 --- a/include/dt-bindings/pinctrl/omap.h +++ b/include/dt-bindings/pinctrl/omap.h @@ -23,7 +23,7 @@ #define PULL_UP (1 << 4) #define ALTELECTRICALSEL (1 << 5) -/* 34xx specific mux bit defines */ +/* omap3/4/5 specific mux bit defines */ #define INPUT_EN (1 << 8) #define OFF_EN (1 << 9) #define OFFOUT_EN (1 << 10) @@ -31,8 +31,6 @@ #define OFF_PULL_EN (1 << 12) #define OFF_PULL_UP (1 << 13) #define WAKEUP_EN (1 << 14) - -/* 44xx specific mux bit defines */ #define WAKEUP_EVENT (1 << 15) /* Active pin states */ |