linux-libre-lts-knock: fix RCN patch

4 files changed, 20 insertions, 113 deletions

diff --git a/kernels/linux-libre-lts-knock/0001-ARM-disable-implicit-function-declaration-error.patch b/kernels/linux-libre-lts-knock/0001-ARM-disable-implicit-function-declaration-error.patch
deleted file mode 100644
index e02d20b01..000000000
--- a/kernels/linux-libre-lts-knock/0001-ARM-disable-implicit-function-declaration-error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b03f266..f3fadc9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -391,7 +391,7 @@ KBUILD_CPPFLAGS := -D__KERNEL__
- 
- KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
- 		   -fno-strict-aliasing -fno-common \
--		   -Werror-implicit-function-declaration \
-+		   -Wno-implicit-function-declaration \
- 		   -Wno-format-security \
- 		   -std=gnu89
- 
diff --git a/kernels/linux-libre-lts-knock/0001-ARM-remove-spin_lock_and_spin_unlock.patch b/kernels/linux-libre-lts-knock/0001-ARM-remove-spin_lock_and_spin_unlock.patch
deleted file mode 100644
index 7d8d971c4..000000000
--- a/kernels/linux-libre-lts-knock/0001-ARM-remove-spin_lock_and_spin_unlock.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
-index 0c88645..489d10a 100644
---- a/drivers/i2c/busses/i2c-omap.c
-+++ b/drivers/i2c/busses/i2c-omap.c
-@@ -994,15 +994,12 @@ omap_i2c_isr(int irq, void *dev_id)
- 	u16 mask;
- 	u16 stat;
- 
--	spin_lock(&omap->lock);
- 	mask = omap_i2c_read_reg(omap, OMAP_I2C_IE_REG);
- 	stat = omap_i2c_read_reg(omap, OMAP_I2C_STAT_REG);
- 
- 	if (stat & mask)
- 		ret = IRQ_WAKE_THREAD;
- 
--	spin_unlock(&omap->lock);
--
- 	return ret;
- }
- 
diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index 9a35ed486..7d67ef2d3 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -21,7 +21,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
 pkgrel=1
-rcnrel=armv7-x10
+rcnrel=armv7-x10.1
 arch=('i686' 'x86_64' 'armv7h')
 url="https://gnunet.org/knock"
 license=('GPL2')
@@ -54,8 +54,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # armv7h patches
         "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
         "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
-        '0001-ARM-remove-spin_lock_and_spin_unlock.patch'
-        '0001-ARM-disable-implicit-function-declaration-error.patch'
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
         '0003-SMILE-Plug-device-tree-file.patch'
@@ -79,17 +77,15 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
             'SKIP'
             '7cbda7707e8edfd28658da3ef3f58f5b6314a483d45757a7b2375d1c0450eaa1'
             '1aa649f7e8001391effb6edc65c8d47bf189301f8cc35fc23515141d8cbca14c'
-            '8170b258ee0ac204df4d248acff3b90126643d19f794d81153250ef47506d474'
+            '40c3c8de4b52ab344415ca1b1efb115fee931b3b146f1f378b7a61598e90149c'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
             'f0a10ea9a669e5200aa33656565c209718b24ff1add03ac5279c4a1f46ab8798'
             '96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8'
             '2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4'
-            '87556459ae306d2e39acdce7e181690ce4d8736deea3c0aac529d0f7c7a284ad'
+            '737924886160c4f28b5198c59a2f2cd261df45417c1faf56b86e57b3f2509026'
             'SKIP'
-            '73af660749be60c2b33ec85e06ffa840f538ca8fc169b96f245767436bdc36ee'
-            '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382'
             'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
             '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4'
             '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08'
