aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2022-10-19 23:03:07 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-10-19 23:20:48 +0100
commitf2ae4e2f8cf698f6fc6ae802dae86f50916f4286 (patch)
tree802329cdd79e48f8b4a0f07670015cf11862feb4
parente57ca876cca2a626cd62d16d677a013e61d18160 (diff)
downloadupstream-f2ae4e2f8cf698f6fc6ae802dae86f50916f4286.tar.gz
upstream-f2ae4e2f8cf698f6fc6ae802dae86f50916f4286.tar.bz2
upstream-f2ae4e2f8cf698f6fc6ae802dae86f50916f4286.zip
mediatek: clean up platform kernel modules
Remove kmod-sdhci-mtk as the mtk-sd driver is built-in anyway for the relevant subtargets in order to support mounting rootfs from eMMC or SD card. Add kmod-iio-mt6577-auxadc to support reading the raw values from the auxadc unit used as in-SoC thermal sensor. This driver was previously built-in, but as thermal itself works well without it there is no use for it in every day use of a device. Build the module to still allow access to the raw values for those who need it. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--target/linux/mediatek/filogic/config-5.152
-rw-r--r--target/linux/mediatek/modules.mk19
-rw-r--r--target/linux/mediatek/mt7623/config-5.152
3 files changed, 8 insertions, 15 deletions
diff --git a/target/linux/mediatek/filogic/config-5.15 b/target/linux/mediatek/filogic/config-5.15
index dfd285bfb6..4d1972e188 100644
--- a/target/linux/mediatek/filogic/config-5.15
+++ b/target/linux/mediatek/filogic/config-5.15
@@ -183,7 +183,6 @@ CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MT65XX=y
CONFIG_ICPLUS_PHY=y
-CONFIG_IIO=y
CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IO_URING=y
@@ -205,7 +204,6 @@ CONFIG_MDIO_BUS=y
CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_DEVRES=y
CONFIG_MEDIATEK_GE_PHY=y
-CONFIG_MEDIATEK_MT6577_AUXADC=y
CONFIG_MEDIATEK_WATCHDOG=y
CONFIG_MEMFD_CREATE=y
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7
diff --git a/target/linux/mediatek/modules.mk b/target/linux/mediatek/modules.mk
index 42f2d7d832..f46a6ad2ff 100644
--- a/target/linux/mediatek/modules.mk
+++ b/target/linux/mediatek/modules.mk
@@ -27,16 +27,13 @@ endef
$(eval $(call KernelPackage,btmtkuart))
-define KernelPackage/sdhci-mtk
- SUBMENU:=Other modules
- TITLE:=Mediatek SDHCI driver
- DEPENDS:=@TARGET_mediatek_mt7622 +kmod-sdhci
- KCONFIG:=CONFIG_MMC_MTK
+define KernelPackage/iio-mt6577-auxadc
+ TITLE:=Mediatek AUXADC driver
+ DEPENDS:=@(TARGET_mediatek_mt7622||TARGET_mediatek_mt7623||TARGET_mediatek_filogic)
+ KCONFIG:=CONFIG_MEDIATEK_MT6577_AUXADC
FILES:= \
- $(LINUX_DIR)/drivers/mmc/host/mtk-sd.ko
- AUTOLOAD:=$(call AutoProbe,mtk-sd,1)
+ $(LINUX_DIR)/drivers/iio/adc/mt6577_auxadc.ko
+ AUTOLOAD:=$(call AutoProbe,mt6577_auxadc)
+ $(call AddDepends/iio)
endef
-
-$(eval $(call KernelPackage,sdhci-mtk))
-
-
+$(eval $(call KernelPackage,iio-mt6577-auxadc))
diff --git a/target/linux/mediatek/mt7623/config-5.15 b/target/linux/mediatek/mt7623/config-5.15
index 5b0e11c676..d3915f4929 100644
--- a/target/linux/mediatek/mt7623/config-5.15
+++ b/target/linux/mediatek/mt7623/config-5.15
@@ -267,7 +267,6 @@ CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MT65XX=y
CONFIG_ICPLUS_PHY=y
-CONFIG_IIO=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INPUT=y
CONFIG_INPUT_EVDEV=y
@@ -321,7 +320,6 @@ CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_DEVRES=y
CONFIG_MDIO_GPIO=y
CONFIG_MEDIATEK_GE_PHY=y
-CONFIG_MEDIATEK_MT6577_AUXADC=y
CONFIG_MEDIATEK_WATCHDOG=y
CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY=y