diff --git a/device/testing/linux-postmarketos-stericsson/APKBUILD b/device/testing/linux-postmarketos-stericsson/APKBUILD index 880cd9814..ba52236d8 100644 --- a/device/testing/linux-postmarketos-stericsson/APKBUILD +++ b/device/testing/linux-postmarketos-stericsson/APKBUILD @@ -5,7 +5,7 @@ _flavor="postmarketos-stericsson" _config="config-$_flavor.armv7" pkgname=linux-$_flavor -pkgver=5.18_rc1 +pkgver=5.18_rc4 pkgrel=0 pkgdesc="Mainline kernel fork for ST-Ericsson NovaThor devices" arch="armv7" @@ -41,7 +41,6 @@ source=" disable-busy-detect-on-ux500-mmci.patch power-supply-ab8500-exit-maintenance-if-too-low-voltage.patch power-supply-ab8500-respect-charge_restart_voltage_uv.patch - power-supply-samsung-add-missing-charge-restart-voltages.patch pwm-ab8500-get-hw-id-from-reg-value.patch " builddir="$srcdir/linux-${_kernver//_/-}" @@ -71,12 +70,11 @@ package() { } sha512sums=" -8b3c19e9a5ca0bb6c78ab680196688819bf0ee438940c3086f975508e46b2f7bdec4b564e94cc2b50501bcc1a96421aa61cc42f31d482d420203dc3956ab82d1 linux-5.18-rc1.tar.gz -27daa4a3f53ec829b91c60910d182f20000019d73ea3fbcec672e1488f990926fba80107e7aa60237e97456417792709488d7f3bc5df1f3686789a0061000e20 config-postmarketos-stericsson.armv7 +ad6a7468bfdf1140db9cfda897dbf43f5b2e654d375bba7a5bdf9ea2675deb4f9d7ef857246e3bd371cb0d6160b514dd315a3dd8a7f9e2dcca4585c14cf0be8c linux-5.18-rc4.tar.gz +fb0f125dfeaca68c6b9d927d152f0676b08506d10dadfed76617c0a8fee018b4af03f499a3fa24901bc51214716642da03d331b5613ed696bd186b9d7281a5ac config-postmarketos-stericsson.armv7 abd32f479cec53b9df092f2c0f434343b1e228be2cf340d26f6f61d4fabbba127f24ec1bd561b5b2fc806cec16eef46e18f6d5c781dd3ef256797acc5409dc62 arm-dts-ux500-add-line-impedance-to-fuel-gauge.patch 4ea0fd3fa602bab21f0cc2c31462d3ef6958c63394b41061ddf0bc2c8baa8b9c571cb5553a37c43315df84049eb7d6a6dc4f873c6d06d9ea4883c37dce40d7ec disable-busy-detect-on-ux500-mmci.patch 56c0e375d9078abf1144bf6df25dab176794a18d5c33f77e76b5dc44fc60f0f40ffe26991f0529ff36deaef0b3b66f8ae880968aa2459f774feb4c7993658bdd power-supply-ab8500-exit-maintenance-if-too-low-voltage.patch 81c1acf81a250326b6917503ec70572e18b06864248f704c1a691b0f2fd096f9d0a87acd4e05e258583b4c21c990a3f3230a360a7a02f00b6e83e3034902641c power-supply-ab8500-respect-charge_restart_voltage_uv.patch -c7793f5f5a87d675acfdad00fa61e65797cf7f938f791e4039d9125be0c506fb35949b02104dda128e3abf4b3c48426aeb5171a9dc4059128dafed238f877f51 power-supply-samsung-add-missing-charge-restart-voltages.patch 56126fcfee94121cddacf6987d64517c88fb35739285143fd2fb7f8c3c10d3e326d931c5a981d3cbc5a09d7286e41c9013866b36532a410441140b4af80a2808 pwm-ab8500-get-hw-id-from-reg-value.patch " diff --git a/device/testing/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7 b/device/testing/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7 index 27b077bd1..8ac7180e2 100644 --- a/device/testing/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7 +++ b/device/testing/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.18.0-rc1 Kernel Configuration +# Linux/arm 5.18.0-rc4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219" CONFIG_CC_IS_GCC=y @@ -1408,7 +1408,10 @@ CONFIG_HAVE_ARM_SMCCC=y # end of Tegra firmware driver # end of Firmware Drivers -# CONFIG_GNSS is not set +CONFIG_GNSS=y +# CONFIG_GNSS_MTK_SERIAL is not set +CONFIG_GNSS_SIRF_SERIAL=y +# CONFIG_GNSS_UBX_SERIAL is not set # CONFIG_MTD is not set CONFIG_DTC=y CONFIG_OF=y @@ -1601,7 +1604,6 @@ CONFIG_NET_VENDOR_HISILICON=y CONFIG_NET_VENDOR_HUAWEI=y CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_INTEL=y -CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_LITEX=y # CONFIG_LITEX_LITEETH is not set CONFIG_NET_VENDOR_MARVELL=y @@ -1617,10 +1619,11 @@ CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_ENC28J60 is not set # CONFIG_ENCX24J600 is not set CONFIG_NET_VENDOR_MICROSEMI=y -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NET_VENDOR_NETRONOME=y +CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_NI=y # CONFIG_NI_XGE_MANAGEMENT_ENET is not set +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_8390=y # CONFIG_AX88796 is not set # CONFIG_ETHOC is not set @@ -1876,7 +1879,9 @@ CONFIG_TOUCHSCREEN_BU21013=y # CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set CONFIG_TOUCHSCREEN_CY8CTMA140=y # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set -# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +CONFIG_TOUCHSCREEN_CYTTSP_CORE=y +# CONFIG_TOUCHSCREEN_CYTTSP_I2C is not set +CONFIG_TOUCHSCREEN_CYTTSP_SPI=y # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set # CONFIG_TOUCHSCREEN_DYNAPRO is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set @@ -1899,7 +1904,7 @@ CONFIG_TOUCHSCREEN_CY8CTMA140=y # CONFIG_TOUCHSCREEN_WACOM_I2C is not set # CONFIG_TOUCHSCREEN_MAX11801 is not set # CONFIG_TOUCHSCREEN_MCS5000 is not set -# CONFIG_TOUCHSCREEN_MMS114 is not set +CONFIG_TOUCHSCREEN_MMS114=y # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set @@ -1932,7 +1937,7 @@ CONFIG_TOUCHSCREEN_CY8CTMA140=y # CONFIG_TOUCHSCREEN_ZFORCE is not set # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set -# CONFIG_TOUCHSCREEN_ZINITIX is not set +CONFIG_TOUCHSCREEN_ZINITIX=y CONFIG_INPUT_MISC=y CONFIG_INPUT_AB8500_PONKEY=y # CONFIG_INPUT_AD714X is not set @@ -2959,7 +2964,7 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set CONFIG_DRM_PANEL_NOVATEK_NT35510=y -# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set +CONFIG_DRM_PANEL_NOVATEK_NT35560=y # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set @@ -2973,9 +2978,9 @@ CONFIG_DRM_PANEL_NOVATEK_NT35510=y # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set -# CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set +CONFIG_DRM_PANEL_SAMSUNG_DB7430=y CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=y -# CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set +CONFIG_DRM_PANEL_SAMSUNG_S6D27A1=y # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set CONFIG_DRM_PANEL_SAMSUNG_S6E63M0=y @@ -3000,7 +3005,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_DSI=y # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set -# CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set +CONFIG_DRM_PANEL_WIDECHIPS_WS2401=y # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels @@ -3655,7 +3660,7 @@ CONFIG_LEDS_LP5521=y # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_DAC124S085 is not set -# CONFIG_LEDS_REGULATOR is not set +CONFIG_LEDS_REGULATOR=y # CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_LT3593 is not set # CONFIG_LEDS_TCA6507 is not set @@ -4480,7 +4485,7 @@ CONFIG_GP2AP002=y # CONFIG_SENSORS_TSL2563 is not set # CONFIG_TSL2583 is not set # CONFIG_TSL2591 is not set -# CONFIG_TSL2772 is not set +CONFIG_TSL2772=y # CONFIG_TSL4531 is not set # CONFIG_US5182D is not set # CONFIG_VCNL4000 is not set diff --git a/device/testing/linux-postmarketos-stericsson/power-supply-samsung-add-missing-charge-restart-voltages.patch b/device/testing/linux-postmarketos-stericsson/power-supply-samsung-add-missing-charge-restart-voltages.patch deleted file mode 100644 index 96f286258..000000000 --- a/device/testing/linux-postmarketos-stericsson/power-supply-samsung-add-missing-charge-restart-voltages.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 044b2d24164c01cc75119151aa2fb5eeecb0140f Mon Sep 17 00:00:00 2001 -From: Linus Walleij -Date: Sun, 6 Mar 2022 00:12:13 +0100 -Subject: power: supply: samsung: Add missing charge restart voltages - -Two of the batteries were missing charging restart voltages, -meaning they can drain if the algorithm relies on restarting -charging at this voltage. Fix it up. - -Fixes: c8aee3f41cb8 ("power: supply: Static data for Samsung batteries") -Signed-off-by: Linus Walleij ---- - drivers/power/supply/samsung-sdi-battery.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/power/supply/samsung-sdi-battery.c b/drivers/power/supply/samsung-sdi-battery.c -index 9d59f277f5198..b33daab798b98 100644 ---- a/drivers/power/supply/samsung-sdi-battery.c -+++ b/drivers/power/supply/samsung-sdi-battery.c -@@ -824,6 +824,7 @@ static struct samsung_sdi_battery samsung_sdi_batteries[] = { - .constant_charge_current_max_ua = 900000, - .constant_charge_voltage_max_uv = 4200000, - .charge_term_current_ua = 200000, -+ .charge_restart_voltage_uv = 4170000, - .maintenance_charge = samsung_maint_charge_table, - .maintenance_charge_size = ARRAY_SIZE(samsung_maint_charge_table), - .alert_low_temp_charge_current_ua = 300000, -@@ -867,6 +868,7 @@ static struct samsung_sdi_battery samsung_sdi_batteries[] = { - .constant_charge_current_max_ua = 1500000, - .constant_charge_voltage_max_uv = 4350000, - .charge_term_current_ua = 120000, -+ .charge_restart_voltage_uv = 4300000, - .maintenance_charge = samsung_maint_charge_table, - .maintenance_charge_size = ARRAY_SIZE(samsung_maint_charge_table), - .alert_low_temp_charge_current_ua = 300000, --- -cgit -