@@ -128,18 +124,13 @@ prepare() {
   patch -p1 -i "${srcdir}/tcp_stealth_${_knockpatchver}.diff"
 
   if [ "${CARCH}" = "armv7h" ]; then
-    # RCN patch (CM3 firmware deblobbed, AUFS and RT removed)
-    # Note: For stability reasons, AUFS and RT have been removed in the RCN patch.
-    # We are supporting AUFS in linux-libre-pck through PCK patch and RT through its official
-    # patch in linux-libre-rt. See https://wiki.parabola.nu/PCK for further details about PCK.
+    # RCN patch (CM3 firmware deblobbed, I2C/IIO/touchscreen backports, AUFS and RT removed)
+    # Note: For stability reasons, I2C/IIO/touchscreen backports, AUFS and RT have been
+    # removed in the RCN patch. We are supporting AUFS in linux-libre-pck through PCK patch
+    # and RT through its official patch in linux-libre-rt. See https://wiki.parabola.nu/PCK
+    # for further details about PCK.
     git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
 
-    # fix RCN bugs
-    patch -p1 -i "${srcdir}/0001-ARM-remove-spin_lock_and_spin_unlock.patch"
-
-    # disable implicit function declaration error since there are old backports patches
-    patch -p1 -i "${srcdir}/0001-ARM-disable-implicit-function-declaration-error.patch"
-
     # ALARM patches
     patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
     patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch"
diff --git a/kernels/linux-libre-lts-knock/config.armv7h b/kernels/linux-libre-lts-knock/config.armv7h
index d8350a5e0..67751f386 100644
--- a/kernels/linux-libre-lts-knock/config.armv7h
+++ b/kernels/linux-libre-lts-knock/config.armv7h
@@ -3085,7 +3085,6 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
-# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
 CONFIG_TOUCHSCREEN_FT6236=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
@@ -3098,7 +3097,6 @@ CONFIG_TOUCHSCREEN_WACOM_I2C=m
 CONFIG_TOUCHSCREEN_MAX11801=m
 CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MMS114=m
-# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
 CONFIG_TOUCHSCREEN_INEXIO=m
@@ -3135,19 +3133,14 @@ CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
-# CONFIG_TOUCHSCREEN_TS4800 is not set
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_TSC200X_CORE=m
 CONFIG_TOUCHSCREEN_TSC2004=m
 CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_RM_TS is not set
-# CONFIG_TOUCHSCREEN_SILEAD is not set
-# CONFIG_TOUCHSCREEN_SIS_I2C is not set
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_SUN4I=m
 # CONFIG_TOUCHSCREEN_SUR40 is not set
-# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
 CONFIG_TOUCHSCREEN_SX8654=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
@@ -3348,7 +3341,6 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_MUX_PINCTRL=y
 # CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_DEMUX_PINCTRL is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=y
@@ -6281,7 +6273,9 @@ CONFIG_8723AU_BT_COEXIST=y
 #
 CONFIG_ADIS16201=m
 CONFIG_ADIS16203=m
+# CONFIG_ADIS16204 is not set
 CONFIG_ADIS16209=m
+# CONFIG_ADIS16220 is not set
 CONFIG_ADIS16240=m
 CONFIG_LIS3L02DQ=m
 CONFIG_SCA3000=m
@@ -6336,6 +6330,13 @@ CONFIG_TSL2583=m
 CONFIG_TSL2x7x=m
 
 #
+# Magnetometer sensors
+#
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
+
+#
 # Active energy metering IC
 #
 CONFIG_ADE7753=m
@@ -6356,6 +6357,8 @@ CONFIG_AD2S1210=m
 #
 # Triggers - standalone
 #
+# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
+# CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_XGI is not set
 
@@ -6620,10 +6623,8 @@ CONFIG_IIO_BUFFER=y
 CONFIG_IIO_BUFFER_CB=m
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_CONFIGFS=m
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-CONFIG_IIO_SW_TRIGGER=m
 CONFIG_IIO_TRIGGERED_EVENT=m
 
 #
@@ -6639,15 +6640,11 @@ CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 CONFIG_KXSD9=m
 CONFIG_KXCJK1013=m
-CONFIG_MMA7455=m
-CONFIG_MMA7455_I2C=m
-CONFIG_MMA7455_SPI=m
 CONFIG_MMA8452=m
 CONFIG_MMA9551_CORE=m
 CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
-CONFIG_MXC6255=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
 
@@ -6668,20 +6665,14 @@ CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
 CONFIG_EXYNOS_ADC=m
 CONFIG_HI8435=m
-CONFIG_INA2XX_ADC=m
-CONFIG_IMX7D_ADC=m
 CONFIG_MAX1027=m
 CONFIG_MAX1363=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_NAU7802=m
-CONFIG_PALMAS_GPADC=m
 CONFIG_ROCKCHIP_SARADC=m
 CONFIG_TI_ADC081C=m
-CONFIG_TI_ADC0832=m
 CONFIG_TI_ADC128S052=m
-CONFIG_TI_ADS1015=m
-CONFIG_TI_ADS8688=m
 CONFIG_TI_AM335X_ADC=m
 CONFIG_TWL4030_MADC=m
 CONFIG_TWL6030_GPADC=m
@@ -6697,8 +6688,6 @@ CONFIG_AD8366=m
 #
 # Chemical Sensors
 #
-CONFIG_ATLAS_PH_SENSOR=m
-CONFIG_IAQCORE=m
 CONFIG_VZ89X=m
 
 #
@@ -6726,13 +6715,10 @@ CONFIG_AD5380=m
 CONFIG_AD5421=m
 CONFIG_AD5446=m
 CONFIG_AD5449=m
-# CONFIG_AD5592R is not set
-# CONFIG_AD5593R is not set
 CONFIG_AD5504=m
 CONFIG_AD5624R_SPI=m
 CONFIG_AD5686=m
 CONFIG_AD5755=m
-CONFIG_AD5761=m
 CONFIG_AD5764=m
 CONFIG_AD5791=m
 CONFIG_AD7303=m
@@ -6741,12 +6727,6 @@ CONFIG_MAX517=m
 CONFIG_MAX5821=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
-CONFIG_VF610_DAC=m
-
-#
-# IIO dummy driver
-#
-# CONFIG_IIO_SIMPLE_DUMMY is not set
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -6780,20 +6760,8 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
 
 #
-# Health Sensors
-#
-
-#
-# Heart Rate Monitors
-#
-CONFIG_AFE4403=m
-CONFIG_AFE4404=m
-CONFIG_MAX30100=m
-
-#
 # Humidity sensors
 #
-# CONFIG_AM2315 is not set
 CONFIG_DHT11=m
 CONFIG_HDC100X=m
 CONFIG_HTU21=m
@@ -6805,12 +6773,8 @@ CONFIG_SI7020=m
 #
 CONFIG_ADIS16400=m
 CONFIG_ADIS16480=m
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMI160_SPI is not set
 CONFIG_KMX61=m
 CONFIG_INV_MPU6050_IIO=m
-CONFIG_INV_MPU6050_I2C=m
-CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -6822,7 +6786,6 @@ CONFIG_AL3320A=m
 CONFIG_APDS9300=m
 CONFIG_APDS9960=m
 CONFIG_BH1750=m
-# CONFIG_BH1780 is not set
 CONFIG_CM32181=m
 CONFIG_CM3232=m
 CONFIG_CM3323=m
@@ -6834,7 +6797,6 @@ CONFIG_HID_SENSOR_PROX=m
 CONFIG_JSA1212=m
 CONFIG_RPR0521=m
 CONFIG_LTR501=m
-# CONFIG_MAX44000 is not set
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
 CONFIG_STK3310=m
@@ -6844,24 +6806,19 @@ CONFIG_SENSORS_TSL2563=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
-# CONFIG_VEML6070 is not set
 
 #
 # Magnetometer sensors
 #
 CONFIG_AK8975=m
 CONFIG_AK09911=m
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_BMC150_MAGN is not set
 CONFIG_MAG3110=m
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 CONFIG_MMC35240=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-CONFIG_SENSORS_HMC5843_SPI=m
 
 #
 # Inclinometer sensors
@@ -6872,27 +6829,20 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 #
 # Triggers - standalone
 #
-CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 
 #
 # Digital potentiometers
 #
-# CONFIG_DS1803 is not set
-# CONFIG_MCP4131 is not set
 CONFIG_MCP4531=m
-CONFIG_TPL0102=m
 
 #
 # Pressure sensors
 #
 CONFIG_BMP280=m
 CONFIG_HID_SENSOR_PRESS=m
-# CONFIG_HP03 is not set
 CONFIG_MPL115=m
-CONFIG_MPL115_I2C=m
-CONFIG_MPL115_SPI=m
 CONFIG_MPL3115=m
 CONFIG_MS5611=m
 CONFIG_MS5611_I2C=m
@@ -6902,7 +6852,6 @@ CONFIG_IIO_ST_PRESS=m
 CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
 CONFIG_T5403=m
-# CONFIG_HP206C is not set
 
 #
 # Lightning sensors