[PATCH 1/6] pinctrl: qcom: move out of mach-snapdragon
Sumit Garg
sumit.garg at linaro.org
Fri Nov 3 07:36:42 CET 2023
On Tue, 31 Oct 2023 at 19:52, Caleb Connolly <caleb.connolly at linaro.org> wrote:
>
> Move the Qualcomm pinctrl drivers out of mach-snapdragon and over to the
> rest of the pinctrl drivers, adjust the drivers so that support for each
> platform can be enabled/disabled individually and introduce platform
> specific configuration options.
>
> Signed-off-by: Caleb Connolly <caleb.connolly at linaro.org>
> ---
> arch/arm/mach-snapdragon/Kconfig | 4 +++
> arch/arm/mach-snapdragon/Makefile | 5 ---
> drivers/pinctrl/Kconfig | 1 +
> drivers/pinctrl/Makefile | 1 +
> drivers/pinctrl/qcom/Kconfig | 39 ++++++++++++++++++++++
> drivers/pinctrl/qcom/Makefile | 9 +++++
> .../pinctrl/qcom}/pinctrl-apq8016.c | 19 +++++++++--
> .../pinctrl/qcom}/pinctrl-apq8096.c | 19 +++++++++--
> .../pinctrl/qcom/pinctrl-qcom.c | 39 ++++++++++++----------
> .../pinctrl/qcom/pinctrl-qcom.h | 11 +++---
> .../pinctrl/qcom}/pinctrl-qcs404.c | 19 +++++++++--
> .../pinctrl/qcom}/pinctrl-sdm845.c | 19 +++++++++--
> 12 files changed, 148 insertions(+), 37 deletions(-)
>
Apart from nit below, feel free to add:
Reviewed-by: Sumit Garg <sumit.garg at linaro.org>
> diff --git a/arch/arm/mach-snapdragon/Kconfig b/arch/arm/mach-snapdragon/Kconfig
> index eaf75abf4bd5..d12eb42ef9e2 100644
> --- a/arch/arm/mach-snapdragon/Kconfig
> +++ b/arch/arm/mach-snapdragon/Kconfig
> @@ -17,6 +17,7 @@ config SDM845
> default n
> select LINUX_KERNEL_IMAGE_HEADER
> imply CLK_QCOM_SDM845
> + imply PINCTRL_QCOM_SDM845
>
> config LNX_KRNL_IMG_TEXT_OFFSET_BASE
> default 0x80000000
> @@ -29,6 +30,7 @@ config TARGET_DRAGONBOARD410C
> select BOARD_LATE_INIT
> select ENABLE_ARM_SOC_BOOT0_HOOK
> imply CLK_QCOM_APQ8016
> + imply PINCTRL_QCOM_APQ8016
> help
> Support for 96Boards Dragonboard 410C. This board complies with
> 96Board Open Platform Specifications. Features:
> @@ -43,6 +45,7 @@ config TARGET_DRAGONBOARD410C
> config TARGET_DRAGONBOARD820C
> bool "96Boards Dragonboard 820C"
> imply CLK_QCOM_APQ8096
> + imply PINCTRL_QCOM_APQ8096
> help
> Support for 96Boards Dragonboard 820C. This board complies with
> 96Board Open Platform Specifications. Features:
> @@ -77,6 +80,7 @@ config TARGET_QCS404EVB
> bool "Qualcomm Technologies, Inc. QCS404 EVB"
> select LINUX_KERNEL_IMAGE_HEADER
> imply CLK_QCOM_QCS404
> + imply PINCTRL_QCOM_QCS404
> help
> Support for Qualcomm Technologies, Inc. QCS404 evaluation board.
> Features:
> diff --git a/arch/arm/mach-snapdragon/Makefile b/arch/arm/mach-snapdragon/Makefile
> index 497ee35cf7d3..3a3a297c1768 100644
> --- a/arch/arm/mach-snapdragon/Makefile
> +++ b/arch/arm/mach-snapdragon/Makefile
> @@ -8,9 +8,4 @@ obj-$(CONFIG_TARGET_DRAGONBOARD820C) += sysmap-apq8096.o
> obj-$(CONFIG_TARGET_DRAGONBOARD410C) += sysmap-apq8016.o
> obj-y += misc.o
> obj-y += dram.o
> -obj-y += pinctrl-snapdragon.o
> -obj-y += pinctrl-apq8016.o
> -obj-y += pinctrl-apq8096.o
> -obj-y += pinctrl-qcs404.o
> -obj-y += pinctrl-sdm845.o
> obj-$(CONFIG_TARGET_QCS404EVB) += sysmap-qcs404.o
> diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
> index 75b3ff47a2e8..53f32ea1612e 100644
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> @@ -355,6 +355,7 @@ source "drivers/pinctrl/mvebu/Kconfig"
> source "drivers/pinctrl/nexell/Kconfig"
> source "drivers/pinctrl/nuvoton/Kconfig"
> source "drivers/pinctrl/nxp/Kconfig"
> +source "drivers/pinctrl/qcom/Kconfig"
> source "drivers/pinctrl/renesas/Kconfig"
> source "drivers/pinctrl/rockchip/Kconfig"
> source "drivers/pinctrl/sunxi/Kconfig"
> diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
> index fc1f01a02cbd..603c2e0a2da2 100644
> --- a/drivers/pinctrl/Makefile
> +++ b/drivers/pinctrl/Makefile
> @@ -17,6 +17,7 @@ obj-$(CONFIG_ARCH_RMOBILE) += renesas/
> obj-$(CONFIG_ARCH_RZN1) += renesas/
> obj-$(CONFIG_PINCTRL_SANDBOX) += pinctrl-sandbox.o
> obj-$(CONFIG_PINCTRL_SUNXI) += sunxi/
> +obj-$(CONFIG_PINCTRL_QCOM) += qcom/
> obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/
> obj-$(CONFIG_PINCTRL_PIC32) += pinctrl_pic32.o
> obj-$(CONFIG_PINCTRL_EXYNOS) += exynos/
> diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
> new file mode 100644
> index 000000000000..412925c48788
> --- /dev/null
> +++ b/drivers/pinctrl/qcom/Kconfig
> @@ -0,0 +1,39 @@
> +if ARCH_SNAPDRAGON
> +
> +config PINCTRL_QCOM
> + depends on PINCTRL_GENERIC
> + def_bool n
> +
> +menu "Qualcomm pinctrl drivers"
> +
> +config PINCTRL_QCOM_APQ8016
> + bool "Qualcomm APQ8016 GCC"
> + select PINCTRL_QCOM
> + help
> + Say Y here to enable support for pinctrl on the MSM8916 / APQ8016
> + Snapdragon 410 SoC, as well as the associated GPIO driver.
> +
> +config PINCTRL_QCOM_APQ8096
> + bool "Qualcomm APQ8096 GCC"
> + select PINCTRL_QCOM
> + help
> + Say Y here to enable support for pinctrl on the MSM8996 / APQ8096
> + Snapdragon 820 SoC, as well as the associated GPIO driver.
> +
> +config PINCTRL_QCOM_QCS404
> + bool "Qualcomm QCS404 GCC"
> + select PINCTRL_QCOM
> + help
> + Say Y here to enable support for pinctrl on the Snapdragon QCS404 SoC,
> + as well as the associated GPIO driver.
> +
> +config PINCTRL_QCOM_SDM845
> + bool "Qualcomm SDM845 GCC"
> + select PINCTRL_QCOM
> + help
> + Say Y here to enable support for pinctrl on the Snapdragon 845 SoC,
> + as well as the associated GPIO driver.
> +
> +endmenu
> +
> +endif
> diff --git a/drivers/pinctrl/qcom/Makefile b/drivers/pinctrl/qcom/Makefile
> new file mode 100644
> index 000000000000..86f507427301
> --- /dev/null
> +++ b/drivers/pinctrl/qcom/Makefile
> @@ -0,0 +1,9 @@
> +# SPDX-License-Identifier: GPL-2.0+
> +#
> +# Copyright (c) 2023 Linaro Ltd.
> +
> +obj-$(CONFIG_PINCTRL_QCOM) += pinctrl-qcom.o
> +obj-$(CONFIG_PINCTRL_QCOM_APQ8016) += pinctrl-apq8016.o
> +obj-$(CONFIG_PINCTRL_QCOM_APQ8096) += pinctrl-apq8096.o
> +obj-$(CONFIG_PINCTRL_QCOM_QCS404) += pinctrl-qcs404.o
> +obj-$(CONFIG_PINCTRL_QCOM_SDM845) += pinctrl-sdm845.o
> diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8016.c b/drivers/pinctrl/qcom/pinctrl-apq8016.c
> similarity index 75%
> rename from arch/arm/mach-snapdragon/pinctrl-apq8016.c
> rename to drivers/pinctrl/qcom/pinctrl-apq8016.c
> index 70c0be0bca90..bcbc0df50715 100644
> --- a/arch/arm/mach-snapdragon/pinctrl-apq8016.c
> +++ b/drivers/pinctrl/qcom/pinctrl-apq8016.c
> @@ -6,8 +6,10 @@
> *
> */
>
> -#include "pinctrl-snapdragon.h"
> #include <common.h>
> +#include <dm.h>
> +
> +#include "pinctrl-qcom.h"
>
> #define MAX_PIN_NAME_LEN 32
> static char pin_name[MAX_PIN_NAME_LEN] __section(".data");
> @@ -52,10 +54,23 @@ static unsigned int apq8016_get_function_mux(unsigned int selector)
> return msm_pinctrl_functions[selector].val;
> }
>
> -struct msm_pinctrl_data apq8016_data = {
> +static const struct msm_pinctrl_data apq8016_data = {
> .pin_count = 133,
> .functions_count = ARRAY_SIZE(msm_pinctrl_functions),
> .get_function_name = apq8016_get_function_name,
> .get_function_mux = apq8016_get_function_mux,
> .get_pin_name = apq8016_get_pin_name,
> };
> +
> +static const struct udevice_id msm_pinctrl_ids[] = {
> + { .compatible = "qcom,msm8916-pinctrl", .data = (ulong)&apq8016_data },
> + { /* Sentinal */ }
> +};
> +
> +U_BOOT_DRIVER(pinctrl_apq8016) = {
> + .name = "pinctrl_apq8016",
> + .id = UCLASS_NOP,
> + .of_match = msm_pinctrl_ids,
> + .ops = &msm_pinctrl_ops,
> + .bind = msm_pinctrl_bind,
> +};
> diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8096.c b/drivers/pinctrl/qcom/pinctrl-apq8096.c
> similarity index 74%
> rename from arch/arm/mach-snapdragon/pinctrl-apq8096.c
> rename to drivers/pinctrl/qcom/pinctrl-apq8096.c
> index 45462f01c2c7..525085617680 100644
> --- a/arch/arm/mach-snapdragon/pinctrl-apq8096.c
> +++ b/drivers/pinctrl/qcom/pinctrl-apq8096.c
> @@ -6,8 +6,10 @@
> *
> */
>
> -#include "pinctrl-snapdragon.h"
> #include <common.h>
> +#include <dm.h>
> +
> +#include "pinctrl-qcom.h"
>
> #define MAX_PIN_NAME_LEN 32
> static char pin_name[MAX_PIN_NAME_LEN] __section(".data");
> @@ -47,10 +49,23 @@ static unsigned int apq8096_get_function_mux(unsigned int selector)
> return msm_pinctrl_functions[selector].val;
> }
>
> -struct msm_pinctrl_data apq8096_data = {
> +static const struct msm_pinctrl_data apq8096_data = {
> .pin_count = 157,
> .functions_count = ARRAY_SIZE(msm_pinctrl_functions),
> .get_function_name = apq8096_get_function_name,
> .get_function_mux = apq8096_get_function_mux,
> .get_pin_name = apq8096_get_pin_name,
> };
> +
> +static const struct udevice_id msm_pinctrl_ids[] = {
> + { .compatible = "qcom,msm8996-pinctrl", .data = (ulong)&apq8096_data },
> + { /* Sentinal */ }
> +};
> +
> +U_BOOT_DRIVER(pinctrl_apq8096) = {
> + .name = "pinctrl_apq8096",
> + .id = UCLASS_NOP,
> + .of_match = msm_pinctrl_ids,
> + .ops = &msm_pinctrl_ops,
> + .bind = msm_pinctrl_bind,
> +};
> diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/drivers/pinctrl/qcom/pinctrl-qcom.c
> similarity index 85%
> rename from arch/arm/mach-snapdragon/pinctrl-snapdragon.c
> rename to drivers/pinctrl/qcom/pinctrl-qcom.c
> index 826dc5148661..d41272ce9c95 100644
> --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
> +++ b/drivers/pinctrl/qcom/pinctrl-qcom.c
> @@ -11,10 +11,11 @@
> #include <errno.h>
> #include <asm/io.h>
> #include <dm/device_compat.h>
> +#include <dm/device-internal.h>
> #include <dm/lists.h>
> #include <dm/pinctrl.h>
> #include <linux/bitops.h>
> -#include "pinctrl-snapdragon.h"
> +#include "pinctrl-qcom.h"
>
> struct msm_pinctrl_priv {
> phys_addr_t base;
> @@ -109,7 +110,7 @@ static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
> return 0;
> }
>
> -static struct pinctrl_ops msm_pinctrl_ops = {
> +struct pinctrl_ops msm_pinctrl_ops = {
> .get_pins_count = msm_get_pins_count,
> .get_pin_name = msm_get_pin_name,
> .set_state = pinctrl_generic_set_state,
> @@ -121,12 +122,24 @@ static struct pinctrl_ops msm_pinctrl_ops = {
> .get_function_name = msm_get_function_name,
> };
>
> -static int msm_pinctrl_bind(struct udevice *dev)
> +int msm_pinctrl_bind(struct udevice *dev)
> {
> ofnode node = dev_ofnode(dev);
> + struct msm_pinctrl_data *data = (struct msm_pinctrl_data *)dev_get_driver_data(dev);
> + struct driver *drv;
> + struct udevice *pinctrl_dev;
> const char *name;
> int ret;
>
> + drv = lists_driver_lookup_name("qcom_pinctrl");
> + if (!drv)
> + return -ENOENT;
> +
> + ret = device_bind_with_driver_data(dev_get_parent(dev), drv, ofnode_get_name(node), (ulong)data,
> + dev_ofnode(dev), &pinctrl_dev);
> + if (ret)
> + return ret;
> +
> ofnode_get_property(node, "gpio-controller", &ret);
> if (ret < 0)
> return 0;
> @@ -139,28 +152,18 @@ static int msm_pinctrl_bind(struct udevice *dev)
> /* Bind gpio node */
> ret = device_bind_driver_to_node(dev, "gpio_msm",
> name, node, NULL);
> - if (ret)
> + if (ret) {
> + device_unbind(pinctrl_dev);
> return ret;
> -
> - dev_dbg(dev, "bind %s\n", name);
> + }
>
> return 0;
> }
>
> -static const struct udevice_id msm_pinctrl_ids[] = {
> - { .compatible = "qcom,msm8916-pinctrl", .data = (ulong)&apq8016_data },
> - { .compatible = "qcom,msm8996-pinctrl", .data = (ulong)&apq8096_data },
> - { .compatible = "qcom,sdm845-pinctrl", .data = (ulong)&sdm845_data },
> - { .compatible = "qcom,qcs404-pinctrl", .data = (ulong)&qcs404_data },
> - { }
> -};
> -
> -U_BOOT_DRIVER(pinctrl_snapdraon) = {
> - .name = "pinctrl_msm",
> +U_BOOT_DRIVER(qcom_pinctrl) = {
> + .name = "qcom_pinctrl",
nit: I would prefer to rename driver as: pinctrl_qcom
-Sumit
> .id = UCLASS_PINCTRL,
> - .of_match = msm_pinctrl_ids,
> .priv_auto = sizeof(struct msm_pinctrl_priv),
> .ops = &msm_pinctrl_ops,
> .probe = msm_pinctrl_probe,
> - .bind = msm_pinctrl_bind,
> };
> diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.h b/drivers/pinctrl/qcom/pinctrl-qcom.h
> similarity index 68%
> rename from arch/arm/mach-snapdragon/pinctrl-snapdragon.h
> rename to drivers/pinctrl/qcom/pinctrl-qcom.h
> index 178ee01a41f4..1edd9a43ffda 100644
> --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.h
> +++ b/drivers/pinctrl/qcom/pinctrl-qcom.h
> @@ -5,8 +5,8 @@
> * (C) Copyright 2018 Ramon Fried <ramon.fried at gmail.com>
> *
> */
> -#ifndef _PINCTRL_SNAPDRAGON_H
> -#define _PINCTRL_SNAPDRAGON_H
> +#ifndef _PINCTRL_QCOM_H
> +#define _PINCTRL_QCOM_H
>
> struct udevice;
>
> @@ -25,9 +25,8 @@ struct pinctrl_function {
> int val;
> };
>
> -extern struct msm_pinctrl_data apq8016_data;
> -extern struct msm_pinctrl_data apq8096_data;
> -extern struct msm_pinctrl_data sdm845_data;
> -extern struct msm_pinctrl_data qcs404_data;
> +extern struct pinctrl_ops msm_pinctrl_ops;
> +
> +int msm_pinctrl_bind(struct udevice *dev);
>
> #endif
> diff --git a/arch/arm/mach-snapdragon/pinctrl-qcs404.c b/drivers/pinctrl/qcom/pinctrl-qcs404.c
> similarity index 78%
> rename from arch/arm/mach-snapdragon/pinctrl-qcs404.c
> rename to drivers/pinctrl/qcom/pinctrl-qcs404.c
> index a6e53c4412ec..272331c90b5c 100644
> --- a/arch/arm/mach-snapdragon/pinctrl-qcs404.c
> +++ b/drivers/pinctrl/qcom/pinctrl-qcs404.c
> @@ -5,8 +5,10 @@
> * (C) Copyright 2022 Sumit Garg <sumit.garg at linaro.org>
> */
>
> -#include "pinctrl-snapdragon.h"
> #include <common.h>
> +#include <dm.h>
> +
> +#include "pinctrl-qcom.h"
>
> #define MAX_PIN_NAME_LEN 32
> static char pin_name[MAX_PIN_NAME_LEN] __section(".data");
> @@ -59,10 +61,23 @@ static unsigned int qcs404_get_function_mux(unsigned int selector)
> return msm_pinctrl_functions[selector].val;
> }
>
> -struct msm_pinctrl_data qcs404_data = {
> +static struct msm_pinctrl_data qcs404_data = {
> .pin_count = 126,
> .functions_count = ARRAY_SIZE(msm_pinctrl_functions),
> .get_function_name = qcs404_get_function_name,
> .get_function_mux = qcs404_get_function_mux,
> .get_pin_name = qcs404_get_pin_name,
> };
> +
> +static const struct udevice_id msm_pinctrl_ids[] = {
> + { .compatible = "qcom,qcs404-pinctrl", .data = (ulong)&qcs404_data },
> + { /* Sentinal */ }
> +};
> +
> +U_BOOT_DRIVER(pinctrl_qcs404) = {
> + .name = "pinctrl_qcs404",
> + .id = UCLASS_NOP,
> + .of_match = msm_pinctrl_ids,
> + .ops = &msm_pinctrl_ops,
> + .bind = msm_pinctrl_bind,
> +};
> diff --git a/arch/arm/mach-snapdragon/pinctrl-sdm845.c b/drivers/pinctrl/qcom/pinctrl-sdm845.c
> similarity index 70%
> rename from arch/arm/mach-snapdragon/pinctrl-sdm845.c
> rename to drivers/pinctrl/qcom/pinctrl-sdm845.c
> index 40f2f012fa0d..1a09c5c81dc6 100644
> --- a/arch/arm/mach-snapdragon/pinctrl-sdm845.c
> +++ b/drivers/pinctrl/qcom/pinctrl-sdm845.c
> @@ -6,8 +6,10 @@
> *
> */
>
> -#include "pinctrl-snapdragon.h"
> #include <common.h>
> +#include <dm.h>
> +
> +#include "pinctrl-qcom.h"
>
> #define MAX_PIN_NAME_LEN 32
> static char pin_name[MAX_PIN_NAME_LEN] __section(".data");
> @@ -35,10 +37,23 @@ static unsigned int sdm845_get_function_mux(unsigned int selector)
> return msm_pinctrl_functions[selector].val;
> }
>
> -struct msm_pinctrl_data sdm845_data = {
> +static struct msm_pinctrl_data sdm845_data = {
> .pin_count = 150,
> .functions_count = ARRAY_SIZE(msm_pinctrl_functions),
> .get_function_name = sdm845_get_function_name,
> .get_function_mux = sdm845_get_function_mux,
> .get_pin_name = sdm845_get_pin_name,
> };
> +
> +static const struct udevice_id msm_pinctrl_ids[] = {
> + { .compatible = "qcom,sdm845-pinctrl", .data = (ulong)&sdm845_data },
> + { /* Sentinal */ }
> +};
> +
> +U_BOOT_DRIVER(pinctrl_sdm845) = {
> + .name = "pinctrl_sdm845",
> + .id = UCLASS_NOP,
> + .of_match = msm_pinctrl_ids,
> + .ops = &msm_pinctrl_ops,
> + .bind = msm_pinctrl_bind,
> +};
>
> --
> 2.42.0
>
More information about the U-Boot
mailing list