diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-13 12:59:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-13 12:59:10 -0400 |
| commit | 3552570a21d46a98ba6885707235921f54b04d3e (patch) | |
| tree | da328da57f81c431f8a22aa805b61dca456ff73c /include | |
| parent | 2d4712b7a615e5db3eb9a427f1722eec79681b4b (diff) | |
| parent | 4d594dd3028ba8cdfcbd854bde3811a1ee4e36d7 (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"A small batch of fixes this week, mostly OMAP related. Nothing stands
out as particularly controversial.
Also a fix for a 3.12-rc1 timer regression for Exynos platforms,
including the Chromebooks"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: exynos: dts: Update 5250 arch timer node with clock frequency
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
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 @@ | |||
| 23 | #define PULL_UP (1 << 4) | 23 | #define PULL_UP (1 << 4) |
| 24 | #define ALTELECTRICALSEL (1 << 5) | 24 | #define ALTELECTRICALSEL (1 << 5) |
| 25 | 25 | ||
| 26 | /* 34xx specific mux bit defines */ | 26 | /* omap3/4/5 specific mux bit defines */ |
| 27 | #define INPUT_EN (1 << 8) | 27 | #define INPUT_EN (1 << 8) |
| 28 | #define OFF_EN (1 << 9) | 28 | #define OFF_EN (1 << 9) |
| 29 | #define OFFOUT_EN (1 << 10) | 29 | #define OFFOUT_EN (1 << 10) |
| @@ -31,8 +31,6 @@ | |||
| 31 | #define OFF_PULL_EN (1 << 12) | 31 | #define OFF_PULL_EN (1 << 12) |
| 32 | #define OFF_PULL_UP (1 << 13) | 32 | #define OFF_PULL_UP (1 << 13) |
| 33 | #define WAKEUP_EN (1 << 14) | 33 | #define WAKEUP_EN (1 << 14) |
| 34 | |||
| 35 | /* 44xx specific mux bit defines */ | ||
| 36 | #define WAKEUP_EVENT (1 << 15) | 34 | #define WAKEUP_EVENT (1 << 15) |
| 37 | 35 | ||
| 38 | /* Active pin states */ | 36 | /* Active pin states */ |