Introduce support for Airoha 7583 SoC NPU selecting proper firmware images. Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_npu.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c index e1d131d6115c10b40a56b63427eec59ea587d22a..fee611666aa0debf77165d9b10abecceb756ea97 100644 --- a/drivers/net/ethernet/airoha/airoha_npu.c +++ b/drivers/net/ethernet/airoha/airoha_npu.c @@ -16,6 +16,8 @@ #define NPU_EN7581_FIRMWARE_DATA "airoha/en7581_npu_data.bin" #define NPU_EN7581_FIRMWARE_RV32 "airoha/en7581_npu_rv32.bin" +#define NPU_AN7583_FIRMWARE_DATA "airoha/an7583_npu_data.bin" +#define NPU_AN7583_FIRMWARE_RV32 "airoha/an7583_npu_rv32.bin" #define NPU_EN7581_FIRMWARE_RV32_MAX_SIZE 0x200000 #define NPU_EN7581_FIRMWARE_DATA_MAX_SIZE 0x10000 #define NPU_DUMP_SIZE 512 @@ -186,10 +188,15 @@ static int airoha_npu_run_firmware(struct device *dev, void __iomem *base, struct resource *res) { const struct firmware *fw; + const char *fw_name; void __iomem *addr; int ret; - ret = request_firmware(&fw, NPU_EN7581_FIRMWARE_RV32, dev); + if (of_device_is_compatible(dev->of_node, "airoha,an7583-npu")) + fw_name = NPU_AN7583_FIRMWARE_RV32; + else + fw_name = NPU_EN7581_FIRMWARE_RV32; + ret = request_firmware(&fw, fw_name, dev); if (ret) return ret == -ENOENT ? -EPROBE_DEFER : ret; @@ -209,7 +216,11 @@ static int airoha_npu_run_firmware(struct device *dev, void __iomem *base, memcpy_toio(addr, fw->data, fw->size); release_firmware(fw); - ret = request_firmware(&fw, NPU_EN7581_FIRMWARE_DATA, dev); + if (of_device_is_compatible(dev->of_node, "airoha,an7583-npu")) + fw_name = NPU_AN7583_FIRMWARE_DATA; + else + fw_name = NPU_EN7581_FIRMWARE_DATA; + ret = request_firmware(&fw, fw_name, dev); if (ret) return ret == -ENOENT ? -EPROBE_DEFER : ret; @@ -612,6 +623,7 @@ EXPORT_SYMBOL_GPL(airoha_npu_put); static const struct of_device_id of_airoha_npu_match[] = { { .compatible = "airoha,en7581-npu" }, + { .compatible = "airoha,an7583-npu" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_airoha_npu_match); @@ -749,6 +761,8 @@ module_platform_driver(airoha_npu_driver); MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_DATA); MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_RV32); +MODULE_FIRMWARE(NPU_AN7583_FIRMWARE_DATA); +MODULE_FIRMWARE(NPU_AN7583_FIRMWARE_RV32); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Lorenzo Bianconi "); MODULE_DESCRIPTION("Airoha Network Processor Unit driver"); -- 2.51.0