Skip to content

Commit

Permalink
rfkill: enable for rockchip by default
Browse files Browse the repository at this point in the history
This is useful for 4G modem chips. For example,
the Radxa E25 supports insert two modems.
  • Loading branch information
aiamadeus committed Jan 24, 2023
1 parent b77ab3b commit 0dc779b
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 4 deletions.
5 changes: 3 additions & 2 deletions config/Config-images.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 1 addition & 0 deletions config/Config-kernel.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions package/kernel/linux/modules/other.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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),
},
};

Original file line number Diff line number Diff line change
@@ -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),
},
};

0 comments on commit 0dc779b

Please sign in to comment.