Merge branch 'ophub:main' into main

dy008 · web-flow · commit 4ca88f661000 · 2024-12-26T17:04:24.000+08:00
diff --git a/kernel-config/release/general/config-5.10 b/kernel-config/release/general/config-5.10
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.231 Kernel Configuration
+# Linux/arm64 5.10.232 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
 CONFIG_CC_IS_GCC=y
@@ -6435,6 +6435,7 @@ CONFIG_PI433=m
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_HAVE_CLK=y
+CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
@@ -6517,7 +6518,6 @@ CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
-# CONFIG_ARM_TIMER_SP804 is not set
 CONFIG_MICROCHIP_PIT64B=y
 # end of Clock Source drivers
 
diff --git a/kernel-config/release/general/config-5.15 b/kernel-config/release/general/config-5.15
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.174 Kernel Configuration
+# Linux/arm64 5.15.175 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
 CONFIG_CC_IS_GCC=y
diff --git a/kernel-config/release/general/config-5.4 b/kernel-config/release/general/config-5.4
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.287 Kernel Configuration
+# Linux/arm64 5.4.288 Kernel Configuration
 #
 
 #
diff --git a/kernel-config/release/general/config-6.1 b/kernel-config/release/general/config-6.1
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.120 Kernel Configuration
+# Linux/arm64 6.1.121 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
 CONFIG_CC_IS_GCC=y
diff --git a/kernel-config/release/general/config-6.6 b/kernel-config/release/general/config-6.6
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.66 Kernel Configuration
+# Linux/arm64 6.6.67 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
 CONFIG_CC_IS_GCC=y
diff --git a/kernel-config/release/h6/config-6.6 b/kernel-config/release/h6/config-6.6
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.66 Kernel Configuration
+# Linux/arm64 6.6.67 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
 CONFIG_CC_IS_GCC=y
diff --git a/kernel-config/release/rk3588/config-6.1 b/kernel-config/release/rk3588/config-6.1
@@ -7551,7 +7551,6 @@ CONFIG_ROCKCHIP_FIQ_DEBUGGER=y
 CONFIG_ROCKCHIP_DEBUG=y
 # CONFIG_ROCKCHIP_MINI_KERNEL is not set
 # CONFIG_ROCKCHIP_THUNDER_BOOT is not set
-# CONFIG_ROCKCHIP_THUNDER_BOOT_DEFER_FREE_MEMBLOCK is not set
 # CONFIG_ROCKCHIP_NPOR_POWERGOOD is not set
 # CONFIG_RK_CMA_PROCFS is not set
 CONFIG_RK_DMABUF_PROCFS=y
diff --git a/kernel-config/release/rk35xx/config-6.1 b/kernel-config/release/rk35xx/config-6.1
@@ -7562,7 +7562,6 @@ CONFIG_ROCKCHIP_FIQ_DEBUGGER=y
 CONFIG_ROCKCHIP_DEBUG=y
 # CONFIG_ROCKCHIP_MINI_KERNEL is not set
 # CONFIG_ROCKCHIP_THUNDER_BOOT is not set
-# CONFIG_ROCKCHIP_THUNDER_BOOT_DEFER_FREE_MEMBLOCK is not set
 # CONFIG_ROCKCHIP_NPOR_POWERGOOD is not set
 # CONFIG_RK_CMA_PROCFS is not set
 CONFIG_RK_DMABUF_PROCFS=y

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#`
`2`	`2`	`# Automatically generated file; DO NOT EDIT.`
`3`		`-# Linux/arm64 5.15.174 Kernel Configuration`
	`3`	`+# Linux/arm64 5.15.175 Kernel Configuration`
`4`	`4`	`#`
`5`	`5`	`CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"`
`6`	`6`	`CONFIG_CC_IS_GCC=y`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#`
`2`	`2`	`# Automatically generated file; DO NOT EDIT.`
`3`		`-# Linux/arm64 5.4.287 Kernel Configuration`
	`3`	`+# Linux/arm64 5.4.288 Kernel Configuration`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#`
`2`	`2`	`# Automatically generated file; DO NOT EDIT.`
`3`		`-# Linux/arm64 6.1.120 Kernel Configuration`
	`3`	`+# Linux/arm64 6.1.121 Kernel Configuration`
`4`	`4`	`#`
`5`	`5`	`CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"`
`6`	`6`	`CONFIG_CC_IS_GCC=y`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#`
`2`	`2`	`# Automatically generated file; DO NOT EDIT.`
`3`		`-# Linux/arm64 6.6.66 Kernel Configuration`
	`3`	`+# Linux/arm64 6.6.67 Kernel Configuration`
`4`	`4`	`#`
`5`	`5`	`CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"`
`6`	`6`	`CONFIG_CC_IS_GCC=y`