From 6a1ea74a459e2a0e84cc04318d73899c74bcb714 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Nov 2019 01:37:42 +0000 Subject: [PATCH] enable the STMPE touchscreen stack to a wider audience --- .../generic/arm/{armv7/armv7 => }/CONFIG_GPIO_STMPE | 0 .../generic/arm/{armv7/armv7 => }/CONFIG_KEYBOARD_STMPE | 0 .../generic/arm/{armv7/armv7 => }/CONFIG_MFD_STMPE | 0 .../generic/arm/{armv7/armv7 => }/CONFIG_PWM_STMPE | 0 configs/fedora/generic/arm/{armv7 => }/CONFIG_STMPE_ADC | 0 .../generic/arm/{armv7/armv7 => }/CONFIG_STMPE_I2C | 0 .../generic/arm/{armv7/armv7 => }/CONFIG_STMPE_SPI | 0 .../arm/{armv7/armv7 => }/CONFIG_TOUCHSCREEN_STMPE | 0 kernel-aarch64-debug-fedora.config | 9 ++++++++- kernel-aarch64-fedora.config | 9 ++++++++- kernel-armv7hl-lpae-debug-fedora.config | 8 +++++++- kernel-armv7hl-lpae-fedora.config | 8 +++++++- 12 files changed, 30 insertions(+), 4 deletions(-) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_GPIO_STMPE (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_KEYBOARD_STMPE (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_MFD_STMPE (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_PWM_STMPE (100%) rename configs/fedora/generic/arm/{armv7 => }/CONFIG_STMPE_ADC (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_STMPE_I2C (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_STMPE_SPI (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_TOUCHSCREEN_STMPE (100%) diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_GPIO_STMPE b/configs/fedora/generic/arm/CONFIG_GPIO_STMPE similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_GPIO_STMPE rename to 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 similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE rename to 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 similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_STMPE rename to 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 similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_PWM_STMPE rename to 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 similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_STMPE_ADC rename to 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 similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_I2C rename to 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 similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_SPI rename to 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 similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE rename to configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_STMPE diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d735470ae..3c83a7a82 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2056,6 +2056,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 @@ -2950,6 +2951,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 @@ -3384,7 +3386,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 @@ -4735,6 +4737,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 @@ -6212,6 +6215,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 @@ -6498,6 +6504,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-fedora.config b/kernel-aarch64-fedora.config index 104f99094..9c9b9f0ba 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2040,6 +2040,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 @@ -2932,6 +2933,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 @@ -3365,7 +3367,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 @@ -4714,6 +4716,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 @@ -6190,6 +6193,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 @@ -6476,6 +6482,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-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index b7dfc4800..91a6fd95c 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2007,6 +2007,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 @@ -2884,6 +2885,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 @@ -3333,7 +3335,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 @@ -4654,6 +4656,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 @@ -6121,6 +6124,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 @@ -6416,6 +6421,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-fedora.config b/kernel-armv7hl-lpae-fedora.config index 7177b848d..6a15c5191 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1992,6 +1992,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 @@ -2867,6 +2868,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 @@ -3315,7 +3317,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 @@ -4634,6 +4636,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 @@ -6100,6 +6103,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 @@ -6395,6 +6400,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