[PATCH 1/8] pinctrl: qcom: qdf2xxx: drop ACPI_PTR

[PATCH 1/8] pinctrl: qcom: qdf2xxx: drop ACPI_PTR

[Krzysztof Kozlowski]

Driver can bind only via ACPI matching and acpi_device_id is there
unconditionally, so drop useless ACPI_PTR() macro.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c b/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
index b0f1b3dc6831..b5808fcfb13c 100644
--- a/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
+++ b/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
@@ -142,7 +142,7 @@ MODULE_DEVICE_TABLE(acpi, qdf2xxx_acpi_ids);
 static struct platform_driver qdf2xxx_pinctrl_driver = {
 	.driver = {
 		.name = "qdf2xxx-pinctrl",
-		.acpi_match_table = ACPI_PTR(qdf2xxx_acpi_ids),
+		.acpi_match_table = qdf2xxx_acpi_ids,
 	},
 	.probe = qdf2xxx_pinctrl_probe,
 	.remove = msm_pinctrl_remove,
-- 
2.34.1

[PATCH 2/8] pinctrl: qcom: fix indentation in Kconfig

[Krzysztof Kozlowski]

Use tab for correct Kconfig indentation.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/pinctrl/qcom/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
index 28b19458b20d..9f957d16cd68 100644
--- a/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@ -245,7 +245,7 @@ config PINCTRL_QCOM_SPMI_PMIC
 	select PINMUX
 	select PINCONF
 	select GENERIC_PINCONF
-  select GPIOLIB
+	select GPIOLIB
 	select GPIOLIB_IRQCHIP
 	select IRQ_DOMAIN_HIERARCHY
 	help
@@ -260,7 +260,7 @@ config PINCTRL_QCOM_SSBI_PMIC
 	select PINMUX
 	select PINCONF
 	select GENERIC_PINCONF
-  select GPIOLIB
+	select GPIOLIB
 	select GPIOLIB_IRQCHIP
 	select IRQ_DOMAIN_HIERARCHY
 	help
-- 
2.34.1

Re: [PATCH 2/8] pinctrl: qcom: fix indentation in Kconfig

[Konrad Dybcio]

On 1.06.2023 17:20, Krzysztof Kozlowski wrote:
> Use tab for correct Kconfig indentation.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/pinctrl/qcom/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
> index 28b19458b20d..9f957d16cd68 100644
> --- a/drivers/pinctrl/qcom/Kconfig
> +++ b/drivers/pinctrl/qcom/Kconfig
> @@ -245,7 +245,7 @@ config PINCTRL_QCOM_SPMI_PMIC
>  	select PINMUX
>  	select PINCONF
>  	select GENERIC_PINCONF
> -  select GPIOLIB
> +	select GPIOLIB
>  	select GPIOLIB_IRQCHIP
>  	select IRQ_DOMAIN_HIERARCHY
>  	help
> @@ -260,7 +260,7 @@ config PINCTRL_QCOM_SSBI_PMIC
>  	select PINMUX
>  	select PINCONF
>  	select GENERIC_PINCONF
> -  select GPIOLIB
> +	select GPIOLIB
>  	select GPIOLIB_IRQCHIP
>  	select IRQ_DOMAIN_HIERARCHY
>  	help

[PATCH 3/8] pinctrl: qcom: correct language typo (Technologies)

[Krzysztof Kozlowski]

Correct typo: Tehcnologies->Technologies.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/pinctrl/qcom/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
index 9f957d16cd68..b03a62ecdc07 100644
--- a/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@ -270,7 +270,7 @@ config PINCTRL_QCOM_SSBI_PMIC
 	 devices are pm8058 and pm8921.
 
 config PINCTRL_QDU1000
-	tristate "Qualcomm Tehcnologies Inc QDU1000/QRU1000 pin controller driver"
+	tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
 	depends on GPIOLIB && OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
-- 
2.34.1

Re: [PATCH 3/8] pinctrl: qcom: correct language typo (Technologies)

[Konrad Dybcio]

On 1.06.2023 17:20, Krzysztof Kozlowski wrote:
> Correct typo: Tehcnologies->Technologies.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/pinctrl/qcom/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
> index 9f957d16cd68..b03a62ecdc07 100644
> --- a/drivers/pinctrl/qcom/Kconfig
> +++ b/drivers/pinctrl/qcom/Kconfig
> @@ -270,7 +270,7 @@ config PINCTRL_QCOM_SSBI_PMIC
>  	 devices are pm8058 and pm8921.
>  
>  config PINCTRL_QDU1000
> -	tristate "Qualcomm Tehcnologies Inc QDU1000/QRU1000 pin controller driver"
> +	tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
>  	depends on GPIOLIB && OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM

[PATCH 4/8] pinctrl: qcom: drop unneeded GPIOLIB dependency

[Krzysztof Kozlowski]

PINCTRL_MSM depends on GPIOLIB, thus individual driver entries depending
on the first do not have to depend on the latter.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/pinctrl/qcom/Kconfig | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
index b03a62ecdc07..2236bdff7e60 100644
--- a/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@ -121,7 +121,7 @@ config PINCTRL_MSM8960
 
 config PINCTRL_MDM9607
 	tristate "Qualcomm 9607 pin controller driver"
-	depends on GPIOLIB && OF
+	depends on OF
 	depends on PINCTRL_MSM
 	help
 	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
@@ -271,7 +271,7 @@ config PINCTRL_QCOM_SSBI_PMIC
 
 config PINCTRL_QDU1000
 	tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
-	depends on GPIOLIB && OF
+	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -310,7 +310,6 @@ config PINCTRL_SC7280
 
 config PINCTRL_SC7280_LPASS_LPI
 	tristate "Qualcomm Technologies Inc SC7280 LPASS LPI pin controller driver"
-	depends on GPIOLIB
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_LPASS_LPI
 	help
@@ -380,7 +379,7 @@ config PINCTRL_SDX55
 
 config PINCTRL_SDX65
         tristate "Qualcomm Technologies Inc SDX65 pin controller driver"
-        depends on GPIOLIB && OF
+        depends on OF
         depends on ARM || COMPILE_TEST
         depends on PINCTRL_MSM
         help
@@ -390,7 +389,7 @@ config PINCTRL_SDX65
 
 config PINCTRL_SDX75
         tristate "Qualcomm Technologies Inc SDX75 pin controller driver"
-        depends on GPIOLIB && OF
+        depends on OF
         depends on ARM64 || COMPILE_TEST
         depends on PINCTRL_MSM
         help
@@ -400,7 +399,7 @@ config PINCTRL_SDX75
 
 config PINCTRL_SM6115
 	tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
-	depends on GPIOLIB && OF
+	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -420,7 +419,7 @@ config PINCTRL_SM6125
 
 config PINCTRL_SM6350
 	tristate "Qualcomm Technologies Inc SM6350 pin controller driver"
-	depends on GPIOLIB && OF
+	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -430,7 +429,7 @@ config PINCTRL_SM6350
 
 config PINCTRL_SM6375
 	tristate "Qualcomm Technologies Inc SM6375 pin controller driver"
-	depends on GPIOLIB && OF
+	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -470,7 +469,6 @@ config PINCTRL_SM8250
 
 config PINCTRL_SM8250_LPASS_LPI
 	tristate "Qualcomm Technologies Inc SM8250 LPASS LPI pin controller driver"
-	depends on GPIOLIB
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_LPASS_LPI
 	help
@@ -489,7 +487,7 @@ config PINCTRL_SM8350
 
 config PINCTRL_SM8450
 	tristate "Qualcomm Technologies Inc SM8450 pin controller driver"
-	depends on GPIOLIB && OF
+	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -499,7 +497,6 @@ config PINCTRL_SM8450
 
 config PINCTRL_SM8450_LPASS_LPI
 	tristate "Qualcomm Technologies Inc SM8450 LPASS LPI pin controller driver"
-	depends on GPIOLIB
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_LPASS_LPI
 	help
@@ -509,7 +506,6 @@ config PINCTRL_SM8450_LPASS_LPI
 
 config PINCTRL_SC8280XP_LPASS_LPI
 	tristate "Qualcomm Technologies Inc SC8280XP LPASS LPI pin controller driver"
-	depends on GPIOLIB
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_LPASS_LPI
 	help
@@ -519,7 +515,6 @@ config PINCTRL_SC8280XP_LPASS_LPI
 
 config PINCTRL_SM8550
 	tristate "Qualcomm Technologies Inc SM8550 pin controller driver"
-	depends on GPIOLIB
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -529,7 +524,6 @@ config PINCTRL_SM8550
 
 config PINCTRL_SM8550_LPASS_LPI
 	tristate "Qualcomm Technologies Inc SM8550 LPASS LPI pin controller driver"
-	depends on GPIOLIB
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_LPASS_LPI
 	help
-- 
2.34.1

Re: [PATCH 4/8] pinctrl: qcom: drop unneeded GPIOLIB dependency

[Konrad Dybcio]

On 1.06.2023 17:20, Krzysztof Kozlowski wrote:
> PINCTRL_MSM depends on GPIOLIB, thus individual driver entries depending
> on the first do not have to depend on the latter.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/pinctrl/qcom/Kconfig | 22 ++++++++--------------
>  1 file changed, 8 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
> index b03a62ecdc07..2236bdff7e60 100644
> --- a/drivers/pinctrl/qcom/Kconfig
> +++ b/drivers/pinctrl/qcom/Kconfig
> @@ -121,7 +121,7 @@ config PINCTRL_MSM8960
>  
>  config PINCTRL_MDM9607
>  	tristate "Qualcomm 9607 pin controller driver"
> -	depends on GPIOLIB && OF
> +	depends on OF
>  	depends on PINCTRL_MSM
>  	help
>  	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> @@ -271,7 +271,7 @@ config PINCTRL_QCOM_SSBI_PMIC
>  
>  config PINCTRL_QDU1000
>  	tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
> -	depends on GPIOLIB && OF
> +	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -310,7 +310,6 @@ config PINCTRL_SC7280
>  
>  config PINCTRL_SC7280_LPASS_LPI
>  	tristate "Qualcomm Technologies Inc SC7280 LPASS LPI pin controller driver"
> -	depends on GPIOLIB
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_LPASS_LPI
>  	help
> @@ -380,7 +379,7 @@ config PINCTRL_SDX55
>  
>  config PINCTRL_SDX65
>          tristate "Qualcomm Technologies Inc SDX65 pin controller driver"
> -        depends on GPIOLIB && OF
> +        depends on OF
>          depends on ARM || COMPILE_TEST
>          depends on PINCTRL_MSM
>          help
> @@ -390,7 +389,7 @@ config PINCTRL_SDX65
>  
>  config PINCTRL_SDX75
>          tristate "Qualcomm Technologies Inc SDX75 pin controller driver"
> -        depends on GPIOLIB && OF
> +        depends on OF
>          depends on ARM64 || COMPILE_TEST
>          depends on PINCTRL_MSM
>          help
> @@ -400,7 +399,7 @@ config PINCTRL_SDX75
>  
>  config PINCTRL_SM6115
>  	tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
> -	depends on GPIOLIB && OF
> +	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -420,7 +419,7 @@ config PINCTRL_SM6125
>  
>  config PINCTRL_SM6350
>  	tristate "Qualcomm Technologies Inc SM6350 pin controller driver"
> -	depends on GPIOLIB && OF
> +	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -430,7 +429,7 @@ config PINCTRL_SM6350
>  
>  config PINCTRL_SM6375
>  	tristate "Qualcomm Technologies Inc SM6375 pin controller driver"
> -	depends on GPIOLIB && OF
> +	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -470,7 +469,6 @@ config PINCTRL_SM8250
>  
>  config PINCTRL_SM8250_LPASS_LPI
>  	tristate "Qualcomm Technologies Inc SM8250 LPASS LPI pin controller driver"
> -	depends on GPIOLIB
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_LPASS_LPI
>  	help
> @@ -489,7 +487,7 @@ config PINCTRL_SM8350
>  
>  config PINCTRL_SM8450
>  	tristate "Qualcomm Technologies Inc SM8450 pin controller driver"
> -	depends on GPIOLIB && OF
> +	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -499,7 +497,6 @@ config PINCTRL_SM8450
>  
>  config PINCTRL_SM8450_LPASS_LPI
>  	tristate "Qualcomm Technologies Inc SM8450 LPASS LPI pin controller driver"
> -	depends on GPIOLIB
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_LPASS_LPI
>  	help
> @@ -509,7 +506,6 @@ config PINCTRL_SM8450_LPASS_LPI
>  
>  config PINCTRL_SC8280XP_LPASS_LPI
>  	tristate "Qualcomm Technologies Inc SC8280XP LPASS LPI pin controller driver"
> -	depends on GPIOLIB
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_LPASS_LPI
>  	help
> @@ -519,7 +515,6 @@ config PINCTRL_SC8280XP_LPASS_LPI
>  
>  config PINCTRL_SM8550
>  	tristate "Qualcomm Technologies Inc SM8550 pin controller driver"
> -	depends on GPIOLIB
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -529,7 +524,6 @@ config PINCTRL_SM8550
>  
>  config PINCTRL_SM8550_LPASS_LPI
>  	tristate "Qualcomm Technologies Inc SM8550 LPASS LPI pin controller driver"
> -	depends on GPIOLIB
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_LPASS_LPI
>  	help

[PATCH 5/8] pinctrl: qcom: mark true OF dependency - common MSM pinctrl code

[Krzysztof Kozlowski]

The common MSM pinctrl driver code (PINCTRL_MSM) uses
pinconf_generic_dt_node_to_map_group() from GENERIC_PINCONF, which is
not available for compile testing for !OF cases.  Drivers actually do
not depend on OF.  Move the OF dependency to the entry actually
depending on it and drop any "|| COMPILE_TEST", because OF is required
also for compile testing (lack of OF was never visible in compile
testing because none of the drivers could be compile tested due to
Makefile).

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/pinctrl/qcom/Kconfig | 43 ++----------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
index 2236bdff7e60..18ac19f41873 100644
--- a/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@ -4,6 +4,8 @@ if (ARCH_QCOM || COMPILE_TEST)
 config PINCTRL_MSM
 	tristate "Qualcomm core pin controller driver"
 	depends on GPIOLIB
+	# OF for pinconf_generic_dt_node_to_map_group() from GENERIC_PINCONF
+	depends on OF
 	select QCOM_SCM
 	select PINMUX
 	select PINCONF
@@ -14,7 +16,6 @@ config PINCTRL_MSM
 
 config PINCTRL_APQ8064
 	tristate "Qualcomm APQ8064 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -23,7 +24,6 @@ config PINCTRL_APQ8064
 
 config PINCTRL_APQ8084
 	tristate "Qualcomm APQ8084 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -32,7 +32,6 @@ config PINCTRL_APQ8084
 
 config PINCTRL_IPQ4019
 	tristate "Qualcomm IPQ4019 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -41,7 +40,6 @@ config PINCTRL_IPQ4019
 
 config PINCTRL_IPQ8064
 	tristate "Qualcomm IPQ8064 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -50,7 +48,6 @@ config PINCTRL_IPQ8064
 
 config PINCTRL_IPQ5332
 	tristate "Qualcomm Technologies Inc IPQ5332 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -60,7 +57,6 @@ config PINCTRL_IPQ5332
 
 config PINCTRL_IPQ8074
 	tristate "Qualcomm Technologies, Inc. IPQ8074 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -71,7 +67,6 @@ config PINCTRL_IPQ8074
 
 config PINCTRL_IPQ6018
 	tristate "Qualcomm Technologies, Inc. IPQ6018 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -82,7 +77,6 @@ config PINCTRL_IPQ6018
 
 config PINCTRL_IPQ9574
 	tristate "Qualcomm Technologies, Inc. IPQ9574 pin controller driver"
-	depends on OF || COMPILE_TEST
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -93,7 +87,6 @@ config PINCTRL_IPQ9574
 
 config PINCTRL_MSM8226
 	tristate "Qualcomm 8226 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -103,7 +96,6 @@ config PINCTRL_MSM8226
 
 config PINCTRL_MSM8660
 	tristate "Qualcomm 8660 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -112,7 +104,6 @@ config PINCTRL_MSM8660
 
 config PINCTRL_MSM8960
 	tristate "Qualcomm 8960 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -121,7 +112,6 @@ config PINCTRL_MSM8960
 
 config PINCTRL_MDM9607
 	tristate "Qualcomm 9607 pin controller driver"
-	depends on OF
 	depends on PINCTRL_MSM
 	help
 	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
@@ -129,7 +119,6 @@ config PINCTRL_MDM9607
 
 config PINCTRL_MDM9615
 	tristate "Qualcomm 9615 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -138,7 +127,6 @@ config PINCTRL_MDM9615
 
 config PINCTRL_MSM8X74
 	tristate "Qualcomm 8x74 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -147,7 +135,6 @@ config PINCTRL_MSM8X74
 
 config PINCTRL_MSM8909
 	tristate "Qualcomm 8909 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -156,7 +143,6 @@ config PINCTRL_MSM8909
 
 config PINCTRL_MSM8916
 	tristate "Qualcomm 8916 pin controller driver"
-	depends on OF
 	depends on PINCTRL_MSM
 	help
 	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
@@ -164,7 +150,6 @@ config PINCTRL_MSM8916
 
 config PINCTRL_MSM8953
 	tristate "Qualcomm 8953 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -175,7 +160,6 @@ config PINCTRL_MSM8953
 
 config PINCTRL_MSM8976
 	tristate "Qualcomm 8976 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -186,7 +170,6 @@ config PINCTRL_MSM8976
 
 config PINCTRL_MSM8994
 	tristate "Qualcomm 8994 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -196,7 +179,6 @@ config PINCTRL_MSM8994
 
 config PINCTRL_MSM8996
 	tristate "Qualcomm MSM8996 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -205,7 +187,6 @@ config PINCTRL_MSM8996
 
 config PINCTRL_MSM8998
 	tristate "Qualcomm MSM8998 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -214,7 +195,6 @@ config PINCTRL_MSM8998
 
 config PINCTRL_QCM2290
 	tristate "Qualcomm QCM2290 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -223,7 +203,6 @@ config PINCTRL_QCM2290
 
 config PINCTRL_QCS404
 	tristate "Qualcomm QCS404 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -271,7 +250,6 @@ config PINCTRL_QCOM_SSBI_PMIC
 
 config PINCTRL_QDU1000
 	tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -281,7 +259,6 @@ config PINCTRL_QDU1000
 
 config PINCTRL_SA8775P
 	tristate "Qualcomm Technologies Inc SA8775P pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -290,7 +267,6 @@ config PINCTRL_SA8775P
 
 config PINCTRL_SC7180
 	tristate "Qualcomm Technologies Inc SC7180 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -300,7 +276,6 @@ config PINCTRL_SC7180
 
 config PINCTRL_SC7280
 	tristate "Qualcomm Technologies Inc SC7280 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -329,7 +304,6 @@ config PINCTRL_SC8180X
 
 config PINCTRL_SC8280XP
 	tristate "Qualcomm Technologies Inc SC8280xp pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -339,7 +313,6 @@ config PINCTRL_SC8280XP
 
 config PINCTRL_SDM660
 	tristate "Qualcomm Technologies Inc SDM660 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -349,7 +322,6 @@ config PINCTRL_SDM660
 
 config PINCTRL_SDM670
 	tristate "Qualcomm Technologies Inc SDM670 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -369,7 +341,6 @@ config PINCTRL_SDM845
 
 config PINCTRL_SDX55
 	tristate "Qualcomm Technologies Inc SDX55 pin controller driver"
-	depends on OF
 	depends on ARM || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -379,7 +350,6 @@ config PINCTRL_SDX55
 
 config PINCTRL_SDX65
         tristate "Qualcomm Technologies Inc SDX65 pin controller driver"
-        depends on OF
         depends on ARM || COMPILE_TEST
         depends on PINCTRL_MSM
         help
@@ -389,7 +359,6 @@ config PINCTRL_SDX65
 
 config PINCTRL_SDX75
         tristate "Qualcomm Technologies Inc SDX75 pin controller driver"
-        depends on OF
         depends on ARM64 || COMPILE_TEST
         depends on PINCTRL_MSM
         help
@@ -399,7 +368,6 @@ config PINCTRL_SDX75
 
 config PINCTRL_SM6115
 	tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -409,7 +377,6 @@ config PINCTRL_SM6115
 
 config PINCTRL_SM6125
 	tristate "Qualcomm Technologies Inc SM6125 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -419,7 +386,6 @@ config PINCTRL_SM6125
 
 config PINCTRL_SM6350
 	tristate "Qualcomm Technologies Inc SM6350 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -429,7 +395,6 @@ config PINCTRL_SM6350
 
 config PINCTRL_SM6375
 	tristate "Qualcomm Technologies Inc SM6375 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -439,7 +404,6 @@ config PINCTRL_SM6375
 
 config PINCTRL_SM7150
 	tristate "Qualcomm Technologies Inc SM7150 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -449,7 +413,6 @@ config PINCTRL_SM7150
 
 config PINCTRL_SM8150
 	tristate "Qualcomm Technologies Inc SM8150 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -459,7 +422,6 @@ config PINCTRL_SM8150
 
 config PINCTRL_SM8250
 	tristate "Qualcomm Technologies Inc SM8250 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
@@ -487,7 +449,6 @@ config PINCTRL_SM8350
 
 config PINCTRL_SM8450
 	tristate "Qualcomm Technologies Inc SM8450 pin controller driver"
-	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	depends on PINCTRL_MSM
 	help
-- 
2.34.1

Re: [PATCH 5/8] pinctrl: qcom: mark true OF dependency - common MSM pinctrl code

[Konrad Dybcio]

On 1.06.2023 17:20, Krzysztof Kozlowski wrote:
> The common MSM pinctrl driver code (PINCTRL_MSM) uses
> pinconf_generic_dt_node_to_map_group() from GENERIC_PINCONF, which is
> not available for compile testing for !OF cases.  Drivers actually do
> not depend on OF.  Move the OF dependency to the entry actually
> depending on it and drop any "|| COMPILE_TEST", because OF is required
> also for compile testing (lack of OF was never visible in compile
> testing because none of the drivers could be compile tested due to
> Makefile).
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/pinctrl/qcom/Kconfig | 43 ++----------------------------------
>  1 file changed, 2 insertions(+), 41 deletions(-)
> 
> diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
> index 2236bdff7e60..18ac19f41873 100644
> --- a/drivers/pinctrl/qcom/Kconfig
> +++ b/drivers/pinctrl/qcom/Kconfig
> @@ -4,6 +4,8 @@ if (ARCH_QCOM || COMPILE_TEST)
>  config PINCTRL_MSM
>  	tristate "Qualcomm core pin controller driver"
>  	depends on GPIOLIB
> +	# OF for pinconf_generic_dt_node_to_map_group() from GENERIC_PINCONF
> +	depends on OF
>  	select QCOM_SCM
>  	select PINMUX
>  	select PINCONF
> @@ -14,7 +16,6 @@ config PINCTRL_MSM
>  
>  config PINCTRL_APQ8064
>  	tristate "Qualcomm APQ8064 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -23,7 +24,6 @@ config PINCTRL_APQ8064
>  
>  config PINCTRL_APQ8084
>  	tristate "Qualcomm APQ8084 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -32,7 +32,6 @@ config PINCTRL_APQ8084
>  
>  config PINCTRL_IPQ4019
>  	tristate "Qualcomm IPQ4019 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -41,7 +40,6 @@ config PINCTRL_IPQ4019
>  
>  config PINCTRL_IPQ8064
>  	tristate "Qualcomm IPQ8064 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -50,7 +48,6 @@ config PINCTRL_IPQ8064
>  
>  config PINCTRL_IPQ5332
>  	tristate "Qualcomm Technologies Inc IPQ5332 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -60,7 +57,6 @@ config PINCTRL_IPQ5332
>  
>  config PINCTRL_IPQ8074
>  	tristate "Qualcomm Technologies, Inc. IPQ8074 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -71,7 +67,6 @@ config PINCTRL_IPQ8074
>  
>  config PINCTRL_IPQ6018
>  	tristate "Qualcomm Technologies, Inc. IPQ6018 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -82,7 +77,6 @@ config PINCTRL_IPQ6018
>  
>  config PINCTRL_IPQ9574
>  	tristate "Qualcomm Technologies, Inc. IPQ9574 pin controller driver"
> -	depends on OF || COMPILE_TEST
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -93,7 +87,6 @@ config PINCTRL_IPQ9574
>  
>  config PINCTRL_MSM8226
>  	tristate "Qualcomm 8226 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -103,7 +96,6 @@ config PINCTRL_MSM8226
>  
>  config PINCTRL_MSM8660
>  	tristate "Qualcomm 8660 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -112,7 +104,6 @@ config PINCTRL_MSM8660
>  
>  config PINCTRL_MSM8960
>  	tristate "Qualcomm 8960 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -121,7 +112,6 @@ config PINCTRL_MSM8960
>  
>  config PINCTRL_MDM9607
>  	tristate "Qualcomm 9607 pin controller driver"
> -	depends on OF
>  	depends on PINCTRL_MSM
>  	help
>  	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> @@ -129,7 +119,6 @@ config PINCTRL_MDM9607
>  
>  config PINCTRL_MDM9615
>  	tristate "Qualcomm 9615 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -138,7 +127,6 @@ config PINCTRL_MDM9615
>  
>  config PINCTRL_MSM8X74
>  	tristate "Qualcomm 8x74 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -147,7 +135,6 @@ config PINCTRL_MSM8X74
>  
>  config PINCTRL_MSM8909
>  	tristate "Qualcomm 8909 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -156,7 +143,6 @@ config PINCTRL_MSM8909
>  
>  config PINCTRL_MSM8916
>  	tristate "Qualcomm 8916 pin controller driver"
> -	depends on OF
>  	depends on PINCTRL_MSM
>  	help
>  	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> @@ -164,7 +150,6 @@ config PINCTRL_MSM8916
>  
>  config PINCTRL_MSM8953
>  	tristate "Qualcomm 8953 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -175,7 +160,6 @@ config PINCTRL_MSM8953
>  
>  config PINCTRL_MSM8976
>  	tristate "Qualcomm 8976 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -186,7 +170,6 @@ config PINCTRL_MSM8976
>  
>  config PINCTRL_MSM8994
>  	tristate "Qualcomm 8994 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -196,7 +179,6 @@ config PINCTRL_MSM8994
>  
>  config PINCTRL_MSM8996
>  	tristate "Qualcomm MSM8996 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -205,7 +187,6 @@ config PINCTRL_MSM8996
>  
>  config PINCTRL_MSM8998
>  	tristate "Qualcomm MSM8998 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -214,7 +195,6 @@ config PINCTRL_MSM8998
>  
>  config PINCTRL_QCM2290
>  	tristate "Qualcomm QCM2290 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -223,7 +203,6 @@ config PINCTRL_QCM2290
>  
>  config PINCTRL_QCS404
>  	tristate "Qualcomm QCS404 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -271,7 +250,6 @@ config PINCTRL_QCOM_SSBI_PMIC
>  
>  config PINCTRL_QDU1000
>  	tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -281,7 +259,6 @@ config PINCTRL_QDU1000
>  
>  config PINCTRL_SA8775P
>  	tristate "Qualcomm Technologies Inc SA8775P pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -290,7 +267,6 @@ config PINCTRL_SA8775P
>  
>  config PINCTRL_SC7180
>  	tristate "Qualcomm Technologies Inc SC7180 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -300,7 +276,6 @@ config PINCTRL_SC7180
>  
>  config PINCTRL_SC7280
>  	tristate "Qualcomm Technologies Inc SC7280 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -329,7 +304,6 @@ config PINCTRL_SC8180X
>  
>  config PINCTRL_SC8280XP
>  	tristate "Qualcomm Technologies Inc SC8280xp pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -339,7 +313,6 @@ config PINCTRL_SC8280XP
>  
>  config PINCTRL_SDM660
>  	tristate "Qualcomm Technologies Inc SDM660 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -349,7 +322,6 @@ config PINCTRL_SDM660
>  
>  config PINCTRL_SDM670
>  	tristate "Qualcomm Technologies Inc SDM670 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -369,7 +341,6 @@ config PINCTRL_SDM845
>  
>  config PINCTRL_SDX55
>  	tristate "Qualcomm Technologies Inc SDX55 pin controller driver"
> -	depends on OF
>  	depends on ARM || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -379,7 +350,6 @@ config PINCTRL_SDX55
>  
>  config PINCTRL_SDX65
>          tristate "Qualcomm Technologies Inc SDX65 pin controller driver"
> -        depends on OF
>          depends on ARM || COMPILE_TEST
>          depends on PINCTRL_MSM
>          help
> @@ -389,7 +359,6 @@ config PINCTRL_SDX65
>  
>  config PINCTRL_SDX75
>          tristate "Qualcomm Technologies Inc SDX75 pin controller driver"
> -        depends on OF
>          depends on ARM64 || COMPILE_TEST
>          depends on PINCTRL_MSM
>          help
> @@ -399,7 +368,6 @@ config PINCTRL_SDX75
>  
>  config PINCTRL_SM6115
>  	tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -409,7 +377,6 @@ config PINCTRL_SM6115
>  
>  config PINCTRL_SM6125
>  	tristate "Qualcomm Technologies Inc SM6125 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -419,7 +386,6 @@ config PINCTRL_SM6125
>  
>  config PINCTRL_SM6350
>  	tristate "Qualcomm Technologies Inc SM6350 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -429,7 +395,6 @@ config PINCTRL_SM6350
>  
>  config PINCTRL_SM6375
>  	tristate "Qualcomm Technologies Inc SM6375 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -439,7 +404,6 @@ config PINCTRL_SM6375
>  
>  config PINCTRL_SM7150
>  	tristate "Qualcomm Technologies Inc SM7150 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -449,7 +413,6 @@ config PINCTRL_SM7150
>  
>  config PINCTRL_SM8150
>  	tristate "Qualcomm Technologies Inc SM8150 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -459,7 +422,6 @@ config PINCTRL_SM8150
>  
>  config PINCTRL_SM8250
>  	tristate "Qualcomm Technologies Inc SM8250 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help
> @@ -487,7 +449,6 @@ config PINCTRL_SM8350
>  
>  config PINCTRL_SM8450
>  	tristate "Qualcomm Technologies Inc SM8450 pin controller driver"
> -	depends on OF
>  	depends on ARM64 || COMPILE_TEST
>  	depends on PINCTRL_MSM
>  	help

[PATCH 6/8] pinctrl: qcom: allow true compile testing

[Krzysztof Kozlowski]

Makefile selected Qualcomm pinctrl drivers only for ARCH_QCOM, making
any COMPILE_TEST options inside Kconfig ((ARCH_QCOM || COMPILE_TEST) or
(OF || COMPILE_TEST)) not effective.  Always descent to the qcom
subdirectory to fix this.  All individual drivers are selected in
Makefile via dedicated CONFIG entries, thus this should not have
functional impact except when compile testing.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/pinctrl/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index e196c6e324ad..482b391b5deb 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -66,7 +66,7 @@ obj-y				+= nomadik/
 obj-y				+= nuvoton/
 obj-y				+= nxp/
 obj-$(CONFIG_PINCTRL_PXA)	+= pxa/
-obj-$(CONFIG_ARCH_QCOM)		+= qcom/
+obj-y				+= qcom/
 obj-$(CONFIG_PINCTRL_RENESAS)	+= renesas/
 obj-$(CONFIG_PINCTRL_SAMSUNG)	+= samsung/
 obj-$(CONFIG_PINCTRL_SPEAR)	+= spear/
-- 
2.34.1

Re: [PATCH 6/8] pinctrl: qcom: allow true compile testing

[Konrad Dybcio]

On 1.06.2023 17:20, Krzysztof Kozlowski wrote:
> Makefile selected Qualcomm pinctrl drivers only for ARCH_QCOM, making
> any COMPILE_TEST options inside Kconfig ((ARCH_QCOM || COMPILE_TEST) or
> (OF || COMPILE_TEST)) not effective.  Always descent to the qcom
> subdirectory to fix this.  All individual drivers are selected in
> Makefile via dedicated CONFIG entries, thus this should not have
> functional impact except when compile testing.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Should analogous changes be made for all remaining
obj-$(CONFIG_PINCTRL_VENDOR) entries?

Konrad
>  drivers/pinctrl/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
> index e196c6e324ad..482b391b5deb 100644
> --- a/drivers/pinctrl/Makefile
> +++ b/drivers/pinctrl/Makefile
> @@ -66,7 +66,7 @@ obj-y				+= nomadik/
>  obj-y				+= nuvoton/
>  obj-y				+= nxp/
>  obj-$(CONFIG_PINCTRL_PXA)	+= pxa/
> -obj-$(CONFIG_ARCH_QCOM)		+= qcom/
> +obj-y				+= qcom/
>  obj-$(CONFIG_PINCTRL_RENESAS)	+= renesas/
>  obj-$(CONFIG_PINCTRL_SAMSUNG)	+= samsung/
>  obj-$(CONFIG_PINCTRL_SPEAR)	+= spear/

Re: [PATCH 6/8] pinctrl: qcom: allow true compile testing

[Krzysztof Kozlowski]

On 02/06/2023 11:08, Konrad Dybcio wrote:
> 
> 
> On 1.06.2023 17:20, Krzysztof Kozlowski wrote:
>> Makefile selected Qualcomm pinctrl drivers only for ARCH_QCOM, making
>> any COMPILE_TEST options inside Kconfig ((ARCH_QCOM || COMPILE_TEST) or
>> (OF || COMPILE_TEST)) not effective.  Always descent to the qcom
>> subdirectory to fix this.  All individual drivers are selected in
>> Makefile via dedicated CONFIG entries, thus this should not have
>> functional impact except when compile testing.
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> ---
> Should analogous changes be made for all remaining
> obj-$(CONFIG_PINCTRL_VENDOR) entries?

Only for ones depending on ARCH_XXX and that requires actual compile
testing which might point to missing dependencies etc.

Entries depending on selectable PINCTRL_VENDOR are already
compile-testable (see Samsung for example).

Best regards,
Krzysztof

Re: [PATCH 6/8] pinctrl: qcom: allow true compile testing

[Konrad Dybcio]

On 1.06.2023 17:20, Krzysztof Kozlowski wrote:
> Makefile selected Qualcomm pinctrl drivers only for ARCH_QCOM, making
> any COMPILE_TEST options inside Kconfig ((ARCH_QCOM || COMPILE_TEST) or
> (OF || COMPILE_TEST)) not effective.  Always descent to the qcom
> subdirectory to fix this.  All individual drivers are selected in
> Makefile via dedicated CONFIG entries, thus this should not have
> functional impact except when compile testing.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/pinctrl/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
> index e196c6e324ad..482b391b5deb 100644
> --- a/drivers/pinctrl/Makefile
> +++ b/drivers/pinctrl/Makefile
> @@ -66,7 +66,7 @@ obj-y				+= nomadik/
>  obj-y				+= nuvoton/
>  obj-y				+= nxp/
>  obj-$(CONFIG_PINCTRL_PXA)	+= pxa/
> -obj-$(CONFIG_ARCH_QCOM)		+= qcom/
> +obj-y				+= qcom/
>  obj-$(CONFIG_PINCTRL_RENESAS)	+= renesas/
>  obj-$(CONFIG_PINCTRL_SAMSUNG)	+= samsung/
>  obj-$(CONFIG_PINCTRL_SPEAR)	+= spear/

[PATCH 7/8] pinctrl: qcom: organize main SoC drivers in new Kconfig.msm

[Krzysztof Kozlowski]

In menuconfig, some entries depending on PINCTRL_MSM are indented and
expressed as dependening but some not, because of other Kconfig entries
in between,

Move all main Qualcomm SoC pin controller driver entries into new
Kconfig.msm file so they will be nicely ordered in Kconfig file (by
CONFIG_ name) and properly indented as PINCTRL_MSM dependency in
menuconfig.

Functionally this is the same, but since entire file is guarded with "if
PINCTRL_MSM" drop this dependency from individual entries.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/pinctrl/qcom/Kconfig     | 402 +------------------------------
 drivers/pinctrl/qcom/Kconfig.msm | 360 +++++++++++++++++++++++++++
 2 files changed, 361 insertions(+), 401 deletions(-)
 create mode 100644 drivers/pinctrl/qcom/Kconfig.msm

diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
index 18ac19f41873..f1c23a641fe1 100644
--- a/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@ -14,208 +14,7 @@ config PINCTRL_MSM
 	select IRQ_DOMAIN_HIERARCHY
 	select IRQ_FASTEOI_HIERARCHY_HANDLERS
 
-config PINCTRL_APQ8064
-	tristate "Qualcomm APQ8064 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm APQ8064 platform.
-
-config PINCTRL_APQ8084
-	tristate "Qualcomm APQ8084 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm APQ8084 platform.
-
-config PINCTRL_IPQ4019
-	tristate "Qualcomm IPQ4019 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm IPQ4019 platform.
-
-config PINCTRL_IPQ8064
-	tristate "Qualcomm IPQ8064 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm IPQ8064 platform.
-
-config PINCTRL_IPQ5332
-	tristate "Qualcomm Technologies Inc IPQ5332 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc IPQ5332 platform.
-
-config PINCTRL_IPQ8074
-	tristate "Qualcomm Technologies, Inc. IPQ8074 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
-	  the Qualcomm Technologies Inc. TLMM block found on the
-	  Qualcomm Technologies Inc. IPQ8074 platform. Select this for
-	  IPQ8074.
-
-config PINCTRL_IPQ6018
-	tristate "Qualcomm Technologies, Inc. IPQ6018 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
-	  the Qualcomm Technologies Inc. TLMM block found on the
-	  Qualcomm Technologies Inc. IPQ6018 platform. Select this for
-	  IPQ6018.
-
-config PINCTRL_IPQ9574
-	tristate "Qualcomm Technologies, Inc. IPQ9574 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
-          the Qualcomm Technologies Inc. TLMM block found on the
-          Qualcomm Technologies Inc. IPQ9574 platform. Select this for
-          IPQ9574.
-
-config PINCTRL_MSM8226
-	tristate "Qualcomm 8226 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc MSM8226 platform.
-
-config PINCTRL_MSM8660
-	tristate "Qualcomm 8660 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm 8660 platform.
-
-config PINCTRL_MSM8960
-	tristate "Qualcomm 8960 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm 8960 platform.
-
-config PINCTRL_MDM9607
-	tristate "Qualcomm 9607 pin controller driver"
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm 9607 platform.
-
-config PINCTRL_MDM9615
-	tristate "Qualcomm 9615 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm 9615 platform.
-
-config PINCTRL_MSM8X74
-	tristate "Qualcomm 8x74 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm 8974 platform.
-
-config PINCTRL_MSM8909
-	tristate "Qualcomm 8909 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found on the Qualcomm MSM8909 platform.
-
-config PINCTRL_MSM8916
-	tristate "Qualcomm 8916 pin controller driver"
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found on the Qualcomm 8916 platform.
-
-config PINCTRL_MSM8953
-	tristate "Qualcomm 8953 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found on the Qualcomm MSM8953 platform.
-	  The Qualcomm APQ8053, SDM450, SDM632 platforms are also
-	  supported by this driver.
-
-config PINCTRL_MSM8976
-	tristate "Qualcomm 8976 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found on the Qualcomm MSM8976 platform.
-	  The Qualcomm MSM8956, APQ8056, APQ8076 platforms are also
-	  supported by this driver.
-
-config PINCTRL_MSM8994
-	tristate "Qualcomm 8994 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm 8994 platform. The
-	  Qualcomm 8992 platform is also supported by this driver.
-
-config PINCTRL_MSM8996
-	tristate "Qualcomm MSM8996 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm MSM8996 platform.
-
-config PINCTRL_MSM8998
-	tristate "Qualcomm MSM8998 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm TLMM block found in the Qualcomm MSM8998 platform.
-
-config PINCTRL_QCM2290
-	tristate "Qualcomm QCM2290 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  TLMM block found in the Qualcomm QCM2290 platform.
-
-config PINCTRL_QCS404
-	tristate "Qualcomm QCS404 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  TLMM block found in the Qualcomm QCS404 platform.
-
-config PINCTRL_QDF2XXX
-	tristate "Qualcomm Technologies QDF2xxx pin controller driver"
-	depends on ACPI
-	depends on PINCTRL_MSM
-	help
-	  This is the GPIO driver for the TLMM block found on the
-	  Qualcomm Technologies QDF2xxx SOCs.
+source "drivers/pinctrl/qcom/Kconfig.msm"
 
 config PINCTRL_QCOM_SPMI_PMIC
 	tristate "Qualcomm SPMI PMIC pin controller driver"
@@ -248,41 +47,6 @@ config PINCTRL_QCOM_SSBI_PMIC
 	 which are using SSBI for communication with SoC. Example PMIC's
 	 devices are pm8058 and pm8921.
 
-config PINCTRL_QDU1000
-	tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf, and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc QDU1000 and QRU1000 platforms.
-
-config PINCTRL_SA8775P
-	tristate "Qualcomm Technologies Inc SA8775P pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux and pinconf driver for the Qualcomm
-	  TLMM block found on the Qualcomm SA8775P platforms.
-
-config PINCTRL_SC7180
-	tristate "Qualcomm Technologies Inc SC7180 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc SC7180 platform.
-
-config PINCTRL_SC7280
-	tristate "Qualcomm Technologies Inc SC7280 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc SC7280 platform.
-
 config PINCTRL_SC7280_LPASS_LPI
 	tristate "Qualcomm Technologies Inc SC7280 LPASS LPI pin controller driver"
 	depends on ARM64 || COMPILE_TEST
@@ -292,143 +56,6 @@ config PINCTRL_SC7280_LPASS_LPI
 	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI
 	  (Low Power Island) found on the Qualcomm Technologies Inc SC7280 platform.
 
-config PINCTRL_SC8180X
-	tristate "Qualcomm Technologies Inc SC8180x pin controller driver"
-	depends on (OF || ACPI)
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc SC8180x platform.
-
-config PINCTRL_SC8280XP
-	tristate "Qualcomm Technologies Inc SC8280xp pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc SC8280xp platform.
-
-config PINCTRL_SDM660
-	tristate "Qualcomm Technologies Inc SDM660 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	 Technologies Inc SDM660 platform.
-
-config PINCTRL_SDM670
-	tristate "Qualcomm Technologies Inc SDM670 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	 Technologies Inc SDM670 platform.
-
-config PINCTRL_SDM845
-	tristate "Qualcomm Technologies Inc SDM845 pin controller driver"
-	depends on (OF || ACPI)
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	 Technologies Inc SDM845 platform.
-
-config PINCTRL_SDX55
-	tristate "Qualcomm Technologies Inc SDX55 pin controller driver"
-	depends on ARM || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	 Technologies Inc SDX55 platform.
-
-config PINCTRL_SDX65
-        tristate "Qualcomm Technologies Inc SDX65 pin controller driver"
-        depends on ARM || COMPILE_TEST
-        depends on PINCTRL_MSM
-        help
-         This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-         Qualcomm Technologies Inc TLMM block found on the Qualcomm
-         Technologies Inc SDX65 platform.
-
-config PINCTRL_SDX75
-        tristate "Qualcomm Technologies Inc SDX75 pin controller driver"
-        depends on ARM64 || COMPILE_TEST
-        depends on PINCTRL_MSM
-        help
-         This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-         Qualcomm Technologies Inc TLMM block found on the Qualcomm
-         Technologies Inc SDX75 platform.
-
-config PINCTRL_SM6115
-	tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	 Technologies Inc SM6115 and SM4250 platforms.
-
-config PINCTRL_SM6125
-	tristate "Qualcomm Technologies Inc SM6125 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	 Technologies Inc SM6125 platform.
-
-config PINCTRL_SM6350
-	tristate "Qualcomm Technologies Inc SM6350 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	 Technologies Inc SM6350 platform.
-
-config PINCTRL_SM6375
-	tristate "Qualcomm Technologies Inc SM6375 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	 Technologies Inc SM6375 platform.
-
-config PINCTRL_SM7150
-	tristate "Qualcomm Technologies Inc SM7150 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	 Technologies Inc SM7150 platform.
-
-config PINCTRL_SM8150
-	tristate "Qualcomm Technologies Inc SM8150 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	 Technologies Inc SM8150 platform.
-
-config PINCTRL_SM8250
-	tristate "Qualcomm Technologies Inc SM8250 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc SM8250 platform.
-
 config PINCTRL_SM8250_LPASS_LPI
 	tristate "Qualcomm Technologies Inc SM8250 LPASS LPI pin controller driver"
 	depends on ARM64 || COMPILE_TEST
@@ -438,24 +65,6 @@ config PINCTRL_SM8250_LPASS_LPI
 	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI
 	  (Low Power Island) found on the Qualcomm Technologies Inc SM8250 platform.
 
-config PINCTRL_SM8350
-	tristate "Qualcomm Technologies Inc SM8350 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc SM8350 platform.
-
-config PINCTRL_SM8450
-	tristate "Qualcomm Technologies Inc SM8450 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc SM8450 platform.
-
 config PINCTRL_SM8450_LPASS_LPI
 	tristate "Qualcomm Technologies Inc SM8450 LPASS LPI pin controller driver"
 	depends on ARM64 || COMPILE_TEST
@@ -474,15 +83,6 @@ config PINCTRL_SC8280XP_LPASS_LPI
 	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI
 	  (Low Power Island) found on the Qualcomm Technologies Inc SC8280XP platform.
 
-config PINCTRL_SM8550
-	tristate "Qualcomm Technologies Inc SM8550 pin controller driver"
-	depends on ARM64 || COMPILE_TEST
-	depends on PINCTRL_MSM
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
-	  Technologies Inc SM8550 platform.
-
 config PINCTRL_SM8550_LPASS_LPI
 	tristate "Qualcomm Technologies Inc SM8550 LPASS LPI pin controller driver"
 	depends on ARM64 || COMPILE_TEST
diff --git a/drivers/pinctrl/qcom/Kconfig.msm b/drivers/pinctrl/qcom/Kconfig.msm
new file mode 100644
index 000000000000..e03042e80a0d
--- /dev/null
+++ b/drivers/pinctrl/qcom/Kconfig.msm
@@ -0,0 +1,360 @@
+# SPDX-License-Identifier: GPL-2.0-only
+if PINCTRL_MSM
+
+config PINCTRL_APQ8064
+	tristate "Qualcomm APQ8064 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm APQ8064 platform.
+
+config PINCTRL_APQ8084
+	tristate "Qualcomm APQ8084 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm APQ8084 platform.
+
+config PINCTRL_IPQ4019
+	tristate "Qualcomm IPQ4019 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm IPQ4019 platform.
+
+config PINCTRL_IPQ8064
+	tristate "Qualcomm IPQ8064 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm IPQ8064 platform.
+
+config PINCTRL_IPQ5332
+	tristate "Qualcomm Technologies Inc IPQ5332 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc IPQ5332 platform.
+
+config PINCTRL_IPQ8074
+	tristate "Qualcomm Technologies, Inc. IPQ8074 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
+	  the Qualcomm Technologies Inc. TLMM block found on the
+	  Qualcomm Technologies Inc. IPQ8074 platform. Select this for
+	  IPQ8074.
+
+config PINCTRL_IPQ6018
+	tristate "Qualcomm Technologies, Inc. IPQ6018 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
+	  the Qualcomm Technologies Inc. TLMM block found on the
+	  Qualcomm Technologies Inc. IPQ6018 platform. Select this for
+	  IPQ6018.
+
+config PINCTRL_IPQ9574
+	tristate "Qualcomm Technologies, Inc. IPQ9574 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
+          the Qualcomm Technologies Inc. TLMM block found on the
+          Qualcomm Technologies Inc. IPQ9574 platform. Select this for
+          IPQ9574.
+
+config PINCTRL_MSM8226
+	tristate "Qualcomm 8226 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc MSM8226 platform.
+
+config PINCTRL_MSM8660
+	tristate "Qualcomm 8660 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm 8660 platform.
+
+config PINCTRL_MSM8960
+	tristate "Qualcomm 8960 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm 8960 platform.
+
+config PINCTRL_MDM9607
+	tristate "Qualcomm 9607 pin controller driver"
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm 9607 platform.
+
+config PINCTRL_MDM9615
+	tristate "Qualcomm 9615 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm 9615 platform.
+
+config PINCTRL_MSM8X74
+	tristate "Qualcomm 8x74 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm 8974 platform.
+
+config PINCTRL_MSM8909
+	tristate "Qualcomm 8909 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found on the Qualcomm MSM8909 platform.
+
+config PINCTRL_MSM8916
+	tristate "Qualcomm 8916 pin controller driver"
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found on the Qualcomm 8916 platform.
+
+config PINCTRL_MSM8953
+	tristate "Qualcomm 8953 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found on the Qualcomm MSM8953 platform.
+	  The Qualcomm APQ8053, SDM450, SDM632 platforms are also
+	  supported by this driver.
+
+config PINCTRL_MSM8976
+	tristate "Qualcomm 8976 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found on the Qualcomm MSM8976 platform.
+	  The Qualcomm MSM8956, APQ8056, APQ8076 platforms are also
+	  supported by this driver.
+
+config PINCTRL_MSM8994
+	tristate "Qualcomm 8994 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm 8994 platform. The
+	  Qualcomm 8992 platform is also supported by this driver.
+
+config PINCTRL_MSM8996
+	tristate "Qualcomm MSM8996 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm MSM8996 platform.
+
+config PINCTRL_MSM8998
+	tristate "Qualcomm MSM8998 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm TLMM block found in the Qualcomm MSM8998 platform.
+
+config PINCTRL_QCM2290
+	tristate "Qualcomm QCM2290 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  TLMM block found in the Qualcomm QCM2290 platform.
+
+config PINCTRL_QCS404
+	tristate "Qualcomm QCS404 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  TLMM block found in the Qualcomm QCS404 platform.
+
+config PINCTRL_QDF2XXX
+	tristate "Qualcomm Technologies QDF2xxx pin controller driver"
+	depends on ACPI
+	help
+	  This is the GPIO driver for the TLMM block found on the
+	  Qualcomm Technologies QDF2xxx SOCs.
+
+config PINCTRL_QDU1000
+	tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf, and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc QDU1000 and QRU1000 platforms.
+
+config PINCTRL_SA8775P
+	tristate "Qualcomm Technologies Inc SA8775P pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux and pinconf driver for the Qualcomm
+	  TLMM block found on the Qualcomm SA8775P platforms.
+
+config PINCTRL_SC7180
+	tristate "Qualcomm Technologies Inc SC7180 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc SC7180 platform.
+
+config PINCTRL_SC7280
+	tristate "Qualcomm Technologies Inc SC7280 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc SC7280 platform.
+
+config PINCTRL_SC8180X
+	tristate "Qualcomm Technologies Inc SC8180x pin controller driver"
+	depends on (OF || ACPI)
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc SC8180x platform.
+
+config PINCTRL_SC8280XP
+	tristate "Qualcomm Technologies Inc SC8280xp pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc SC8280xp platform.
+
+config PINCTRL_SDM660
+	tristate "Qualcomm Technologies Inc SDM660 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	 Technologies Inc SDM660 platform.
+
+config PINCTRL_SDM670
+	tristate "Qualcomm Technologies Inc SDM670 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	 Technologies Inc SDM670 platform.
+
+config PINCTRL_SDM845
+	tristate "Qualcomm Technologies Inc SDM845 pin controller driver"
+	depends on (OF || ACPI)
+	depends on ARM64 || COMPILE_TEST
+	help
+	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	 Technologies Inc SDM845 platform.
+
+config PINCTRL_SDX55
+	tristate "Qualcomm Technologies Inc SDX55 pin controller driver"
+	depends on ARM || COMPILE_TEST
+	help
+	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	 Technologies Inc SDX55 platform.
+
+config PINCTRL_SDX65
+        tristate "Qualcomm Technologies Inc SDX65 pin controller driver"
+        depends on ARM || COMPILE_TEST
+        help
+         This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+         Qualcomm Technologies Inc TLMM block found on the Qualcomm
+         Technologies Inc SDX65 platform.
+
+config PINCTRL_SDX75
+        tristate "Qualcomm Technologies Inc SDX75 pin controller driver"
+        depends on ARM64 || COMPILE_TEST
+        help
+         This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+         Qualcomm Technologies Inc TLMM block found on the Qualcomm
+         Technologies Inc SDX75 platform.
+
+config PINCTRL_SM6115
+	tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	 Technologies Inc SM6115 and SM4250 platforms.
+
+config PINCTRL_SM6125
+	tristate "Qualcomm Technologies Inc SM6125 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	 Technologies Inc SM6125 platform.
+
+config PINCTRL_SM6350
+	tristate "Qualcomm Technologies Inc SM6350 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	 Technologies Inc SM6350 platform.
+
+config PINCTRL_SM6375
+	tristate "Qualcomm Technologies Inc SM6375 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	 Technologies Inc SM6375 platform.
+
+config PINCTRL_SM7150
+	tristate "Qualcomm Technologies Inc SM7150 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	 Technologies Inc SM7150 platform.
+
+config PINCTRL_SM8150
+	tristate "Qualcomm Technologies Inc SM8150 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	 Technologies Inc SM8150 platform.
+
+config PINCTRL_SM8250
+	tristate "Qualcomm Technologies Inc SM8250 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc SM8250 platform.
+
+config PINCTRL_SM8350
+	tristate "Qualcomm Technologies Inc SM8350 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc SM8350 platform.
+
+config PINCTRL_SM8450
+	tristate "Qualcomm Technologies Inc SM8450 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc SM8450 platform.
+
+config PINCTRL_SM8550
+	tristate "Qualcomm Technologies Inc SM8550 pin controller driver"
+	depends on ARM64 || COMPILE_TEST
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
+	  Technologies Inc SM8550 platform.
+
+endif
-- 
2.34.1

Re: [PATCH 7/8] pinctrl: qcom: organize main SoC drivers in new Kconfig.msm

[andy.shevchenko]

Thu, Jun 01, 2023 at 05:20:25PM +0200, Krzysztof Kozlowski kirjoitti:
> In menuconfig, some entries depending on PINCTRL_MSM are indented and
> expressed as dependening but some not, because of other Kconfig entries
> in between,
> 
> Move all main Qualcomm SoC pin controller driver entries into new
> Kconfig.msm file so they will be nicely ordered in Kconfig file (by
> CONFIG_ name) and properly indented as PINCTRL_MSM dependency in
> menuconfig.
> 
> Functionally this is the same, but since entire file is guarded with "if
> PINCTRL_MSM" drop this dependency from individual entries.

Cool idea, maybe I need to do the same for Intel case!

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 7/8] pinctrl: qcom: organize main SoC drivers in new Kconfig.msm

