From patchwork Fri Nov 6 04:27:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 320766 Delivered-To: patches@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp1001989ilc; Thu, 5 Nov 2020 20:27:16 -0800 (PST) X-Received: by 2002:a05:6a00:2307:b029:164:d5da:c82c with SMTP id h7-20020a056a002307b0290164d5dac82cmr281176pfh.5.1604636835972; Thu, 05 Nov 2020 20:27:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604636835; cv=none; d=google.com; s=arc-20160816; b=juJXgQnJ0alau026eWnPcowcrjcfQuUnnAic4tO2EDXMBZcOXm+aPMYrW5neVzMBJU gyzs4QtruI3R0RtOiXy3C0ZGHe6Y2HYYCMiIVS4psH2A90TyHjGMTOPmgaVqdoiJleF/ dJWcV/isNhyEGytsIAmhkMmVY/2t+7NXl1QnHoMmIHBAKbbivXrSSe8YgnzSexACWTmi VIZcVkkQinpOitjjqLiMv0wMLpE1+A6TisBq47/kq/C/QH+C/LxEYuzyhcWIHpUZ2V+i x2/Ccq1BVmSEn/e6OUrD+pMXDwbJQk0JvLfUJyT/qfwDnhSgxx+uBiYGaZxprJwgLfr7 90Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6GAtoi0gVMYIKFbxsRQ9yjVpGK0SYChEDBpydmhHoW4=; b=cdCbGZa8hrCpFGXzZKGlN+k/ntNkJBLyuLdllj5735IommqbEQx0HjQMtKp1YS2GKg VMZFL8yMXPWq73vu5S/0IC/FjPLAae4G7mkH+9GxuL9q6JQPJeEq3Hm0srlqzkCh+PFz 9/C0bVyQbTrlGaqmxDsWHF7+6kBIhq+0Rm7xPsVoTYP7TGlufnhZWNoGyIP77pr7LMUf lH6vws7cnvwX6Gu4EP6cp2mV93nURfxvsQskVKlEWBmGPDYr5HUgj4IPdRLQGwItjvwX Pi/GwwUe99jFDN2QwHAHrIxU8t5zChLUI8//gGErJtP4jPMmzalnjvOXcSt/q1Z185nL 4O4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=riyHAwyP; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id i3sor68923pjz.6.2020.11.05.20.27.15 for (Google Transport Security); Thu, 05 Nov 2020 20:27:15 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=riyHAwyP; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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; bh=6GAtoi0gVMYIKFbxsRQ9yjVpGK0SYChEDBpydmhHoW4=; b=riyHAwyPJJRJ3tCsc6zGAB3UC/1B1HExo9jctZcDGkiQmEILAD4mHJnvIqCCBXsvag jmfG8D9uSkGQY5+U2dsPWpj61pnEDFVn3HAkearWhUl2K5jBqcYRyV1sMGmx1oMDtfJF mZskj0bXc/q19E8VUxQVa9P99B87zbTMnHhmECAccREzO65Y0/1GcgzKjoQ28tFJ5VX7 bvEwiRT2+RSKz3UmFe0PnrJYENQCJnTJFycA35xYumjVo2SSQxPr00KUvDDy374cBc/M aB+jrtSAyl9KqJF/B/rDyLrazqv8iK1yQu2v0qI3g+VlLpz3+kM6bTedAeO/xxSQ/6aG ZJiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6GAtoi0gVMYIKFbxsRQ9yjVpGK0SYChEDBpydmhHoW4=; b=dRNrK9lklv424vIdN1h93kpfRVieA1MxYLuh9c9QUusD5ONDDx2EUzXa0KEymSeUyt YC/RnBbPcTKv94EnZzOMndmcpLGJHDGHXWa/8RuPGMqP0NhDElidQ+RxI7wUnQv0lXgX sGcJ42MBLmM8YUkdC8B2/fT4VNgFgvSSIPGtZiyZJEn3xb3HBkYeVQoI4pVFzTjsVP5i aS0nLaUgmD8OQsDoLsQ1+bUEPTsCh5GU3rW2ys6EuInHuE97wuyOCkdtGg3xJGaWWwp0 BLDY70ZCzEstWXuNp3Djdpp0iSOjaKvhPZPtU5YvOFmMouKMX1oMRxMHlv8WbxwDEIwq 1qdg== X-Gm-Message-State: AOAM532dEyMRAcxFlcAVTb7O8vPKSSm6IjrHC70f9qyoiDmb4dflENCU eDG4SG8LdNwgqkstUwTVtzq4iqWU X-Google-Smtp-Source: ABdhPJwIfqzQs0Hz0ONJ2Cwc9narnnGapHKO01mr7EPFz2YXkckIhaGBz/VTvcX3yWfrD8ZnI2B/Lw== X-Received: by 2002:a17:90b:602:: with SMTP id gb2mr387639pjb.12.1604636835693; Thu, 05 Nov 2020 20:27:15 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id e24sm179864pfl.149.2020.11.05.20.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 20:27:15 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Catalin Marinas , Will Deacon , Andy Gross , Bjorn Andersson , Joerg Roedel , Thomas Gleixner , Jason Cooper , Marc Zyngier , Linus Walleij , Vinod Koul , Kalle Valo , Maulik Shah , Lina Iyer , Saravana Kannan , Todd Kjos , Greg Kroah-Hartman , linux-arm-msm@vger.kernel.org, iommu@lists.linux-foundation.org, linux-gpio@vger.kernel.org Subject: [PATCH v6 2/3] pinctrl: qcom: Allow pinctrl-msm code to be loadable as a module Date: Fri, 6 Nov 2020 04:27:09 +0000 Message-Id: <20201106042710.55979-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201106042710.55979-1-john.stultz@linaro.org> References: <20201106042710.55979-1-john.stultz@linaro.org> Tweaks to allow pinctrl-msm code to be loadable as a module. This is needed in order to support having the qcom-scm driver, which pinctrl-msm calls into, configured as a module. This requires that we tweak Kconfigs selecting PINCTRL_MSM to also depend on QCOM_SCM || QCOM_SCM=n so that we match the module setting of QCOM_SCM. Cc: Catalin Marinas Cc: Will Deacon Cc: Andy Gross Cc: Bjorn Andersson Cc: Joerg Roedel Cc: Thomas Gleixner Cc: Jason Cooper Cc: Marc Zyngier Cc: Linus Walleij Cc: Vinod Koul Cc: Kalle Valo Cc: Maulik Shah Cc: Lina Iyer Cc: Saravana Kannan Cc: Todd Kjos Cc: Greg Kroah-Hartman Cc: linux-arm-msm@vger.kernel.org Cc: iommu@lists.linux-foundation.org Cc: linux-gpio@vger.kernel.org Reviewed-by: Bjorn Andersson Signed-off-by: John Stultz --- v2: * Module description and whitespace fixes suggested by Bjorn * Added QCOM_SCM || QCOM_SCM=n bits on Kconfigs selecting PINCTRL_MSM. Reported by both Todd and Bjorn. v3: * Make sure the QCOM_SCM || QCOM_SCM=n trick is commented v4: * Rework "select PINCTRL_MSM" to "depends on PINCTRL_MSM" to consolidate the QCOM_SCM dependency. v5: * Add PINCTRL_MSM to arm64 defconfig v6: * Split PINCTRL_MSM dependency bit out into its own patch --- drivers/pinctrl/qcom/Kconfig | 3 ++- drivers/pinctrl/qcom/pinctrl-msm.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig index c9bb2d9e49d47..8bb786ed152dd 100644 --- a/drivers/pinctrl/qcom/Kconfig +++ b/drivers/pinctrl/qcom/Kconfig @@ -2,7 +2,8 @@ if (ARCH_QCOM || COMPILE_TEST) config PINCTRL_MSM - bool "Qualcomm core pin controller driver" + tristate "Qualcomm core pin controller driver" + depends on QCOM_SCM || !QCOM_SCM #if QCOM_SCM=m this can't be =y select PINMUX select PINCONF select GENERIC_PINCONF diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index c4bcda90aac4a..988343ac49b92 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -1443,3 +1443,5 @@ int msm_pinctrl_remove(struct platform_device *pdev) } EXPORT_SYMBOL(msm_pinctrl_remove); +MODULE_DESCRIPTION("Qualcomm Technologies, Inc. TLMM driver"); +MODULE_LICENSE("GPL v2");