From 654cad048637505e413aeb400787246ce2653440 Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Fri, 15 Sep 2023 15:53:23 +0200 Subject: [PATCH] 6.4.y: Update defconfig and Project C fixups. Fixes https://github.com/Frogging-Family/linux-tkg/issues/812 --- linux-tkg-config/6.4/config.x86_64 | 9 +++------ linux-tkg-patches/6.4/0009-prjc_v6.4-r0.patch | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/linux-tkg-config/6.4/config.x86_64 b/linux-tkg-config/6.4/config.x86_64 index 206a7c1..4cbba54 100644 --- a/linux-tkg-config/6.4/config.x86_64 +++ b/linux-tkg-config/6.4/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.4.9-arch1 Kernel Configuration +# Linux/x86 6.4.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801" CONFIG_CC_IS_GCC=y @@ -6113,6 +6113,7 @@ CONFIG_DVB_BUDGET_CORE=m CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m CONFIG_DVB_BUDGET_AV=m +CONFIG_IPU_BRIDGE=m CONFIG_VIDEO_IPU3_CIO2=m CONFIG_CIO2_BRIDGE=y CONFIG_RADIO_ADAPTERS=m @@ -6297,10 +6298,7 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m CONFIG_VIDEO_AR0521=m @@ -6362,7 +6360,6 @@ CONFIG_VIDEO_S5K5BAF=m CONFIG_VIDEO_S5K6A3=m CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m -# end of Camera sensor devices # # Lens drivers diff --git a/linux-tkg-patches/6.4/0009-prjc_v6.4-r0.patch b/linux-tkg-patches/6.4/0009-prjc_v6.4-r0.patch index 144fc59..1384479 100644 --- a/linux-tkg-patches/6.4/0009-prjc_v6.4-r0.patch +++ b/linux-tkg-patches/6.4/0009-prjc_v6.4-r0.patch @@ -356,9 +356,9 @@ index 32c24950c4ce..cf951b739454 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -629,6 +629,7 @@ config TASK_IO_ACCOUNTING - config PSI bool "Pressure stall information tracking" + select KERNFS + depends on !SCHED_ALT help Collect metrics that indicate how overcommitted the CPU, memory,