diff --git a/packages/linux/package.mk b/packages/linux/package.mk index e96d55094a..24a694d509 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -39,8 +39,8 @@ case "$LINUX" in PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET aml-dtbtools:host" ;; amlogic-3.14) - PKG_VERSION="c855778" - PKG_SHA256="c6a2066e4a1052503a798ae7bf10aaf551466989fe909b130da8bdf99eb59b1a" + PKG_VERSION="7951748" + PKG_SHA256="d90709aae14ac0c2fc64fd8423caa695829dc012f65f42069d27d84095df8137" PKG_URL="https://github.com/LibreELEC/linux-amlogic/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_DIR="$PKG_NAME-amlogic-$PKG_VERSION*" PKG_PATCH_DIRS="amlogic-3.14" diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index d558973c78..c1d0b97574 100644 --- a/projects/Amlogic/linux/linux.aarch64.conf +++ b/projects/Amlogic/linux/linux.aarch64.conf @@ -396,6 +396,7 @@ CONFIG_WAKELOCK=y CONFIG_WAKELOCK_STAT=y CONFIG_USER_WAKELOCK=y CONFIG_EARLYSUSPEND=y +CONFIG_FORCE_POWER_ON_STATE_AFTER_RESUME=y CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL=y # CONFIG_CONSOLE_EARLYSUSPEND is not set # CONFIG_FB_EARLYSUSPEND is not set @@ -1182,6 +1183,11 @@ CONFIG_GXBB_SUSPEND=y # CONFIG_AM_SPI is not set # CONFIG_AML_SMARTCARD is not set +# +# WeTek Play driver +# +CONFIG_WETEK=m + # # MESON MHU mailbox Support # diff --git a/projects/WeTek_Hub/patches/linux/bt_device_on_after_probe.patch b/projects/WeTek_Hub/patches/linux/bt_device_on_after_probe.patch deleted file mode 100644 index a7c7ac24b3..0000000000 --- a/projects/WeTek_Hub/patches/linux/bt_device_on_after_probe.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/amlogic/bluetooth/bt_device.c b/drivers/amlogic/bluetooth/bt_device.c -index 6ebd7f2..87d1916 100644 ---- a/drivers/amlogic/bluetooth/bt_device.c -+++ b/drivers/amlogic/bluetooth/bt_device.c -@@ -235,6 +235,7 @@ static int bt_probe(struct platform_device *pdev) - register_early_suspend(&bt_early_suspend); - #endif - -+ bt_device_on(pdata); - return 0; - - err_rfkill: diff --git a/projects/WeTek_Play_2/patches/linux/bt_device_on_after_probe.patch b/projects/WeTek_Play_2/patches/linux/bt_device_on_after_probe.patch deleted file mode 100644 index a7c7ac24b3..0000000000 --- a/projects/WeTek_Play_2/patches/linux/bt_device_on_after_probe.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/amlogic/bluetooth/bt_device.c b/drivers/amlogic/bluetooth/bt_device.c -index 6ebd7f2..87d1916 100644 ---- a/drivers/amlogic/bluetooth/bt_device.c -+++ b/drivers/amlogic/bluetooth/bt_device.c -@@ -235,6 +235,7 @@ static int bt_probe(struct platform_device *pdev) - register_early_suspend(&bt_early_suspend); - #endif - -+ bt_device_on(pdata); - return 0; - - err_rfkill: