airoha: an7581/7583: build-in I2C support

There is no reason to add a custom kmod which is not even an7581
specific as its just the regular Mediatek MT7621 I2C driver.

So, simply enable the driver in kernel configs, drop the inclusion
per-board and remove the kmod definition.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>

diff --git a/target/linux/airoha/an7581/config-6.18 b/target/linux/airoha/an7581/config-6.18
index 6364a4ab60fcabefa0d8540454ffae1fcbe166b9..c66ce25c2eda1d6669e99d2eccd2ae5dfaeb7d11 100644 (file)
--- a/target/linux/airoha/an7581/config-6.18
+++ b/target/linux/airoha/an7581/config-6.18
@@ -162,6 +162,11 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_SMT=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_AIROHA=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_MT7621=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IO_URING=y
@@ -304,6 +309,7 @@ CONFIG_RANDSTRUCT_NONE=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
 CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_SPI=y
@@ -331,6 +337,7 @@ CONFIG_SND_JACK=y
 CONFIG_SND_PCM=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_AN7581=y
+# CONFIG_SND_SOC_AN7581_WM8960 is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
 CONFIG_SND_SOC_MEDIATEK=y
 CONFIG_SND_SOC_SDCA_OPTIONAL=y

diff --git a/target/linux/airoha/an7583/config-6.18 b/target/linux/airoha/an7583/config-6.18
index f2e401f24ad52a20599bb5e3f64e8ba30d61e16a..947c7a1ad3b8e8039bfb52de7e22053341d8e57e 100644 (file)
--- a/target/linux/airoha/an7583/config-6.18
+++ b/target/linux/airoha/an7583/config-6.18
@@ -162,6 +162,11 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_SMT=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_AIROHA=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_MT7621=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IO_URING=y

diff --git a/target/linux/airoha/image/an7581.mk b/target/linux/airoha/image/an7581.mk
index 2aa3ecd6220213cf04117c4f8f7ad8a6268a9c7a..ba38318edd1128c9f315d70dc7a78312484cc7c2 100644 (file)
--- a/target/linux/airoha/image/an7581.mk
+++ b/target/linux/airoha/image/an7581.mk
@@ -49,7 +49,7 @@ define Device/airoha_an7581-evb
   $(call Device/FitImageLzma)
   DEVICE_VENDOR := Airoha
   DEVICE_MODEL := AN7581 Evaluation Board (SNAND)
-  DEVICE_PACKAGES := kmod-leds-pwm kmod-i2c-an7581 kmod-pwm-airoha kmod-input-gpio-keys-polled
+  DEVICE_PACKAGES := kmod-leds-pwm kmod-pwm-airoha kmod-input-gpio-keys-polled
   DEVICE_DTS := an7581-evb
   DEVICE_DTS_CONFIG := config@1
   IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs | append-metadata
@@ -63,7 +63,7 @@ define Device/airoha_an7581-evb-emmc-eagle
   DEVICE_VENDOR := Airoha
   DEVICE_MODEL := AN7581 Evaluation Board (eMMC + Eagle)
   DEVICE_DTS := an7581-evb-emmc-eagle
-  DEVICE_PACKAGES := kmod-i2c-an7581 airoha-en7581-mt7996-npu-firmware \
+  DEVICE_PACKAGES := airoha-en7581-mt7996-npu-firmware \
                    kmod-mt7996-firmware wpad-basic-mbedtls
   ARTIFACT/preloader.bin := an7581-preloader rfb
   ARTIFACT/bl31-uboot.fip := an7581-bl31-uboot rfb
@@ -75,7 +75,7 @@ define Device/airoha_an7581-evb-emmc-kite
   DEVICE_VENDOR := Airoha
   DEVICE_MODEL := AN7581 Evaluation Board (eMMC + Kite)
   DEVICE_DTS := an7581-evb-emmc-kite
-  DEVICE_PACKAGES := kmod-i2c-an7581 airoha-en7581-npu-firmware \
+  DEVICE_PACKAGES := airoha-en7581-npu-firmware \
                    kmod-mt7992-firmware wpad-basic-mbedtls
   ARTIFACT/preloader.bin := an7581-preloader rfb
   ARTIFACT/bl31-uboot.fip := an7581-bl31-uboot rfb
@@ -101,7 +101,7 @@ define Device/gemtek_w1700k-ubi
   DEVICE_COMPAT_MESSAGE := Partition table has been changed to cooperate \
        with the vendor bootloader with regard to the BMT/BBT partition at \
        the end of flash. A reinstall including corrected chainloader is needed.
-  DEVICE_PACKAGES := airoha-en7581-mt7996-npu-firmware fitblk kmod-i2c-an7581 \
+  DEVICE_PACKAGES := airoha-en7581-mt7996-npu-firmware fitblk \
                    kmod-hwmon-nct7802 kmod-mt7996-firmware wpad-basic-mbedtls \
                    rtl826x-firmware
   UBINIZE_OPTS := -E 5
@@ -126,7 +126,7 @@ define Device/nokia_valyrian
   DEVICE_MODEL := Valyrian
   DEVICE_DTS := an7581-nokia-valyrian
   DEVICE_PACKAGES := kmod-spi-gpio kmod-gpio-nxp-74hc164 kmod-leds-gpio \
-    kmod-i2c-an7581 kmod-i2c-gpio kmod-iio-richtek-rtq6056 \
+    kmod-i2c-gpio kmod-iio-richtek-rtq6056 \
     kmod-sfp kmod-phy-aeonsemi-as21xxx \
     kmod-mt7996-firmware airoha-en7581-mt7996-npu-firmware \
     kmod-usb3

diff --git a/target/linux/airoha/image/an7583.mk b/target/linux/airoha/image/an7583.mk
index 62a166e8a92ff5445c47e073e52e29f3c2b38883..e8533269d5e83f95ab151a7e0a6ec760b97a1669 100644 (file)
--- a/target/linux/airoha/image/an7583.mk
+++ b/target/linux/airoha/image/an7583.mk
@@ -33,7 +33,7 @@ define Device/airoha_an7583-evb-emmc
   DEVICE_VENDOR := Airoha
   DEVICE_MODEL := AN7583 Evaluation Board (EMMC)
   DEVICE_DTS := an7583-evb-emmc
-  DEVICE_PACKAGES := kmod-phy-airoha-en8811h kmod-i2c-an7581
+  DEVICE_PACKAGES := kmod-phy-airoha-en8811h
   ARTIFACT/preloader.bin := an7583-preloader rfb
   ARTIFACT/bl31-uboot.fip := an7583-bl31-uboot rfb
   ARTIFACTS := preloader.bin bl31-uboot.fip

diff --git a/target/linux/airoha/modules.mk b/target/linux/airoha/modules.mk
index e1adc94bfb3a6e2b9d702119bbb742cf077d4b68..f55e1c0cd4f8dcd117af20d1941351de2877a320 100644 (file)
--- a/target/linux/airoha/modules.mk
+++ b/target/linux/airoha/modules.mk
@@ -2,22 +2,6 @@
 
 OTHER_MENU:=Other modules
 
-I2C_MT7621_MODULES:= \
-  CONFIG_I2C_MT7621:drivers/i2c/busses/i2c-mt7621
-
-define KernelPackage/i2c-an7581
-  SUBMENU:=$(OTHER_MENU)
-  $(call i2c_defaults,$(I2C_MT7621_MODULES),79)
-  TITLE:=Airoha I2C Controller
-  DEPENDS:=+kmod-i2c-core @TARGET_airoha
-endef
-
-define KernelPackage/i2c-an7581/description
- Kernel modules for enable mt7621 i2c controller.
-endef
-
-$(eval $(call KernelPackage,i2c-an7581))
-
 
 define KernelPackage/pwm-airoha
   SUBMENU:=$(OTHER_MENU)