[Linus Walleij]

On Thu, Jun 1, 2023 at 5:21 PM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:

> In menuconfig, some entries depending on PINCTRL_MSM are indented and
> expressed as dependening but some not, because of other Kconfig entries
> in between,
>
> Move all main Qualcomm SoC pin controller driver entries into new
> Kconfig.msm file so they will be nicely ordered in Kconfig file (by
> CONFIG_ name) and properly indented as PINCTRL_MSM dependency in
> menuconfig.
>
> Functionally this is the same, but since entire file is guarded with "if
> PINCTRL_MSM" drop this dependency from individual entries.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

This makes things look much better.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 7/8] pinctrl: qcom: organize main SoC drivers in new Kconfig.msm

[Konrad Dybcio]

On 1.06.2023 17:20, Krzysztof Kozlowski wrote:
> In menuconfig, some entries depending on PINCTRL_MSM are indented and
> expressed as dependening but some not, because of other Kconfig entries
> in between,
> 
> Move all main Qualcomm SoC pin controller driver entries into new
> Kconfig.msm file so they will be nicely ordered in Kconfig file (by
> CONFIG_ name) and properly indented as PINCTRL_MSM dependency in
> menuconfig.
> 
> Functionally this is the same, but since entire file is guarded with "if
> PINCTRL_MSM" drop this dependency from individual entries.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Wow.. nice!

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/pinctrl/qcom/Kconfig     | 402 +------------------------------
>  drivers/pinctrl/qcom/Kconfig.msm | 360 +++++++++++++++++++++++++++
>  2 files changed, 361 insertions(+), 401 deletions(-)
>  create mode 100644 drivers/pinctrl/qcom/Kconfig.msm
> 
> diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
> index 18ac19f41873..f1c23a641fe1 100644
> --- a/drivers/pinctrl/qcom/Kconfig
> +++ b/drivers/pinctrl/qcom/Kconfig
> @@ -14,208 +14,7 @@ config PINCTRL_MSM
>  	select IRQ_DOMAIN_HIERARCHY
>  	select IRQ_FASTEOI_HIERARCHY_HANDLERS
>  
> -config PINCTRL_APQ8064
> -	tristate "Qualcomm APQ8064 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm APQ8064 platform.
> -
> -config PINCTRL_APQ8084
> -	tristate "Qualcomm APQ8084 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm APQ8084 platform.
> -
> -config PINCTRL_IPQ4019
> -	tristate "Qualcomm IPQ4019 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm IPQ4019 platform.
> -
> -config PINCTRL_IPQ8064
> -	tristate "Qualcomm IPQ8064 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm IPQ8064 platform.
> -
> -config PINCTRL_IPQ5332
> -	tristate "Qualcomm Technologies Inc IPQ5332 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc IPQ5332 platform.
> -
> -config PINCTRL_IPQ8074
> -	tristate "Qualcomm Technologies, Inc. IPQ8074 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
> -	  the Qualcomm Technologies Inc. TLMM block found on the
> -	  Qualcomm Technologies Inc. IPQ8074 platform. Select this for
> -	  IPQ8074.
> -
> -config PINCTRL_IPQ6018
> -	tristate "Qualcomm Technologies, Inc. IPQ6018 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
> -	  the Qualcomm Technologies Inc. TLMM block found on the
> -	  Qualcomm Technologies Inc. IPQ6018 platform. Select this for
> -	  IPQ6018.
> -
> -config PINCTRL_IPQ9574
> -	tristate "Qualcomm Technologies, Inc. IPQ9574 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
> -          the Qualcomm Technologies Inc. TLMM block found on the
> -          Qualcomm Technologies Inc. IPQ9574 platform. Select this for
> -          IPQ9574.
> -
> -config PINCTRL_MSM8226
> -	tristate "Qualcomm 8226 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc MSM8226 platform.
> -
> -config PINCTRL_MSM8660
> -	tristate "Qualcomm 8660 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm 8660 platform.
> -
> -config PINCTRL_MSM8960
> -	tristate "Qualcomm 8960 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm 8960 platform.
> -
> -config PINCTRL_MDM9607
> -	tristate "Qualcomm 9607 pin controller driver"
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm 9607 platform.
> -
> -config PINCTRL_MDM9615
> -	tristate "Qualcomm 9615 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm 9615 platform.
> -
> -config PINCTRL_MSM8X74
> -	tristate "Qualcomm 8x74 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm 8974 platform.
> -
> -config PINCTRL_MSM8909
> -	tristate "Qualcomm 8909 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found on the Qualcomm MSM8909 platform.
> -
> -config PINCTRL_MSM8916
> -	tristate "Qualcomm 8916 pin controller driver"
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found on the Qualcomm 8916 platform.
> -
> -config PINCTRL_MSM8953
> -	tristate "Qualcomm 8953 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found on the Qualcomm MSM8953 platform.
> -	  The Qualcomm APQ8053, SDM450, SDM632 platforms are also
> -	  supported by this driver.
> -
> -config PINCTRL_MSM8976
> -	tristate "Qualcomm 8976 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found on the Qualcomm MSM8976 platform.
> -	  The Qualcomm MSM8956, APQ8056, APQ8076 platforms are also
> -	  supported by this driver.
> -
> -config PINCTRL_MSM8994
> -	tristate "Qualcomm 8994 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm 8994 platform. The
> -	  Qualcomm 8992 platform is also supported by this driver.
> -
> -config PINCTRL_MSM8996
> -	tristate "Qualcomm MSM8996 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm MSM8996 platform.
> -
> -config PINCTRL_MSM8998
> -	tristate "Qualcomm MSM8998 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm TLMM block found in the Qualcomm MSM8998 platform.
> -
> -config PINCTRL_QCM2290
> -	tristate "Qualcomm QCM2290 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  TLMM block found in the Qualcomm QCM2290 platform.
> -
> -config PINCTRL_QCS404
> -	tristate "Qualcomm QCS404 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  TLMM block found in the Qualcomm QCS404 platform.
> -
> -config PINCTRL_QDF2XXX
> -	tristate "Qualcomm Technologies QDF2xxx pin controller driver"
> -	depends on ACPI
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the GPIO driver for the TLMM block found on the
> -	  Qualcomm Technologies QDF2xxx SOCs.
> +source "drivers/pinctrl/qcom/Kconfig.msm"
>  
>  config PINCTRL_QCOM_SPMI_PMIC
>  	tristate "Qualcomm SPMI PMIC pin controller driver"
> @@ -248,41 +47,6 @@ config PINCTRL_QCOM_SSBI_PMIC
>  	 which are using SSBI for communication with SoC. Example PMIC's
>  	 devices are pm8058 and pm8921.
>  
> -config PINCTRL_QDU1000
> -	tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf, and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc QDU1000 and QRU1000 platforms.
> -
> -config PINCTRL_SA8775P
> -	tristate "Qualcomm Technologies Inc SA8775P pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux and pinconf driver for the Qualcomm
> -	  TLMM block found on the Qualcomm SA8775P platforms.
> -
> -config PINCTRL_SC7180
> -	tristate "Qualcomm Technologies Inc SC7180 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc SC7180 platform.
> -
> -config PINCTRL_SC7280
> -	tristate "Qualcomm Technologies Inc SC7280 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc SC7280 platform.
> -
>  config PINCTRL_SC7280_LPASS_LPI
>  	tristate "Qualcomm Technologies Inc SC7280 LPASS LPI pin controller driver"
>  	depends on ARM64 || COMPILE_TEST
> @@ -292,143 +56,6 @@ config PINCTRL_SC7280_LPASS_LPI
>  	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI
>  	  (Low Power Island) found on the Qualcomm Technologies Inc SC7280 platform.
>  
> -config PINCTRL_SC8180X
> -	tristate "Qualcomm Technologies Inc SC8180x pin controller driver"
> -	depends on (OF || ACPI)
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc SC8180x platform.
> -
> -config PINCTRL_SC8280XP
> -	tristate "Qualcomm Technologies Inc SC8280xp pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc SC8280xp platform.
> -
> -config PINCTRL_SDM660
> -	tristate "Qualcomm Technologies Inc SDM660 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	 Technologies Inc SDM660 platform.
> -
> -config PINCTRL_SDM670
> -	tristate "Qualcomm Technologies Inc SDM670 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	 Technologies Inc SDM670 platform.
> -
> -config PINCTRL_SDM845
> -	tristate "Qualcomm Technologies Inc SDM845 pin controller driver"
> -	depends on (OF || ACPI)
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	 Technologies Inc SDM845 platform.
> -
> -config PINCTRL_SDX55
> -	tristate "Qualcomm Technologies Inc SDX55 pin controller driver"
> -	depends on ARM || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	 Technologies Inc SDX55 platform.
> -
> -config PINCTRL_SDX65
> -        tristate "Qualcomm Technologies Inc SDX65 pin controller driver"
> -        depends on ARM || COMPILE_TEST
> -        depends on PINCTRL_MSM
> -        help
> -         This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -         Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -         Technologies Inc SDX65 platform.
> -
> -config PINCTRL_SDX75
> -        tristate "Qualcomm Technologies Inc SDX75 pin controller driver"
> -        depends on ARM64 || COMPILE_TEST
> -        depends on PINCTRL_MSM
> -        help
> -         This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -         Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -         Technologies Inc SDX75 platform.
> -
> -config PINCTRL_SM6115
> -	tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	 Technologies Inc SM6115 and SM4250 platforms.
> -
> -config PINCTRL_SM6125
> -	tristate "Qualcomm Technologies Inc SM6125 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	 Technologies Inc SM6125 platform.
> -
> -config PINCTRL_SM6350
> -	tristate "Qualcomm Technologies Inc SM6350 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	 Technologies Inc SM6350 platform.
> -
> -config PINCTRL_SM6375
> -	tristate "Qualcomm Technologies Inc SM6375 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	 Technologies Inc SM6375 platform.
> -
> -config PINCTRL_SM7150
> -	tristate "Qualcomm Technologies Inc SM7150 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	 Technologies Inc SM7150 platform.
> -
> -config PINCTRL_SM8150
> -	tristate "Qualcomm Technologies Inc SM8150 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	 Technologies Inc SM8150 platform.
> -
> -config PINCTRL_SM8250
> -	tristate "Qualcomm Technologies Inc SM8250 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc SM8250 platform.
> -
>  config PINCTRL_SM8250_LPASS_LPI
>  	tristate "Qualcomm Technologies Inc SM8250 LPASS LPI pin controller driver"
>  	depends on ARM64 || COMPILE_TEST
> @@ -438,24 +65,6 @@ config PINCTRL_SM8250_LPASS_LPI
>  	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI
>  	  (Low Power Island) found on the Qualcomm Technologies Inc SM8250 platform.
>  
> -config PINCTRL_SM8350
> -	tristate "Qualcomm Technologies Inc SM8350 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc SM8350 platform.
> -
> -config PINCTRL_SM8450
> -	tristate "Qualcomm Technologies Inc SM8450 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc SM8450 platform.
> -
>  config PINCTRL_SM8450_LPASS_LPI
>  	tristate "Qualcomm Technologies Inc SM8450 LPASS LPI pin controller driver"
>  	depends on ARM64 || COMPILE_TEST
> @@ -474,15 +83,6 @@ config PINCTRL_SC8280XP_LPASS_LPI
>  	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI
>  	  (Low Power Island) found on the Qualcomm Technologies Inc SC8280XP platform.
>  
> -config PINCTRL_SM8550
> -	tristate "Qualcomm Technologies Inc SM8550 pin controller driver"
> -	depends on ARM64 || COMPILE_TEST
> -	depends on PINCTRL_MSM
> -	help
> -	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> -	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> -	  Technologies Inc SM8550 platform.
> -
>  config PINCTRL_SM8550_LPASS_LPI
>  	tristate "Qualcomm Technologies Inc SM8550 LPASS LPI pin controller driver"
>  	depends on ARM64 || COMPILE_TEST
> diff --git a/drivers/pinctrl/qcom/Kconfig.msm b/drivers/pinctrl/qcom/Kconfig.msm
> new file mode 100644
> index 000000000000..e03042e80a0d
> --- /dev/null
> +++ b/drivers/pinctrl/qcom/Kconfig.msm
> @@ -0,0 +1,360 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +if PINCTRL_MSM
> +
> +config PINCTRL_APQ8064
> +	tristate "Qualcomm APQ8064 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm APQ8064 platform.
> +
> +config PINCTRL_APQ8084
> +	tristate "Qualcomm APQ8084 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm APQ8084 platform.
> +
> +config PINCTRL_IPQ4019
> +	tristate "Qualcomm IPQ4019 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm IPQ4019 platform.
> +
> +config PINCTRL_IPQ8064
> +	tristate "Qualcomm IPQ8064 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm IPQ8064 platform.
> +
> +config PINCTRL_IPQ5332
> +	tristate "Qualcomm Technologies Inc IPQ5332 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc IPQ5332 platform.
> +
> +config PINCTRL_IPQ8074
> +	tristate "Qualcomm Technologies, Inc. IPQ8074 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
> +	  the Qualcomm Technologies Inc. TLMM block found on the
> +	  Qualcomm Technologies Inc. IPQ8074 platform. Select this for
> +	  IPQ8074.
> +
> +config PINCTRL_IPQ6018
> +	tristate "Qualcomm Technologies, Inc. IPQ6018 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
> +	  the Qualcomm Technologies Inc. TLMM block found on the
> +	  Qualcomm Technologies Inc. IPQ6018 platform. Select this for
> +	  IPQ6018.
> +
> +config PINCTRL_IPQ9574
> +	tristate "Qualcomm Technologies, Inc. IPQ9574 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for
> +          the Qualcomm Technologies Inc. TLMM block found on the
> +          Qualcomm Technologies Inc. IPQ9574 platform. Select this for
> +          IPQ9574.
> +
> +config PINCTRL_MSM8226
> +	tristate "Qualcomm 8226 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc MSM8226 platform.
> +
> +config PINCTRL_MSM8660
> +	tristate "Qualcomm 8660 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm 8660 platform.
> +
> +config PINCTRL_MSM8960
> +	tristate "Qualcomm 8960 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm 8960 platform.
> +
> +config PINCTRL_MDM9607
> +	tristate "Qualcomm 9607 pin controller driver"
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm 9607 platform.
> +
> +config PINCTRL_MDM9615
> +	tristate "Qualcomm 9615 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm 9615 platform.
> +
> +config PINCTRL_MSM8X74
> +	tristate "Qualcomm 8x74 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm 8974 platform.
> +
> +config PINCTRL_MSM8909
> +	tristate "Qualcomm 8909 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found on the Qualcomm MSM8909 platform.
> +
> +config PINCTRL_MSM8916
> +	tristate "Qualcomm 8916 pin controller driver"
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found on the Qualcomm 8916 platform.
> +
> +config PINCTRL_MSM8953
> +	tristate "Qualcomm 8953 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found on the Qualcomm MSM8953 platform.
> +	  The Qualcomm APQ8053, SDM450, SDM632 platforms are also
> +	  supported by this driver.
> +
> +config PINCTRL_MSM8976
> +	tristate "Qualcomm 8976 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found on the Qualcomm MSM8976 platform.
> +	  The Qualcomm MSM8956, APQ8056, APQ8076 platforms are also
> +	  supported by this driver.
> +
> +config PINCTRL_MSM8994
> +	tristate "Qualcomm 8994 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm 8994 platform. The
> +	  Qualcomm 8992 platform is also supported by this driver.
> +
> +config PINCTRL_MSM8996
> +	tristate "Qualcomm MSM8996 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm MSM8996 platform.
> +
> +config PINCTRL_MSM8998
> +	tristate "Qualcomm MSM8998 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm TLMM block found in the Qualcomm MSM8998 platform.
> +
> +config PINCTRL_QCM2290
> +	tristate "Qualcomm QCM2290 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  TLMM block found in the Qualcomm QCM2290 platform.
> +
> +config PINCTRL_QCS404
> +	tristate "Qualcomm QCS404 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  TLMM block found in the Qualcomm QCS404 platform.
> +
> +config PINCTRL_QDF2XXX
> +	tristate "Qualcomm Technologies QDF2xxx pin controller driver"
> +	depends on ACPI
> +	help
> +	  This is the GPIO driver for the TLMM block found on the
> +	  Qualcomm Technologies QDF2xxx SOCs.
> +
> +config PINCTRL_QDU1000
> +	tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf, and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc QDU1000 and QRU1000 platforms.
> +
> +config PINCTRL_SA8775P
> +	tristate "Qualcomm Technologies Inc SA8775P pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux and pinconf driver for the Qualcomm
> +	  TLMM block found on the Qualcomm SA8775P platforms.
> +
> +config PINCTRL_SC7180
> +	tristate "Qualcomm Technologies Inc SC7180 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc SC7180 platform.
> +
> +config PINCTRL_SC7280
> +	tristate "Qualcomm Technologies Inc SC7280 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc SC7280 platform.
> +
> +config PINCTRL_SC8180X
> +	tristate "Qualcomm Technologies Inc SC8180x pin controller driver"
> +	depends on (OF || ACPI)
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc SC8180x platform.
> +
> +config PINCTRL_SC8280XP
> +	tristate "Qualcomm Technologies Inc SC8280xp pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc SC8280xp platform.
> +
> +config PINCTRL_SDM660
> +	tristate "Qualcomm Technologies Inc SDM660 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	 Technologies Inc SDM660 platform.
> +
> +config PINCTRL_SDM670
> +	tristate "Qualcomm Technologies Inc SDM670 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	 Technologies Inc SDM670 platform.
> +
> +config PINCTRL_SDM845
> +	tristate "Qualcomm Technologies Inc SDM845 pin controller driver"
> +	depends on (OF || ACPI)
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	 Technologies Inc SDM845 platform.
> +
> +config PINCTRL_SDX55
> +	tristate "Qualcomm Technologies Inc SDX55 pin controller driver"
> +	depends on ARM || COMPILE_TEST
> +	help
> +	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	 Technologies Inc SDX55 platform.
> +
> +config PINCTRL_SDX65
> +        tristate "Qualcomm Technologies Inc SDX65 pin controller driver"
> +        depends on ARM || COMPILE_TEST
> +        help
> +         This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +         Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +         Technologies Inc SDX65 platform.
> +
> +config PINCTRL_SDX75
> +        tristate "Qualcomm Technologies Inc SDX75 pin controller driver"
> +        depends on ARM64 || COMPILE_TEST
> +        help
> +         This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +         Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +         Technologies Inc SDX75 platform.
> +
> +config PINCTRL_SM6115
> +	tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	 Technologies Inc SM6115 and SM4250 platforms.
> +
> +config PINCTRL_SM6125
> +	tristate "Qualcomm Technologies Inc SM6125 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	 Technologies Inc SM6125 platform.
> +
> +config PINCTRL_SM6350
> +	tristate "Qualcomm Technologies Inc SM6350 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	 Technologies Inc SM6350 platform.
> +
> +config PINCTRL_SM6375
> +	tristate "Qualcomm Technologies Inc SM6375 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	 Technologies Inc SM6375 platform.
> +
> +config PINCTRL_SM7150
> +	tristate "Qualcomm Technologies Inc SM7150 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	 Technologies Inc SM7150 platform.
> +
> +config PINCTRL_SM8150
> +	tristate "Qualcomm Technologies Inc SM8150 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	 This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	 Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	 Technologies Inc SM8150 platform.
> +
> +config PINCTRL_SM8250
> +	tristate "Qualcomm Technologies Inc SM8250 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc SM8250 platform.
> +
> +config PINCTRL_SM8350
> +	tristate "Qualcomm Technologies Inc SM8350 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc SM8350 platform.
> +
> +config PINCTRL_SM8450
> +	tristate "Qualcomm Technologies Inc SM8450 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc SM8450 platform.
> +
> +config PINCTRL_SM8550
> +	tristate "Qualcomm Technologies Inc SM8550 pin controller driver"
> +	depends on ARM64 || COMPILE_TEST
> +	help
> +	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
> +	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
> +	  Technologies Inc SM8550 platform.
> +
> +endif

