diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-23 14:58:02 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-23 14:58:02 +0300 |
commit | eb1488360c7d66955ff6e0b07049a22f553efaf3 (patch) | |
tree | a3550cad197bb11d759d3362e7be2becf69e576d /include/linux/platform_data | |
parent | ea81896dc98f324ff3fb9b1e74b4915a1beb3296 (diff) | |
parent | 46cf053efec6a3a5f343fead837777efe8252a46 (diff) | |
download | linux-eb1488360c7d66955ff6e0b07049a22f553efaf3.tar.xz |
Merge 5.5-rc3 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r-- | include/linux/platform_data/ti-sysc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_data/ti-sysc.h b/include/linux/platform_data/ti-sysc.h index 0b9380475144..8cfe570fdece 100644 --- a/include/linux/platform_data/ti-sysc.h +++ b/include/linux/platform_data/ti-sysc.h @@ -49,6 +49,7 @@ struct sysc_regbits { s8 emufree_shift; }; +#define SYSC_QUIRK_FORCE_MSTANDBY BIT(20) #define SYSC_MODULE_QUIRK_AESS BIT(19) #define SYSC_MODULE_QUIRK_SGX BIT(18) #define SYSC_MODULE_QUIRK_HDQ1W BIT(17) |