diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-08-08 13:39:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-08-08 13:39:40 +0800 |
| commit | d93f53b34077d40e4de13d70663193b359be6a26 (patch) | |
| tree | 079c8df608deb1dccdb7fba985bb8b5c1b41c80b /include | |
| parent | 48b5efd4cf3ad5f7cb0993cf0362600fe010e56c (diff) | |
| parent | e21af7dfe5795138dc2466dc5684d3297acd48a9 (diff) | |
Merge tag 'v3.14.16' into linux-linaro-lsk-v3.14
This is 3.14.16 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/pinctrl/dra.h | 7 | ||||
| -rw-r--r-- | include/linux/printk.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/dt-bindings/pinctrl/dra.h b/include/dt-bindings/pinctrl/dra.h index 002a2855c046..3d33794e4f3e 100644 --- a/include/dt-bindings/pinctrl/dra.h +++ b/include/dt-bindings/pinctrl/dra.h @@ -30,7 +30,8 @@ #define MUX_MODE14 0xe #define MUX_MODE15 0xf -#define PULL_ENA (1 << 16) +#define PULL_ENA (0 << 16) +#define PULL_DIS (1 << 16) #define PULL_UP (1 << 17) #define INPUT_EN (1 << 18) #define SLEWCONTROL (1 << 19) @@ -38,10 +39,10 @@ #define WAKEUP_EVENT (1 << 25) /* Active pin states */ -#define PIN_OUTPUT 0 +#define PIN_OUTPUT (0 | PULL_DIS) #define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP) #define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA) -#define PIN_INPUT INPUT_EN +#define PIN_INPUT (INPUT_EN | PULL_DIS) #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL) #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP) #define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN) diff --git a/include/linux/printk.h b/include/linux/printk.h index fa47e2708c01..cbf094f993f4 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -132,9 +132,9 @@ asmlinkage __printf(1, 2) __cold int printk(const char *fmt, ...); /* - * Special printk facility for scheduler use only, _DO_NOT_USE_ ! + * Special printk facility for scheduler/timekeeping use only, _DO_NOT_USE_ ! */ -__printf(1, 2) __cold int printk_sched(const char *fmt, ...); +__printf(1, 2) __cold int printk_deferred(const char *fmt, ...); /* * Please don't use printk_ratelimit(), because it shares ratelimiting state @@ -169,7 +169,7 @@ int printk(const char *s, ...) return 0; } static inline __printf(1, 2) __cold -int printk_sched(const char *s, ...) +int printk_deferred(const char *s, ...) { return 0; } |