summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-05-23 13:57:08 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-05-23 13:57:54 +0100
commitbfbd62bda582ba95bc03b41b1fbbef95b6d3a1d6 (patch)
tree910e3f7e209ea60ebdb82e1465fefbacbd68a227
parent10868cd2f96f545744848175bad5bf88dda139a8 (diff)
downloadkernel-bfbd62bda582ba95bc03b41b1fbbef95b6d3a1d6.tar.gz
kernel-bfbd62bda582ba95bc03b41b1fbbef95b6d3a1d6.tar.xz
kernel-bfbd62bda582ba95bc03b41b1fbbef95b6d3a1d6.zip
arm: stm32mp1: enable a few missed options
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_INPUT_STPMIC1_ONKEY1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_MFD_STPMIC11
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_STPMIC11
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_STPMIC1_WATCHDOG1
-rw-r--r--kernel-armv7hl-debug.config5
-rw-r--r--kernel-armv7hl-lpae-debug.config5
-rw-r--r--kernel-armv7hl-lpae.config5
-rw-r--r--kernel-armv7hl.config5
8 files changed, 20 insertions, 4 deletions
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-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 2c347d160..d8df68538 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2565,6 +2565,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
@@ -3387,7 +3388,7 @@ CONFIG_MFD_SPMI_PMIC=m
CONFIG_MFD_STM32_LPTIMER=m
CONFIG_MFD_STM32_TIMERS=m
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
@@ -4946,6 +4947,7 @@ CONFIG_REGULATOR_S2MPA01=m
CONFIG_REGULATOR_S2MPS11=m
CONFIG_REGULATOR_S5M8767=m
CONFIG_REGULATOR_STM32_VREFBUF=m
+CONFIG_REGULATOR_STPMIC1=m
CONFIG_REGULATOR_SY8106A=m
CONFIG_REGULATOR_TI_ABB=m
CONFIG_REGULATOR_TPS51632=m
@@ -6289,6 +6291,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 3cb15ca3e..dadb5fa56 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2470,6 +2470,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
@@ -3271,7 +3272,7 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_STM32_LPTIMER=m
CONFIG_MFD_STM32_TIMERS=m
# 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
@@ -4709,6 +4710,7 @@ CONFIG_REGULATOR_S2MPA01=m
CONFIG_REGULATOR_S2MPS11=m
CONFIG_REGULATOR_S5M8767=m
CONFIG_REGULATOR_STM32_VREFBUF=m
+CONFIG_REGULATOR_STPMIC1=m
CONFIG_REGULATOR_SY8106A=m
CONFIG_REGULATOR_TPS51632=m
CONFIG_REGULATOR_TPS62360=m
@@ -5959,6 +5961,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 4a1ee9519..6a64d4fae 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2455,6 +2455,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
@@ -3253,7 +3254,7 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_STM32_LPTIMER=m
CONFIG_MFD_STM32_TIMERS=m
# 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
@@ -4689,6 +4690,7 @@ CONFIG_REGULATOR_S2MPA01=m
CONFIG_REGULATOR_S2MPS11=m
CONFIG_REGULATOR_S5M8767=m
CONFIG_REGULATOR_STM32_VREFBUF=m
+CONFIG_REGULATOR_STPMIC1=m
CONFIG_REGULATOR_SY8106A=m
CONFIG_REGULATOR_TPS51632=m
CONFIG_REGULATOR_TPS62360=m
@@ -5938,6 +5940,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 b6cfbed84..bb7598e8e 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2550,6 +2550,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
@@ -3369,7 +3370,7 @@ CONFIG_MFD_SPMI_PMIC=m
CONFIG_MFD_STM32_LPTIMER=m
CONFIG_MFD_STM32_TIMERS=m
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
@@ -4926,6 +4927,7 @@ CONFIG_REGULATOR_S2MPA01=m
CONFIG_REGULATOR_S2MPS11=m
CONFIG_REGULATOR_S5M8767=m
CONFIG_REGULATOR_STM32_VREFBUF=m
+CONFIG_REGULATOR_STPMIC1=m
CONFIG_REGULATOR_SY8106A=m
CONFIG_REGULATOR_TI_ABB=m
CONFIG_REGULATOR_TPS51632=m
@@ -6268,6 +6270,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