[PATCH 8/8] pinctrl: qcom: organize audio drivers in menuconfig

[Krzysztof Kozlowski]

The audio pin controller drivers depend on PINCTRL_LPASS_LPI, but since
PINCTRL_LPASS_LPI is not the first entry, they are not displayed in
menuconfig as dependent of PINCTRL_LPASS_LPI.  Re-order the entries to
fix this.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/pinctrl/qcom/Kconfig | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
index f1c23a641fe1..634c75336983 100644
--- a/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@ -47,6 +47,18 @@ config PINCTRL_QCOM_SSBI_PMIC
 	 which are using SSBI for communication with SoC. Example PMIC's
 	 devices are pm8058 and pm8921.
 
+config PINCTRL_LPASS_LPI
+	tristate "Qualcomm Technologies Inc LPASS LPI pin controller driver"
+	select PINMUX
+	select PINCONF
+	select GENERIC_PINCONF
+	select GENERIC_PINCTRL_GROUPS
+	depends on GPIOLIB
+	help
+	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
+	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI
+	  (Low Power Island) found on the Qualcomm Technologies Inc SoCs.
+
 config PINCTRL_SC7280_LPASS_LPI
 	tristate "Qualcomm Technologies Inc SC7280 LPASS LPI pin controller driver"
 	depends on ARM64 || COMPILE_TEST
