From patchwork Tue Jul 19 15:08:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 12922661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A893CCA481 for ; Tue, 19 Jul 2022 15:08:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237054AbiGSPIg (ORCPT ); Tue, 19 Jul 2022 11:08:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235922AbiGSPIf (ORCPT ); Tue, 19 Jul 2022 11:08:35 -0400 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE0D550706 for ; Tue, 19 Jul 2022 08:08:33 -0700 (PDT) Received: by mail-io1-xd2e.google.com with SMTP id y2so12016963ior.12 for ; Tue, 19 Jul 2022 08:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kIFU1jp09kvp9pOU+lISTQVP4Oocjv9byOfY/PaGMKs=; b=yVDFOGATfBJpUQ5E/YX0mDcDVwCeWfh2CX5INmPzI2fuUguRi54j5Qf03k26iYHTgk KYxxxyYqUnG7ehlDUeDIyP+m9bNBcfqWH+RkOMbVK4ZomWDJcK5BllyrzvTMiAZuwlVF oToeevdtDUkpZDLHSVS75CKTB9F8ZZXKk2YnmiMqm0SpJthoKIxOtfaUFuSXnZzAd5gv zzr1+BJ59UsEaJuhAHgsSyUjn4UD9SywbCQr1GDxAhjq5hR7pUM9c3JDgrycJUJTF17a TbcLP9XwP607YtJImiRuNlLD2NnbhOwca96q3aXWIaffMmRU53FkI8lMpsIPELOD9FU1 /Q6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kIFU1jp09kvp9pOU+lISTQVP4Oocjv9byOfY/PaGMKs=; b=Eo02n993xUGtfhNs+7hTHTKEQ/bMJ1J/Y5gJihLH47u3o/pEgvGHenTayy7mzyrCEf LHag2jPfMAHt7MfvciWZEpp4QMn9mC6KkJujNWTxlQzwqAduKG0jFYFCp/MAb0TkR2oo 08y9TU0ZhdZVJJq+HbWrjTVsYhzTzRMffvQV4EELf1Io5wpp8np5VMuqBzirSd16BBwc WVx+dFRIDbr+MlaXfbqgV/2SvapEudVpLNvAQHycwkSxmbwm8Dy9w8WL0CSjZSfZXbpW QXQ12JXy0/o1iZcLDQYLiKv7OkKroAGeNqDQGxfozpw8QHusQrQDITKLGIpU7DA/OoCk 8ptw== X-Gm-Message-State: AJIora8xbfGkRWEZ/kJ+6Sjkw3VNqxScuTpbsLZ/y0NiJpIFt5/BtUCK USzOgLVmcDZRelOyFSVaPyQg/g== X-Google-Smtp-Source: AGRyM1tW3mLbXV5FhKtay1jJRdQnpHA1GeRZ+FTAJyparomRP5e/TeMEkXnNX3HnxGDvD7tS41WSXQ== X-Received: by 2002:a05:6638:268a:b0:341:529a:5133 with SMTP id o10-20020a056638268a00b00341529a5133mr10022628jat.18.1658243313053; Tue, 19 Jul 2022 08:08:33 -0700 (PDT) Received: from localhost.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id f6-20020a056e020b4600b002dae42fa5f2sm5944899ilu.56.2022.07.19.08.08.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 08:08:32 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, evgreen@chromium.org, bjorn.andersson@linaro.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/2] net: ipa: list supported IPA versions in the Makefile Date: Tue, 19 Jul 2022 10:08:26 -0500 Message-Id: <20220719150827.295248-2-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220719150827.295248-1-elder@linaro.org> References: <20220719150827.295248-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 --- 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 bdfb2430ab2c7..14b313fefa3a3 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 patchwork Tue Jul 19 15:08:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 12922662 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F1BBC43334 for ; Tue, 19 Jul 2022 15:08:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237817AbiGSPIi (ORCPT ); Tue, 19 Jul 2022 11:08:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237543AbiGSPIh (ORCPT ); Tue, 19 Jul 2022 11:08:37 -0400 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 531BD50192 for ; Tue, 19 Jul 2022 08:08:35 -0700 (PDT) Received: by mail-il1-x12b.google.com with SMTP id v1so4159794ilg.4 for ; Tue, 19 Jul 2022 08:08:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+5rv7jjhl+k6S7NYw+9gcQK9B0BL7n+vBwFwuGdweMU=; b=g3jn0nTQ2IWCL0Lkg3wzBn2hv1rsD2ZNHxKbm3oRKdWtboUkr3nPOnL6krXVwbBGEi OoLGySxfvjlsMF7axkP7zZoLAu37CRpueZNfpp3FPo4J2Y4dUAnvifraOjL8FKIWnK9M //2aX9kT3E9/sbYJ+8DIIMSLUoa/YxWqi5M0lwArBeD1fy+kl+Ti+gdkF///qTe62Mhp CGqPNKwx66ZNpz5xRxyBd3VLoyk3MSV5JWYd1PSxCplMBFENUUHersUn3kSeQHnva+Ke +KVMMzf/2K6nIqf7CT3cpvPDD/SZQ3yoBfysuqIOuCjf4zUC1u+fzvJTqt6HagrjPDGc /THw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+5rv7jjhl+k6S7NYw+9gcQK9B0BL7n+vBwFwuGdweMU=; b=MVE/ZKi8YFdJbrFrP5DMqq1uUfNgYA3Xil4UGhAC+b8/sjZe8ZTWqAUReVPECRDEHo A2lnbQ0adqYpMcYlb4oWyQnADY5Rebg3n4tdiqejkwXL/MJDX1IWgvvO9WQecA7wAp83 rHujEtdYTu+CIklwS4rFacdeyX892zkB6SwpFRx1/kayVxv/CqGSu3+nzQiq/uyYcx+E jrlvvag/XF/XE0/kljuDkxpZliGhRFOwoob6fi4zWBP25LU8/kHiHhFz6kh99/thX9Da Fek5qdenvuFU9pen8srD46JhiVgjso8OZDhxJMEhXt+ZdYm4VmRGPsA8FpNNONzA27A8 /AtA== X-Gm-Message-State: AJIora/IUX3lgMTgv9esD5kIjGiYnlqnNBa0Lv09ymDG4TtltgPXcbmf jxDqAzZT77pj4MPlsKznV7FeQw== X-Google-Smtp-Source: AGRyM1txepzshbSvujIEFhPrHDzMJVugQoXexwl6GFOEuCZgSy4u2kn6BBfSgAT6n403N5cy8SuDZg== X-Received: by 2002:a05:6e02:1ba4:b0:2dc:2b41:4052 with SMTP id n4-20020a056e021ba400b002dc2b414052mr16619717ili.200.1658243314590; Tue, 19 Jul 2022 08:08:34 -0700 (PDT) Received: from localhost.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id f6-20020a056e020b4600b002dae42fa5f2sm5944899ilu.56.2022.07.19.08.08.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 08:08:34 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, evgreen@chromium.org, bjorn.andersson@linaro.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/2] net: ipa: move configuration data files into a subdirectory Date: Tue, 19 Jul 2022 10:08:27 -0500 Message-Id: <20220719150827.295248-3-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220719150827.295248-1-elder@linaro.org> References: <20220719150827.295248-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 --- 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 14b313fefa3a3..8b2220eb6b92d 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