Merge tag 'v5.13-rc6' into staging-next

We want the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-14 09:12:45 +02:00
parent edc64e7a03 009c9aa5be
commit 23f89b1275
520 changed files with 4152 additions and 2046 deletions
@@ -50,6 +50,7 @@ struct sysc_regbits {
 	s8 emufree_shift;
 };

+#define SYSC_QUIRK_REINIT_ON_RESUME	BIT(27)
 #define SYSC_QUIRK_GPMC_DEBUG		BIT(26)
 #define SYSC_MODULE_QUIRK_ENA_RESETDONE	BIT(25)
 #define SYSC_MODULE_QUIRK_PRUSS		BIT(24)