@@ -93,16 +105,4 @@ config PINCTRL_SM8550_LPASS_LPI
 	  (Low Power Island) found on the Qualcomm Technologies Inc SM8550
 	  platform.
 
-config PINCTRL_LPASS_LPI
-	tristate "Qualcomm Technologies Inc LPASS LPI pin controller driver"
-	select PINMUX
-	select PINCONF
-	select GENERIC_PINCONF
-	select GENERIC_PINCTRL_GROUPS
-	depends on GPIOLIB
-	help
-	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the
-	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI
-	  (Low Power Island) found on the Qualcomm Technologies Inc SoCs.
-
 endif
-- 
2.34.1

Re: [PATCH 1/8] pinctrl: qcom: qdf2xxx: drop ACPI_PTR

[andy.shevchenko]

Thu, Jun 01, 2023 at 05:20:19PM +0200, Krzysztof Kozlowski kirjoitti:
> Driver can bind only via ACPI matching and acpi_device_id is there
> unconditionally, so drop useless ACPI_PTR() macro.

With this acpi.h becomes unused and has to be replaced with (AFAICT)
property.h
mod_devicetable.h
(maybe others, but I haven't checked deeply)

With that,
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c b/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
> index b0f1b3dc6831..b5808fcfb13c 100644
> --- a/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
> +++ b/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
> @@ -142,7 +142,7 @@ MODULE_DEVICE_TABLE(acpi, qdf2xxx_acpi_ids);
>  static struct platform_driver qdf2xxx_pinctrl_driver = {
>  	.driver = {
>  		.name = "qdf2xxx-pinctrl",
> -		.acpi_match_table = ACPI_PTR(qdf2xxx_acpi_ids),
> +		.acpi_match_table = qdf2xxx_acpi_ids,
>  	},
>  	.probe = qdf2xxx_pinctrl_probe,
>  	.remove = msm_pinctrl_remove,
> -- 
> 2.34.1
> 

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 1/8] pinctrl: qcom: qdf2xxx: drop ACPI_PTR

[Konrad Dybcio]

On 1.06.2023 17:20, Krzysztof Kozlowski wrote:
> Driver can bind only via ACPI matching and acpi_device_id is there
> unconditionally, so drop useless ACPI_PTR() macro.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Oh I forgot this SoC existed... I wish I could play with it!

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c b/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
> index b0f1b3dc6831..b5808fcfb13c 100644
> --- a/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
> +++ b/drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
> @@ -142,7 +142,7 @@ MODULE_DEVICE_TABLE(acpi, qdf2xxx_acpi_ids);
>  static struct platform_driver qdf2xxx_pinctrl_driver = {
>  	.driver = {
>  		.name = "qdf2xxx-pinctrl",
> -		.acpi_match_table = ACPI_PTR(qdf2xxx_acpi_ids),
> +		.acpi_match_table = qdf2xxx_acpi_ids,
>  	},
>  	.probe = qdf2xxx_pinctrl_probe,
>  	.remove = msm_pinctrl_remove,

Re: [PATCH 1/8] pinctrl: qcom: qdf2xxx: drop ACPI_PTR

[Linus Walleij]

On Thu, Jun 1, 2023 at 5:20 PM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:

> Driver can bind only via ACPI matching and acpi_device_id is there
> unconditionally, so drop useless ACPI_PTR() macro.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Patches applied!

I had to manually update patch 7/8 to account for the IPQ5018 driver that
I just applied, but I think I figured it out, check the result!

Yours,
Linus Walleij

Re: [PATCH 1/8] pinctrl: qcom: qdf2xxx: drop ACPI_PTR

[Krzysztof Kozlowski]

On 09/06/2023 09:12, Linus Walleij wrote:
> On Thu, Jun 1, 2023 at 5:20 PM Krzysztof Kozlowski
> <krzysztof.kozlowski@linaro.org> wrote:
> 
>> Driver can bind only via ACPI matching and acpi_device_id is there
>> unconditionally, so drop useless ACPI_PTR() macro.
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> Patches applied!
> 
> I had to manually update patch 7/8 to account for the IPQ5018 driver that
> I just applied, but I think I figured it out, check the result!

Thanks, looks good!

Best regards,
Krzysztof