From ec2ea5e06c67f85c6541a74b661722a176be086f Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Tue, 19 Jul 2022 10:08:26 -0500 Subject: [PATCH 1/2] net: ipa: list supported IPA versions in the Makefile Create a variable in the Makefile listing the IPA versions supported by the driver. Use that to create the list of configuration data object files used (rather than listing them all individually). Add a SPDX license comment. Signed-off-by: Alex Elder Signed-off-by: Jakub Kicinski --- drivers/net/ipa/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/ipa/Makefile b/drivers/net/ipa/Makefile index bdfb2430ab2c..14b313fefa3a 100644 --- a/drivers/net/ipa/Makefile +++ b/drivers/net/ipa/Makefile @@ -1,3 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the Qualcomm IPA driver. + +IPA_VERSIONS := 3.1 3.5.1 4.2 4.5 4.9 4.11 + obj-$(CONFIG_QCOM_IPA) += ipa.o ipa-y := ipa_main.o ipa_power.o ipa_reg.o ipa_mem.o \ @@ -7,6 +13,4 @@ ipa-y := ipa_main.o ipa_power.o ipa_reg.o ipa_mem.o \ ipa_resource.o ipa_qmi.o ipa_qmi_msg.o \ ipa_sysfs.o -ipa-y += ipa_data-v3.1.o ipa_data-v3.5.1.o \ - ipa_data-v4.2.o ipa_data-v4.5.o \ - ipa_data-v4.9.o ipa_data-v4.11.o +ipa-y += $(IPA_VERSIONS:%=ipa_data-v%.o) From 2c7b9b936bdc6ff0a7a5f6aed8e55d27ca14807d Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Tue, 19 Jul 2022 10:08:27 -0500 Subject: [PATCH 2/2] net: ipa: move configuration data files into a subdirectory Reduce the clutter in the main IPA source directory by creating a new "data" subdirectory, and locating all of the configuration data files in there. Signed-off-by: Alex Elder Signed-off-by: Jakub Kicinski --- drivers/net/ipa/Makefile | 2 +- drivers/net/ipa/{ => data}/ipa_data-v3.1.c | 0 drivers/net/ipa/{ => data}/ipa_data-v3.5.1.c | 0 drivers/net/ipa/{ => data}/ipa_data-v4.11.c | 0 drivers/net/ipa/{ => data}/ipa_data-v4.2.c | 0 drivers/net/ipa/{ => data}/ipa_data-v4.5.c | 0 drivers/net/ipa/{ => data}/ipa_data-v4.9.c | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename drivers/net/ipa/{ => data}/ipa_data-v3.1.c (100%) rename drivers/net/ipa/{ => data}/ipa_data-v3.5.1.c (100%) rename drivers/net/ipa/{ => data}/ipa_data-v4.11.c (100%) rename drivers/net/ipa/{ => data}/ipa_data-v4.2.c (100%) rename drivers/net/ipa/{ => data}/ipa_data-v4.5.c (100%) rename drivers/net/ipa/{ => data}/ipa_data-v4.9.c (100%) diff --git a/drivers/net/ipa/Makefile b/drivers/net/ipa/Makefile index 14b313fefa3a..8b2220eb6b92 100644 --- a/drivers/net/ipa/Makefile +++ b/drivers/net/ipa/Makefile @@ -13,4 +13,4 @@ ipa-y := ipa_main.o ipa_power.o ipa_reg.o ipa_mem.o \ ipa_resource.o ipa_qmi.o ipa_qmi_msg.o \ ipa_sysfs.o -ipa-y += $(IPA_VERSIONS:%=ipa_data-v%.o) +ipa-y += $(IPA_VERSIONS:%=data/ipa_data-v%.o) diff --git a/drivers/net/ipa/ipa_data-v3.1.c b/drivers/net/ipa/data/ipa_data-v3.1.c similarity index 100% rename from drivers/net/ipa/ipa_data-v3.1.c rename to drivers/net/ipa/data/ipa_data-v3.1.c diff --git a/drivers/net/ipa/ipa_data-v3.5.1.c b/drivers/net/ipa/data/ipa_data-v3.5.1.c similarity index 100% rename from drivers/net/ipa/ipa_data-v3.5.1.c rename to drivers/net/ipa/data/ipa_data-v3.5.1.c diff --git a/drivers/net/ipa/ipa_data-v4.11.c b/drivers/net/ipa/data/ipa_data-v4.11.c similarity index 100% rename from drivers/net/ipa/ipa_data-v4.11.c rename to drivers/net/ipa/data/ipa_data-v4.11.c diff --git a/drivers/net/ipa/ipa_data-v4.2.c b/drivers/net/ipa/data/ipa_data-v4.2.c similarity index 100% rename from drivers/net/ipa/ipa_data-v4.2.c rename to drivers/net/ipa/data/ipa_data-v4.2.c diff --git a/drivers/net/ipa/ipa_data-v4.5.c b/drivers/net/ipa/data/ipa_data-v4.5.c similarity index 100% rename from drivers/net/ipa/ipa_data-v4.5.c rename to drivers/net/ipa/data/ipa_data-v4.5.c diff --git a/drivers/net/ipa/ipa_data-v4.9.c b/drivers/net/ipa/data/ipa_data-v4.9.c similarity index 100% rename from drivers/net/ipa/ipa_data-v4.9.c rename to drivers/net/ipa/data/ipa_data-v4.9.c