Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

12 files changed, 34 insertions, 18 deletions

diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS
index 586ef08db..957fb4e1d 100644
--- a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS
@@ -1 +1 @@
-# CONFIG_CRYPTO_DEV_SUN4I_SS is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG
index d55f95cdc..62fd0b85a 100644
--- a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG
@@ -1 +1 @@
-# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_INPUT_STPMIC1_ONKEY b/configs/fedora/generic/arm/armv7/CONFIG_INPUT_STPMIC1_ONKEY
new file mode 100644
index 000000000..c64eca927
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_INPUT_STPMIC1_ONKEY
@@ -0,0 +1 @@
+CONFIG_INPUT_STPMIC1_ONKEY=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_STPMIC1 b/configs/fedora/generic/arm/armv7/CONFIG_MFD_STPMIC1
new file mode 100644
index 000000000..76953e1df
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_MFD_STPMIC1
@@ -0,0 +1 @@
+CONFIG_MFD_STPMIC1=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_STPMIC1 b/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_STPMIC1
new file mode 100644
index 000000000..3c0492dbd
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_STPMIC1
@@ -0,0 +1 @@
+CONFIG_REGULATOR_STPMIC1=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_STPMIC1_WATCHDOG b/configs/fedora/generic/arm/armv7/CONFIG_STPMIC1_WATCHDOG
new file mode 100644
index 000000000..faa20a811
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_STPMIC1_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_STPMIC1_WATCHDOG=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 301a4fef5..259eb7484 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1152,8 +1152,8 @@ CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
-# CONFIG_CRYPTO_DEV_SUN4I_SS is not set
-# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index bcb3f8925..d2113d3f3 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1152,8 +1152,8 @@ CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
-# CONFIG_CRYPTO_DEV_SUN4I_SS is not set
-# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 87e4aa94c..fabb0addf 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1148,8 +1148,8 @@ CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_CRYPTO_DEV_STM32_CRC=m
 CONFIG_CRYPTO_DEV_STM32_CRYP=m
 CONFIG_CRYPTO_DEV_STM32_HASH=m
-# CONFIG_CRYPTO_DEV_SUN4I_SS is not set
-# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
@@ -2613,6 +2613,7 @@ CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_STPMIC1_ONKEY=m
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_TPS65218_PWRBUTTON=m
@@ -3446,7 +3447,7 @@ CONFIG_MFD_STM32_LPTIMER=m
 CONFIG_MFD_STM32_TIMERS=m
 # CONFIG_MFD_STMFX is not set
 CONFIG_MFD_STMPE=y
-# CONFIG_MFD_STPMIC1 is not set
+CONFIG_MFD_STPMIC1=m
 CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
@@ -5050,6 +5051,7 @@ CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_REGULATOR_STM32_PWR=y
 CONFIG_REGULATOR_STM32_VREFBUF=m
+CONFIG_REGULATOR_STPMIC1=m
 CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TI_ABB=m
 CONFIG_REGULATOR_TPS51632=m
@@ -6415,6 +6417,7 @@ CONFIG_STMMAC_PLATFORM=m
 # CONFIG_STMPE_ADC is not set
 CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
+CONFIG_STPMIC1_WATCHDOG=m
 CONFIG_ST_REMOTEPROC=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_STRICT_KERNEL_RWX=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 8f2726a83..f5042e459 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1112,8 +1112,8 @@ CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_STM32_CRC=m
 CONFIG_CRYPTO_DEV_STM32_CRYP=m
 CONFIG_CRYPTO_DEV_STM32_HASH=m
-# CONFIG_CRYPTO_DEV_SUN4I_SS is not set
-# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
@@ -2523,6 +2523,7 @@ CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_STPMIC1_ONKEY=m
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_UINPUT=m
@@ -3335,7 +3336,7 @@ CONFIG_MFD_STM32_LPTIMER=m
 CONFIG_MFD_STM32_TIMERS=m
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_STPMIC1 is not set
+CONFIG_MFD_STPMIC1=m
 CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
@@ -4820,6 +4821,7 @@ CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_REGULATOR_STM32_PWR=y
 CONFIG_REGULATOR_STM32_VREFBUF=m
+CONFIG_REGULATOR_STPMIC1=m
 CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS62360=m
@@ -6092,6 +6094,7 @@ CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_PCI is not set
 CONFIG_STMMAC_PLATFORM=m
 # CONFIG_STMPE_ADC is not set
+CONFIG_STPMIC1_WATCHDOG=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8e5372822..6a0310d97 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1112,8 +1112,8 @@ CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_STM32_CRC=m
 CONFIG_CRYPTO_DEV_STM32_CRYP=m
 CONFIG_CRYPTO_DEV_STM32_HASH=m
-# CONFIG_CRYPTO_DEV_SUN4I_SS is not set
-# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
@@ -2508,6 +2508,7 @@ CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_STPMIC1_ONKEY=m
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_UINPUT=m
@@ -3317,7 +3318,7 @@ CONFIG_MFD_STM32_LPTIMER=m
 CONFIG_MFD_STM32_TIMERS=m
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_STPMIC1 is not set
+CONFIG_MFD_STPMIC1=m
 CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
@@ -4800,6 +4801,7 @@ CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_REGULATOR_STM32_PWR=y
 CONFIG_REGULATOR_STM32_VREFBUF=m
+CONFIG_REGULATOR_STPMIC1=m
 CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS62360=m
@@ -6071,6 +6073,7 @@ CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_PCI is not set
 CONFIG_STMMAC_PLATFORM=m
 # CONFIG_STMPE_ADC is not set
+CONFIG_STPMIC1_WATCHDOG=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 3eacebaca..18b6dee1a 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1148,8 +1148,8 @@ CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_CRYPTO_DEV_STM32_CRC=m
 CONFIG_CRYPTO_DEV_STM32_CRYP=m
 CONFIG_CRYPTO_DEV_STM32_HASH=m
-# CONFIG_CRYPTO_DEV_SUN4I_SS is not set
-# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
@@ -2598,6 +2598,7 @@ CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_STPMIC1_ONKEY=m
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_TPS65218_PWRBUTTON=m
@@ -3428,7 +3429,7 @@ CONFIG_MFD_STM32_LPTIMER=m
 CONFIG_MFD_STM32_TIMERS=m
 # CONFIG_MFD_STMFX is not set
 CONFIG_MFD_STMPE=y
-# CONFIG_MFD_STPMIC1 is not set
+CONFIG_MFD_STPMIC1=m
 CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
@@ -5030,6 +5031,7 @@ CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_REGULATOR_STM32_PWR=y
 CONFIG_REGULATOR_STM32_VREFBUF=m
+CONFIG_REGULATOR_STPMIC1=m
 CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TI_ABB=m
 CONFIG_REGULATOR_TPS51632=m
@@ -6394,6 +6396,7 @@ CONFIG_STMMAC_PLATFORM=m
 # CONFIG_STMPE_ADC is not set
 CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
+CONFIG_STPMIC1_WATCHDOG=m
 CONFIG_ST_REMOTEPROC=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_STRICT_KERNEL_RWX=y