summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-11-16 01:37:42 +0000
committerPeter Robinson <pbrobinson@gmail.com>2019-11-16 01:38:28 +0000
commita4828aea55cf33e5cacf60ec2482496cf309aa18 (patch)
treee08d884ac2244b9b7a41fef1ca5cc7fafce1edde
parent6dfe5c1ffbd3d03349b35a4d5f6536aa4a253bbb (diff)
downloadkernel-a4828aea55cf33e5cacf60ec2482496cf309aa18.tar.gz
kernel-a4828aea55cf33e5cacf60ec2482496cf309aa18.tar.xz
kernel-a4828aea55cf33e5cacf60ec2482496cf309aa18.zip
enable the STMPE touchscreen stack to a wider audience
-rw-r--r--configs/fedora/generic/arm/CONFIG_GPIO_STMPE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_GPIO_STMPE)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_KEYBOARD_STMPE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_MFD_STMPE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_STMPE)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_PWM_STMPE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_PWM_STMPE)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_STMPE_ADC (renamed from configs/fedora/generic/arm/armv7/CONFIG_STMPE_ADC)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_STMPE_I2C (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_I2C)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_STMPE_SPI (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_SPI)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_STMPE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE)0
-rw-r--r--kernel-aarch64-debug.config9
-rw-r--r--kernel-aarch64.config9
-rw-r--r--kernel-armv7hl-lpae-debug.config8
-rw-r--r--kernel-armv7hl-lpae.config8
12 files changed, 30 insertions, 4 deletions
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_GPIO_STMPE b/configs/fedora/generic/arm/CONFIG_GPIO_STMPE
index 14d1708e2..14d1708e2 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_GPIO_STMPE
+++ b/configs/fedora/generic/arm/CONFIG_GPIO_STMPE
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE b/configs/fedora/generic/arm/CONFIG_KEYBOARD_STMPE
index ee2c5bbb8..ee2c5bbb8 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE
+++ b/configs/fedora/generic/arm/CONFIG_KEYBOARD_STMPE
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_STMPE b/configs/fedora/generic/arm/CONFIG_MFD_STMPE
index a076cddc3..a076cddc3 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_STMPE
+++ b/configs/fedora/generic/arm/CONFIG_MFD_STMPE
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PWM_STMPE b/configs/fedora/generic/arm/CONFIG_PWM_STMPE
index 4c2b7c562..4c2b7c562 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PWM_STMPE
+++ b/configs/fedora/generic/arm/CONFIG_PWM_STMPE
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_STMPE_ADC b/configs/fedora/generic/arm/CONFIG_STMPE_ADC
index 64ab9f554..64ab9f554 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_STMPE_ADC
+++ b/configs/fedora/generic/arm/CONFIG_STMPE_ADC
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_I2C b/configs/fedora/generic/arm/CONFIG_STMPE_I2C
index ae0f5fdc0..ae0f5fdc0 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_I2C
+++ b/configs/fedora/generic/arm/CONFIG_STMPE_I2C
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_SPI b/configs/fedora/generic/arm/CONFIG_STMPE_SPI
index 7adaed89f..7adaed89f 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_SPI
+++ b/configs/fedora/generic/arm/CONFIG_STMPE_SPI
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE b/configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_STMPE
index be64613d7..be64613d7 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE
+++ b/configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_STMPE
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index c9fb4718e..1c6629b3c 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2025,6 +2025,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
# CONFIG_GPIO_RDC321X is not set
# CONFIG_GPIO_SAMA5D2_PIOBU is not set
# CONFIG_GPIO_SCH311X is not set
+CONFIG_GPIO_STMPE=y
CONFIG_GPIO_SYSCON=m
# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TEGRA186=y
@@ -2911,6 +2912,7 @@ CONFIG_KEYBOARD_QT1070=m
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_SAMSUNG is not set
CONFIG_KEYBOARD_SNVS_PWRKEY=m
+CONFIG_KEYBOARD_STMPE=m
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUN4I_LRADC is not set
# CONFIG_KEYBOARD_SUNKBD is not set
@@ -3341,7 +3343,7 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
CONFIG_MFD_SPMI_PMIC=m
# CONFIG_MFD_STMFX is not set
-# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_STMPE=y
# CONFIG_MFD_STPMIC1 is not set
# CONFIG_MFD_SUN4I_GPADC is not set
# CONFIG_MFD_SUN6I_PRCM is not set
@@ -4679,6 +4681,7 @@ CONFIG_PWM_IMX_TPM=m
CONFIG_PWM_MESON=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=m
+# CONFIG_PWM_STMPE is not set
CONFIG_PWM_SUN4I=m
CONFIG_PWM_SYSFS=y
CONFIG_PWM_TEGRA=y
@@ -6144,6 +6147,9 @@ CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
CONFIG_STMMAC_PLATFORM=m
# CONFIG_STMMAC_SELFTESTS is not set
+# CONFIG_STMPE_ADC is not set
+CONFIG_STMPE_I2C=y
+CONFIG_STMPE_SPI=y
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -6430,6 +6436,7 @@ CONFIG_TOUCHSCREEN_SILEAD=m
CONFIG_TOUCHSCREEN_SIS_I2C=m
CONFIG_TOUCHSCREEN_ST1232=m
# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_STMPE=m
# CONFIG_TOUCHSCREEN_SUN4I is not set
# CONFIG_TOUCHSCREEN_SUR40 is not set
# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 41dc17336..90487f75c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2009,6 +2009,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
# CONFIG_GPIO_RDC321X is not set
# CONFIG_GPIO_SAMA5D2_PIOBU is not set
# CONFIG_GPIO_SCH311X is not set
+CONFIG_GPIO_STMPE=y
CONFIG_GPIO_SYSCON=m
# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TEGRA186=y
@@ -2893,6 +2894,7 @@ CONFIG_KEYBOARD_QT1070=m
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_SAMSUNG is not set
CONFIG_KEYBOARD_SNVS_PWRKEY=m
+CONFIG_KEYBOARD_STMPE=m
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUN4I_LRADC is not set
# CONFIG_KEYBOARD_SUNKBD is not set
@@ -3322,7 +3324,7 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
CONFIG_MFD_SPMI_PMIC=m
# CONFIG_MFD_STMFX is not set
-# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_STMPE=y
# CONFIG_MFD_STPMIC1 is not set
# CONFIG_MFD_SUN4I_GPADC is not set
# CONFIG_MFD_SUN6I_PRCM is not set
@@ -4658,6 +4660,7 @@ CONFIG_PWM_IMX_TPM=m
CONFIG_PWM_MESON=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=m
+# CONFIG_PWM_STMPE is not set
CONFIG_PWM_SUN4I=m
CONFIG_PWM_SYSFS=y
CONFIG_PWM_TEGRA=y
@@ -6122,6 +6125,9 @@ CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
CONFIG_STMMAC_PLATFORM=m
# CONFIG_STMMAC_SELFTESTS is not set
+# CONFIG_STMPE_ADC is not set
+CONFIG_STMPE_I2C=y
+CONFIG_STMPE_SPI=y
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -6408,6 +6414,7 @@ CONFIG_TOUCHSCREEN_SILEAD=m
CONFIG_TOUCHSCREEN_SIS_I2C=m
CONFIG_TOUCHSCREEN_ST1232=m
# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_STMPE=m
# CONFIG_TOUCHSCREEN_SUN4I is not set
# CONFIG_TOUCHSCREEN_SUR40 is not set
# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 4eb2fd845..f2b26d448 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1980,6 +1980,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
# CONFIG_GPIO_RDC321X is not set
# CONFIG_GPIO_SAMA5D2_PIOBU is not set
# CONFIG_GPIO_SCH311X is not set
+CONFIG_GPIO_STMPE=y
CONFIG_GPIO_SYSCON=m
# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TEGRA=y
@@ -2849,6 +2850,7 @@ CONFIG_KEYBOARD_QT1050=m
CONFIG_KEYBOARD_QT1070=m
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_STMPE=m
# CONFIG_KEYBOARD_STOWAWAY is not set
CONFIG_KEYBOARD_SUN4I_LRADC=m
# CONFIG_KEYBOARD_SUNKBD is not set
@@ -3294,7 +3296,7 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_STM32_LPTIMER=m
CONFIG_MFD_STM32_TIMERS=m
# CONFIG_MFD_STMFX is not set
-# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_STMPE=y
CONFIG_MFD_STPMIC1=m
CONFIG_MFD_SUN4I_GPADC=m
CONFIG_MFD_SUN6I_PRCM=y
@@ -4605,6 +4607,7 @@ CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_SAMSUNG=m
# CONFIG_PWM_STM32 is not set
# CONFIG_PWM_STM32_LP is not set
+# CONFIG_PWM_STMPE is not set
CONFIG_PWM_SUN4I=m
CONFIG_PWM_SYSFS=y
CONFIG_PWM_TEGRA=y
@@ -6061,6 +6064,8 @@ CONFIG_STMMAC_ETH=m
CONFIG_STMMAC_PLATFORM=m
# CONFIG_STMMAC_SELFTESTS is not set
# CONFIG_STMPE_ADC is not set
+CONFIG_STMPE_I2C=y
+CONFIG_STMPE_SPI=y
CONFIG_STPMIC1_WATCHDOG=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRICT_KERNEL_RWX=y
@@ -6356,6 +6361,7 @@ CONFIG_TOUCHSCREEN_SILEAD=m
CONFIG_TOUCHSCREEN_SIS_I2C=m
CONFIG_TOUCHSCREEN_ST1232=m
# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_STMPE=m
CONFIG_TOUCHSCREEN_SUN4I=m
# CONFIG_TOUCHSCREEN_SUR40 is not set
# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 6b7c21499..ec85503ad 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1965,6 +1965,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
# CONFIG_GPIO_RDC321X is not set
# CONFIG_GPIO_SAMA5D2_PIOBU is not set
# CONFIG_GPIO_SCH311X is not set
+CONFIG_GPIO_STMPE=y
CONFIG_GPIO_SYSCON=m
# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TEGRA=y
@@ -2832,6 +2833,7 @@ CONFIG_KEYBOARD_QT1050=m
CONFIG_KEYBOARD_QT1070=m
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_STMPE=m
# CONFIG_KEYBOARD_STOWAWAY is not set
CONFIG_KEYBOARD_SUN4I_LRADC=m
# CONFIG_KEYBOARD_SUNKBD is not set
@@ -3276,7 +3278,7 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_STM32_LPTIMER=m
CONFIG_MFD_STM32_TIMERS=m
# CONFIG_MFD_STMFX is not set
-# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_STMPE=y
CONFIG_MFD_STPMIC1=m
CONFIG_MFD_SUN4I_GPADC=m
CONFIG_MFD_SUN6I_PRCM=y
@@ -4585,6 +4587,7 @@ CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_SAMSUNG=m
# CONFIG_PWM_STM32 is not set
# CONFIG_PWM_STM32_LP is not set
+# CONFIG_PWM_STMPE is not set
CONFIG_PWM_SUN4I=m
CONFIG_PWM_SYSFS=y
CONFIG_PWM_TEGRA=y
@@ -6040,6 +6043,8 @@ CONFIG_STMMAC_ETH=m
CONFIG_STMMAC_PLATFORM=m
# CONFIG_STMMAC_SELFTESTS is not set
# CONFIG_STMPE_ADC is not set
+CONFIG_STMPE_I2C=y
+CONFIG_STMPE_SPI=y
CONFIG_STPMIC1_WATCHDOG=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRICT_KERNEL_RWX=y
@@ -6335,6 +6340,7 @@ CONFIG_TOUCHSCREEN_SILEAD=m
CONFIG_TOUCHSCREEN_SIS_I2C=m
CONFIG_TOUCHSCREEN_ST1232=m
# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_STMPE=m
CONFIG_TOUCHSCREEN_SUN4I=m
# CONFIG_TOUCHSCREEN_SUR40 is not set
# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set