From 45aaac6d307245cb9c027570d5bb01d8a378ed38 Mon Sep 17 00:00:00 2001 From: "Sicelo A. Mhlongo" Date: Thu, 20 Oct 2022 19:41:35 +0200 Subject: [PATCH] linux-nokia-n900: fix usbnet regression (MR 3567) After c49180f8cff8bcbd6485a731e3813259fab452c7, usbnet did not come up on N900 automatically since the UDC probed a little late. Fix this by making the driver built-in. While at it, make watchdog built-in so it can be kicked even when boot takes long for any reason. [ci:skip-build]: already built successfully in CI --- device/community/linux-nokia-n900/APKBUILD | 4 ++-- device/community/linux-nokia-n900/config-nokia-n900.armv7 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/device/community/linux-nokia-n900/APKBUILD b/device/community/linux-nokia-n900/APKBUILD index 15bed3163..860d40658 100644 --- a/device/community/linux-nokia-n900/APKBUILD +++ b/device/community/linux-nokia-n900/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-nokia-n900 pkgver=5.15.74 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline kernel fork for Nokia N900" arch="armv7" url="https://kernel.org/" @@ -66,7 +66,7 @@ package() { sha512sums=" d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a linux-5.15.tar.xz c48120c5067003deb6b6ee057a1e6a3b635e2c1ff72435ced83d894d1b4ee03ca792d72777185db94e844e7fb5a4a49a98e6c906eb2cfaef87b96b7c8de5f622 linux-5.15.74.patch.xz -cc0d33417887c36877103e5f9efa939b73f7664029ce50921fb4682e5240fd858869e70f63179eb7a8a83f5e0fd498436c8666e12ce5f79cd9d8b2575310c3b0 config-nokia-n900.armv7 +6c145e11403771b0bbaefc35b2aa3c8b10b2b51bfe5a4a9ef7561f792bd29c9fce31bb07ad2db406e2229ed118482b9cedabf1788e9364263ad56315206df563 config-nokia-n900.armv7 04a39253afd25a7de03dc45ff322161672005406543c44b97d2dc293f202de7de446aee9707a690a290641c55c7bed6e78bbe096ca323dd7d88d3207427c8d31 0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch 3cc2036ba264bd855358361aacb309ad1cf1660cb82a0978523508d1b3fe513676c58f6efc5bb64f7601b77392c19d2c609b6d83541db7e418c1737cff3973e8 0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch 991237276bee4ff7bca24cf3a26afe3f12a2a604452793ad905a605890f761ac98374b5509cfbcab33c7b7ccf3da5cc286e70afe27b8e201387f403bf5025ae9 0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch diff --git a/device/community/linux-nokia-n900/config-nokia-n900.armv7 b/device/community/linux-nokia-n900/config-nokia-n900.armv7 index 57a96f3c8..f03c56a2d 100644 --- a/device/community/linux-nokia-n900/config-nokia-n900.armv7 +++ b/device/community/linux-nokia-n900/config-nokia-n900.armv7 @@ -2703,8 +2703,8 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_CADENCE_WATCHDOG is not set # CONFIG_FTWDT010_WATCHDOG is not set # CONFIG_DW_WATCHDOG is not set -CONFIG_OMAP_WATCHDOG=m -CONFIG_TWL4030_WATCHDOG=m +CONFIG_OMAP_WATCHDOG=y +CONFIG_TWL4030_WATCHDOG=y # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_ARM_SMC_WATCHDOG is not set # CONFIG_MEN_A21_WDT is not set @@ -5336,7 +5336,7 @@ CONFIG_GENERIC_PHY=y CONFIG_OMAP_CONTROL_PHY=y CONFIG_OMAP_USB2=y CONFIG_TI_PIPE3=y -CONFIG_TWL4030_USB=m +CONFIG_TWL4030_USB=y # end of PHY Subsystem # CONFIG_POWERCAP is not set