From df0feddc5a9df017e86e2cbb05f851488b211727 Mon Sep 17 00:00:00 2001 From: WallisSoft_wangyeyu Date: Thu, 24 Feb 2022 18:16:57 +0800 Subject: [PATCH 1/4] feat: Turn on the headset plug detection module switch Signed-off-by: WallisSoft_wangyeyu --- linux-5.10/arch/arm64/configs/rk3568_standard_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig index 18d2cc9..1c1400f 100644 --- a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig +++ b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig @@ -5835,6 +5835,7 @@ CONFIG_DRIVERS_HDF_USB_PNP_NOTIFY=y CONFIG_DRIVERS_HDF_USB_F_GENERIC=y CONFIG_DRIVERS_HDF_AUDIO=y CONFIG_DRIVERS_HDF_AUDIO_RK3568=y +CONFIG_DRIVERS_HDF_AUDIO_ANA_HEADSET=y CONFIG_DRIVERS_HDF_VIBRATOR=y CONFIG_DRIVERS_HDF_VIBRATOR_LINEAR=y # CONFIG_DRIVERS_HDF_DSOFTBUS is not set -- Gitee From a9a9e651ee82349e2e1e4cb4c699af3781f56230 Mon Sep 17 00:00:00 2001 From: yang_hongliang Date: Wed, 2 Mar 2022 10:31:06 +0800 Subject: [PATCH 2/4] enable pwm and uart hdf drivers Signed-off-by: yang_hongliang --- linux-5.10/arch/arm64/configs/rk3568_standard_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig index 568498c..8f7fc74 100644 --- a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig +++ b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig @@ -5814,8 +5814,8 @@ CONFIG_DRIVERS_HDF_PLATFORM=y CONFIG_DRIVERS_HDF_PLATFORM_GPIO=y CONFIG_DRIVERS_HDF_PLATFORM_I2C=y # CONFIG_DRIVERS_HDF_PLATFORM_WATCHDOG is not set -# CONFIG_DRIVERS_HDF_PLATFORM_PWM is not set -# CONFIG_DRIVERS_HDF_PLATFORM_UART is not set +CONFIG_DRIVERS_HDF_PLATFORM_PWM=y +CONFIG_DRIVERS_HDF_PLATFORM_UART=y # CONFIG_DRIVERS_HDF_PLATFORM_SDIO is not set # CONFIG_DRIVERS_HDF_PLATFORM_EMMC is not set # CONFIG_DRIVERS_HDF_PLATFORM_MMC is not set -- Gitee From 47bc50204b347ad7d8f918ce5f94f7035375afcd Mon Sep 17 00:00:00 2001 From: gc1202 Date: Wed, 2 Mar 2022 11:37:24 +0800 Subject: [PATCH 3/4] accesstokenid: add tokenid support in kernel 4.19 ohos inclusion category: feature issue: #I4OWTZ CVE: NA ----------- def config Signed-off-by: gaochao --- linux-4.19/arch/arm/configs/standard_common_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-4.19/arch/arm/configs/standard_common_defconfig b/linux-4.19/arch/arm/configs/standard_common_defconfig index 1023fdd..237d748 100644 --- a/linux-4.19/arch/arm/configs/standard_common_defconfig +++ b/linux-4.19/arch/arm/configs/standard_common_defconfig @@ -2584,6 +2584,7 @@ CONFIG_DRIVERS_HDF_VIBRATOR_LINEAR=y # CONFIG_DRIVERS_HDF_AUDIO is not set # CONFIG_DRIVERS_HDF_AUDIO_HI3516CODEC is not set # CONFIG_DRIVERS_HDF_AUDIO_TEST is not set +CONFIG_ACCESS_TOKENID=y # # File systems -- Gitee From 550e248eca5c931be13cdb32aa61532ef20ebf56 Mon Sep 17 00:00:00 2001 From: yang_hongliang Date: Thu, 3 Mar 2022 22:32:45 +0800 Subject: [PATCH 4/4] solve compile error Signed-off-by: yang_hongliang --- linux-5.10/arch/arm64/configs/rk3568_standard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig index 568498c..b85e846 100644 --- a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig +++ b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig @@ -471,7 +471,7 @@ CONFIG_SYSVIPC_COMPAT=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y # CONFIG_SUSPEND_SKIP_SYNC is not set -# CONFIG_HIBERNATION is not set +CONFIG_HIBERNATION=y CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y # CONFIG_PM_AUTOSLEEP is not set -- Gitee