diff --git a/config/Config-images.in b/config/Config-images.in
index 6c1408614..92e517ca8 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -301,13 +301,14 @@ menu "Target Images"
 		depends on USES_BOOT_PART
 		default 8 if TARGET_apm821xx_sata
 		default 64 if TARGET_bcm27xx
-		default 64 if TARGET_rockchip
+		default 32 if TARGET_rockchip
 		default 16
 
 	config TARGET_ROOTFS_PARTSIZE
 		int "Root filesystem partition size (in MiB)"
 		depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS
-		default 400
+		default 400 if TARGET_x86
+		default 160
 		help
 		  Select the root filesystem partition size.
 
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index b6177421c..dda1260ba 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -643,6 +643,7 @@ config KERNEL_CRASH_DUMP
 
 config USE_RFKILL
 	bool "Enable rfkill support"
+	default y if TARGET_rockchip
 	default RFKILL_SUPPORT
 
 config USE_SPARSE
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index c33fb3f1e..9ff606f1b 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -406,11 +406,13 @@ define KernelPackage/rfkill
   DEPENDS:=@USE_RFKILL +kmod-input-core
   KCONFIG:= \
     CONFIG_RFKILL_FULL \
+    CONFIG_RFKILL_GPIO=y \
     CONFIG_RFKILL_INPUT=y \
     CONFIG_RFKILL_LEDS=y
   FILES:= \
-    $(LINUX_DIR)/net/rfkill/rfkill.ko
-  AUTOLOAD:=$(call AutoLoad,20,rfkill)
+    $(LINUX_DIR)/net/rfkill/rfkill.ko \
+    $(LINUX_DIR)/net/rfkill/rfkill-gpio.ko
+  AUTOLOAD:=$(call AutoLoad,20,rfkill-gpio)
 endef
 
 define KernelPackage/rfkill/description
diff --git a/target/linux/rockchip/patches-5.15/114-rfkill-gpio-add-of_match_table-support.patch b/target/linux/rockchip/patches-5.15/114-rfkill-gpio-add-of_match_table-support.patch
new file mode 100644
index 000000000..1fbc2d9fb
--- /dev/null
+++ b/target/linux/rockchip/patches-5.15/114-rfkill-gpio-add-of_match_table-support.patch
@@ -0,0 +1,34 @@
+From b4aeb93e697e4dbe2d336d01290e92e98acfd83c Mon Sep 17 00:00:00 2001
+From: jensen <jensenhuang@friendlyarm.com>
+Date: Sat, 15 Oct 2022 18:47:24 +0800
+Subject: [PATCH] rfkill: gpio: add of_match_table support
+
+Signed-off-by: jensen <jensenhuang@friendlyarm.com>
+---
+ net/rfkill/rfkill-gpio.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/net/rfkill/rfkill-gpio.c
++++ b/net/rfkill/rfkill-gpio.c
+@@ -156,6 +156,13 @@ static const struct acpi_device_id rfkill_acpi_match[] = {
+ };
+ MODULE_DEVICE_TABLE(acpi, rfkill_acpi_match);
+ #endif
++#ifdef CONFIG_OF
++static struct of_device_id rfkill_gpio_of_match[] = {
++	{ .compatible = "rfkill-gpio" },
++	{ },
++};
++MODULE_DEVICE_TABLE(of, rfkill_gpio_of_match);
++#endif
+ 
+ static struct platform_driver rfkill_gpio_driver = {
+ 	.probe = rfkill_gpio_probe,
+@@ -163,6 +170,7 @@ static struct platform_driver rfkill_gpio_driver = {
+ 	.driver = {
+ 		.name = "rfkill_gpio",
+ 		.acpi_match_table = ACPI_PTR(rfkill_acpi_match),
++		.of_match_table = of_match_ptr(rfkill_gpio_of_match),
+ 	},
+ };
+ 
diff --git a/target/linux/rockchip/patches-6.1/114-rfkill-gpio-add-of_match_table-support.patch b/target/linux/rockchip/patches-6.1/114-rfkill-gpio-add-of_match_table-support.patch
new file mode 100644
index 000000000..1fbc2d9fb
--- /dev/null
+++ b/target/linux/rockchip/patches-6.1/114-rfkill-gpio-add-of_match_table-support.patch
@@ -0,0 +1,34 @@
+From b4aeb93e697e4dbe2d336d01290e92e98acfd83c Mon Sep 17 00:00:00 2001
+From: jensen <jensenhuang@friendlyarm.com>
+Date: Sat, 15 Oct 2022 18:47:24 +0800
+Subject: [PATCH] rfkill: gpio: add of_match_table support
+
+Signed-off-by: jensen <jensenhuang@friendlyarm.com>
+---
+ net/rfkill/rfkill-gpio.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/net/rfkill/rfkill-gpio.c
++++ b/net/rfkill/rfkill-gpio.c
+@@ -156,6 +156,13 @@ static const struct acpi_device_id rfkill_acpi_match[] = {
+ };
+ MODULE_DEVICE_TABLE(acpi, rfkill_acpi_match);
+ #endif
++#ifdef CONFIG_OF
++static struct of_device_id rfkill_gpio_of_match[] = {
++	{ .compatible = "rfkill-gpio" },
++	{ },
++};
++MODULE_DEVICE_TABLE(of, rfkill_gpio_of_match);
++#endif
+ 
+ static struct platform_driver rfkill_gpio_driver = {
+ 	.probe = rfkill_gpio_probe,
+@@ -163,6 +170,7 @@ static struct platform_driver rfkill_gpio_driver = {
+ 	.driver = {
+ 		.name = "rfkill_gpio",
+ 		.acpi_match_table = ACPI_PTR(rfkill_acpi_match),
++		.of_match_table = of_match_ptr(rfkill_gpio_of_match),
+ 	},
+ };
+