Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 1 Dec 2020 13:48:06 -0600
From:   Bjorn Andersson <bjorn.andersson@linaro.org>
To:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc:     linus.walleij@linaro.org, robh+dt@kernel.org, agross@kernel.org,
        linux-arm-msm@vger.kernel.org, linux-gpio@vger.kernel.org,
        devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v5 2/2] pinctrl: qcom: Add sm8250 lpass lpi pinctrl driver
Message-ID: <X8ad9lw73ZKsqXKT@builder.lan>
References: <20201201142830.13152-1-srinivas.kandagatla@linaro.org>
 <20201201142830.13152-3-srinivas.kandagatla@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20201201142830.13152-3-srinivas.kandagatla@linaro.org>
Precedence: bulk

On Tue 01 Dec 08:28 CST 2020, Srinivas Kandagatla wrote:

> Add initial pinctrl driver to support pin configuration for
> LPASS (Low Power Audio SubSystem) LPI (Low Power Island) pinctrl
> on SM8250.
> 
> This IP is an additional pin control block for Audio Pins on top the
> existing SoC Top level pin-controller.
> Hardware setup looks like:
> 
> TLMM GPIO[146 - 159] --> LPASS LPI GPIO [0 - 13]
> 
> This pin controller has some similarities compared to Top level
> msm SoC Pin controller like 'each pin belongs to a single group'
> and so on. However this one is intended to control only audio
> pins in particular, which can not be configured/touched by the
> Top level SoC pin controller except setting them as gpios.
> Apart from this, slew rate is also available in this block for
> certain pins which are connected to SLIMbus or SoundWire Bus.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
>  drivers/pinctrl/qcom/Kconfig             |   8 +
>  drivers/pinctrl/qcom/Makefile            |   1 +
>  drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 727 +++++++++++++++++++++++
>  3 files changed, 736 insertions(+)
>  create mode 100644 drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
> 
> diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
> index 5fe7b8aaf69d..d3e4e89c2810 100644
> --- a/drivers/pinctrl/qcom/Kconfig
> +++ b/drivers/pinctrl/qcom/Kconfig
> @@ -236,4 +236,12 @@ config PINCTRL_SM8250
>  	  Qualcomm Technologies Inc TLMM block found on the Qualcomm
>  	  Technologies Inc SM8250 platform.
>  
> +config PINCTRL_LPASS_LPI
> +	tristate "Qualcomm Technologies Inc LPASS LPI pin controller driver"
> +	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
> diff --git a/drivers/pinctrl/qcom/Makefile b/drivers/pinctrl/qcom/Makefile
> index 9e3d9c91a444..c8520155fb1b 100644
> --- a/drivers/pinctrl/qcom/Makefile
> +++ b/drivers/pinctrl/qcom/Makefile
> @@ -28,3 +28,4 @@ obj-$(CONFIG_PINCTRL_SDM660)   += pinctrl-sdm660.o
>  obj-$(CONFIG_PINCTRL_SDM845) += pinctrl-sdm845.o
>  obj-$(CONFIG_PINCTRL_SM8150) += pinctrl-sm8150.o
>  obj-$(CONFIG_PINCTRL_SM8250) += pinctrl-sm8250.o
> +obj-$(CONFIG_PINCTRL_LPASS_LPI) += pinctrl-lpass-lpi.o
> diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
> new file mode 100644
> index 000000000000..96c63a33fc99
> --- /dev/null
> +++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
> @@ -0,0 +1,727 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
> + * Copyright (c) 2020 Linaro Ltd.
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/bitfield.h>
> +#include <linux/clk.h>
> +#include <linux/gpio/driver.h>
> +#include <linux/io.h>
> +#include <linux/module.h>
> +#include <linux/of_device.h>
> +#include <linux/of.h>
> +#include <linux/pinctrl/pinconf-generic.h>
> +#include <linux/pinctrl/pinconf.h>
> +#include <linux/pinctrl/pinmux.h>
> +#include <linux/platform_device.h>
> +#include <linux/slab.h>
> +#include <linux/types.h>
> +#include "../core.h"
> +#include "../pinctrl-utils.h"
> +
> +#define LPI_GPIO_CFG_REG		0x00
> +#define LPI_GPIO_VALUE_REG		0x04
> +#define LPI_SLEW_RATE_CTL_REG		0xa000
> +#define LPI_SLEW_RATE_MAX		0x03
> +#define LPI_SLEW_BITS_SIZE		0x02
> +#define LPI_GPIO_PULL_SHIFT		0x0
> +#define LPI_GPIO_PULL_MASK		GENMASK(1, 0)
> +#define LPI_GPIO_FUNCTION_SHIFT		0x2
> +#define LPI_GPIO_FUNCTION_MASK	GENMASK(5, 2)
> +#define LPI_GPIO_OUT_STRENGTH_SHIFT	0x6
> +#define LPI_GPIO_OUT_STRENGTH_MASK	GENMASK(8, 6)
> +#define LPI_GPIO_OE_SHIFT		0x9
> +#define LPI_GPIO_OE_MASK		BIT(9)
> +#define LPI_GPIO_DIR_SHIFT		0x1
> +#define LPI_GPIO_DIR_MASK		0x2

The naming of these two constants no longer relates the their register.
And you no longer use the MASK, so please drop this.

That said the use of "shift" still doesn't give away the obvious fact
that this is a single bit specifying if the output should be high or
low. You would capture this by doing something like:

#define LPI_GPIO_VALUE_HIGH	BIT(1)

> +#define LPI_GPIO_BIAS_DISABLE		0x0
> +#define LPI_GPIO_PULL_DOWN		0x1
> +#define LPI_GPIO_KEEPER			0x2
> +#define LPI_GPIO_PULL_UP		0x3
> +#define LPI_GPIO_DS_TO_VAL(v) ((v / 2 - 1) << LPI_GPIO_OUT_STRENGTH_SHIFT)
> +#define NO_SLEW				-1
> +
> +#define LPI_FUNCTION(fname)			                \
> +	[LPI_MUX_##fname] = {		                \
> +		.name = #fname,				\
> +		.groups = fname##_groups,               \
> +		.ngroups = ARRAY_SIZE(fname##_groups),	\
> +	}
> +
> +#define LPI_PINGROUP(id, soff, f1, f2, f3, f4)		\
> +	{						\
> +		.name = "gpio" #id,			\
> +		.pins = gpio##id##_pins,		\
> +		.pin = id,				\
> +		.slew_offset = soff,			\
> +		.npins = ARRAY_SIZE(gpio##id##_pins),	\
> +		.funcs = (int[]){			\
> +			LPI_MUX_gpio,			\
> +			LPI_MUX_##f1,			\
> +			LPI_MUX_##f2,			\
> +			LPI_MUX_##f3,			\
> +			LPI_MUX_##f4,			\
> +		},					\
> +		.nfuncs = 5,				\
> +	}
> +
> +struct lpi_pingroup {
> +	const char *name;
> +	const unsigned int *pins;
> +	unsigned int npins;
> +	unsigned int pin;
> +	/* Bit offset in slew register for SoundWire pins only */
> +	unsigned int slew_offset;
> +	unsigned int *funcs;
> +	unsigned int nfuncs;
> +};
> +
> +struct lpi_function {
> +	const char *name;
> +	const char * const *groups;
> +	unsigned int ngroups;
> +};
> +
> +struct lpi_pinctrl_variant_data {
> +	int tlmm_reg_offset;
> +	const struct pinctrl_pin_desc *pins;
> +	int npins;
> +	const struct lpi_pingroup *groups;
> +	int ngroups;
> +	const struct lpi_function *functions;
> +	int nfunctions;
> +};
> +
> +#define MAX_LPI_NUM_CLKS	2
> +
> +struct lpi_pinctrl {
> +	struct device *dev;
> +	struct pinctrl_dev *ctrl;
> +	struct gpio_chip chip;
> +	struct pinctrl_desc desc;
> +	char __iomem *tlmm_base;
> +	char __iomem *slew_base;
> +	struct clk_bulk_data clks[MAX_LPI_NUM_CLKS];
> +	struct mutex slew_access_lock;
> +	const struct lpi_pinctrl_variant_data *data;
> +};
> +
> +/* sm8250 variant specific data */
> +static const struct pinctrl_pin_desc sm8250_lpi_pins[] = {
> +	PINCTRL_PIN(0, "gpio0"),
> +	PINCTRL_PIN(1, "gpio1"),
> +	PINCTRL_PIN(2, "gpio2"),
> +	PINCTRL_PIN(3, "gpio3"),
> +	PINCTRL_PIN(4, "gpio4"),
> +	PINCTRL_PIN(5, "gpio5"),
> +	PINCTRL_PIN(6, "gpio6"),
> +	PINCTRL_PIN(7, "gpio7"),
> +	PINCTRL_PIN(8, "gpio8"),
> +	PINCTRL_PIN(9, "gpio9"),
> +	PINCTRL_PIN(10, "gpio10"),
> +	PINCTRL_PIN(11, "gpio11"),
> +	PINCTRL_PIN(12, "gpio12"),
> +	PINCTRL_PIN(13, "gpio13"),
> +};
> +
> +enum sm8250_lpi_functions {
> +	LPI_MUX_dmic1_clk,
> +	LPI_MUX_dmic1_data,
> +	LPI_MUX_dmic2_clk,
> +	LPI_MUX_dmic2_data,
> +	LPI_MUX_dmic3_clk,
> +	LPI_MUX_dmic3_data,
> +	LPI_MUX_i2s1_clk,
> +	LPI_MUX_i2s1_data0,
> +	LPI_MUX_i2s1_data1,
> +	LPI_MUX_i2s1_ws,
> +	LPI_MUX_i2s2_clk,
> +	LPI_MUX_i2s2_data0,
> +	LPI_MUX_i2s2_data1,
> +	LPI_MUX_i2s2_ws,
> +	LPI_MUX_qua_mi2s_data0,
> +	LPI_MUX_qua_mi2s_data1,
> +	LPI_MUX_qua_mi2s_data2,
> +	LPI_MUX_qua_mi2s_sclk,
> +	LPI_MUX_qua_mi2s_ws,
> +	LPI_MUX_swr_rx_clk,
> +	LPI_MUX_swr_rx_data1,
> +	LPI_MUX_swr_rx_data2,
> +	LPI_MUX_swr_tx_clk,
> +	LPI_MUX_swr_tx_data1,
> +	LPI_MUX_swr_tx_data2,
> +	LPI_MUX_swr_tx_data3,
> +	LPI_MUX_wsa_swr_clk,
> +	LPI_MUX_wsa_swr_data,
> +	LPI_MUX_gpio,
> +	LPI_MUX__,
> +};
> +
> +static const unsigned int gpio0_pins[] = { 0 };
> +static const unsigned int gpio1_pins[] = { 1 };
> +static const unsigned int gpio2_pins[] = { 2 };
> +static const unsigned int gpio3_pins[] = { 3 };
> +static const unsigned int gpio4_pins[] = { 4 };
> +static const unsigned int gpio5_pins[] = { 5 };
> +static const unsigned int gpio6_pins[] = { 6 };
> +static const unsigned int gpio7_pins[] = { 7 };
> +static const unsigned int gpio8_pins[] = { 8 };
> +static const unsigned int gpio9_pins[] = { 9 };
> +static const unsigned int gpio10_pins[] = { 10 };
> +static const unsigned int gpio11_pins[] = { 11 };
> +static const unsigned int gpio12_pins[] = { 12 };
> +static const unsigned int gpio13_pins[] = { 13 };
> +static const char * const swr_tx_clk_groups[] = { "gpio0" };
> +static const char * const swr_tx_data1_groups[] = { "gpio1" };
> +static const char * const swr_tx_data2_groups[] = { "gpio2" };
> +static const char * const swr_rx_clk_groups[] = { "gpio3" };
> +static const char * const swr_rx_data1_groups[] = { "gpio4" };
> +static const char * const swr_tx_data3_groups[] = { "gpio5" };
> +static const char * const dmic1_clk_groups[] = { "gpio6" };
> +static const char * const dmic1_data_groups[] = { "gpio7" };
> +static const char * const dmic2_clk_groups[] = { "gpio8" };
> +static const char * const dmic2_data_groups[] = { "gpio9" };
> +static const char * const i2s2_clk_groups[] = { "gpio10" };
> +static const char * const i2s2_ws_groups[] = { "gpio11" };
> +static const char * const dmic3_clk_groups[] = { "gpio12" };
> +static const char * const dmic3_data_groups[] = { "gpio13" };
> +static const char * const qua_mi2s_sclk_groups[] = { "gpio0" };
> +static const char * const qua_mi2s_ws_groups[] = { "gpio1" };
> +static const char * const qua_mi2s_data0_groups[] = { "gpio2" };
> +static const char * const qua_mi2s_data1_groups[] = { "gpio3" };
> +static const char * const qua_mi2s_data2_groups[] = { "gpio4" };
> +static const char * const swr_rx_data2_groups[] = { "gpio5" };
> +static const char * const i2s1_clk_groups[] = { "gpio6" };
> +static const char * const i2s1_ws_groups[] = { "gpio7" };
> +static const char * const i2s1_data0_groups[] = { "gpio8" };
> +static const char * const i2s1_data1_groups[] = { "gpio9" };
> +static const char * const wsa_swr_clk_groups[] = { "gpio10" };
> +static const char * const wsa_swr_data_groups[] = { "gpio11" };
> +static const char * const i2s2_data0_groups[] = { "gpio12" };
> +static const char * const i2s2_data1_groups[] = { "gpio13" };
> +
> +static const struct lpi_pingroup sm8250_groups[] = {
> +	LPI_PINGROUP(0, 0, swr_tx_clk, qua_mi2s_sclk, _, _),
> +	LPI_PINGROUP(1, 2, swr_tx_data1, qua_mi2s_ws, _, _),
> +	LPI_PINGROUP(2, 4, swr_tx_data2, qua_mi2s_data0, _, _),
> +	LPI_PINGROUP(3, 8, swr_rx_clk, qua_mi2s_data1, _, _),
> +	LPI_PINGROUP(4, 10, swr_rx_data1, qua_mi2s_data2, _, _),
> +	LPI_PINGROUP(5, 12, swr_tx_data3, swr_rx_data2, _, _),
> +	LPI_PINGROUP(6, NO_SLEW, dmic1_clk, i2s1_clk, _,  _),
> +	LPI_PINGROUP(7, NO_SLEW, dmic1_data, i2s1_ws, _, _),
> +	LPI_PINGROUP(8, NO_SLEW, dmic2_clk, i2s1_data0, _, _),
> +	LPI_PINGROUP(9, NO_SLEW, dmic2_data, i2s1_data1, _, _),
> +	LPI_PINGROUP(10, 16, i2s2_clk, wsa_swr_clk, _, _),
> +	LPI_PINGROUP(11, 18, i2s2_ws, wsa_swr_data, _, _),
> +	LPI_PINGROUP(12, NO_SLEW, dmic3_clk, i2s2_data0, _, _),
> +	LPI_PINGROUP(13, NO_SLEW, dmic3_data, i2s2_data1, _, _),
> +};
> +
> +static const struct lpi_function sm8250_functions[] = {
> +	LPI_FUNCTION(dmic1_clk),
> +	LPI_FUNCTION(dmic1_data),
> +	LPI_FUNCTION(dmic2_clk),
> +	LPI_FUNCTION(dmic2_data),
> +	LPI_FUNCTION(dmic3_clk),
> +	LPI_FUNCTION(dmic3_data),
> +	LPI_FUNCTION(i2s1_clk),
> +	LPI_FUNCTION(i2s1_data0),
> +	LPI_FUNCTION(i2s1_data1),
> +	LPI_FUNCTION(i2s1_ws),
> +	LPI_FUNCTION(i2s2_clk),
> +	LPI_FUNCTION(i2s2_data0),
> +	LPI_FUNCTION(i2s2_data1),
> +	LPI_FUNCTION(i2s2_ws),
> +	LPI_FUNCTION(qua_mi2s_data0),
> +	LPI_FUNCTION(qua_mi2s_data1),
> +	LPI_FUNCTION(qua_mi2s_data2),
> +	LPI_FUNCTION(qua_mi2s_sclk),
> +	LPI_FUNCTION(qua_mi2s_ws),
> +	LPI_FUNCTION(swr_rx_clk),
> +	LPI_FUNCTION(swr_rx_data1),
> +	LPI_FUNCTION(swr_rx_data2),
> +	LPI_FUNCTION(swr_tx_clk),
> +	LPI_FUNCTION(swr_tx_data1),
> +	LPI_FUNCTION(swr_tx_data2),
> +	LPI_FUNCTION(swr_tx_data3),
> +	LPI_FUNCTION(wsa_swr_clk),
> +	LPI_FUNCTION(wsa_swr_data),
> +};
> +
> +static struct lpi_pinctrl_variant_data sm8250_lpi_data = {
> +	.tlmm_reg_offset = 0x1000,
> +	.pins = sm8250_lpi_pins,
> +	.npins = ARRAY_SIZE(sm8250_lpi_pins),
> +	.groups = sm8250_groups,
> +	.ngroups = ARRAY_SIZE(sm8250_groups),
> +	.functions = sm8250_functions,
> +	.nfunctions = ARRAY_SIZE(sm8250_functions),
> +};
> +
> +static int lpi_gpio_read(struct lpi_pinctrl *state, unsigned int pin,
> +			 unsigned int addr)
> +{
> +	return ioread32(state->tlmm_base +
> +			state->data->tlmm_reg_offset * pin + addr);
> +}
> +
> +static int lpi_gpio_write(struct lpi_pinctrl *state, unsigned int pin,
> +			  unsigned int addr, unsigned int val)
> +{
> +	iowrite32(val, state->tlmm_base +
> +		  state->data->tlmm_reg_offset * pin + addr);
> +
> +	return 0;
> +}
> +
> +static int lpi_gpio_get_groups_count(struct pinctrl_dev *pctldev)
> +{
> +	struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
> +
> +	return pctrl->data->ngroups;
> +}
> +
> +static const char *lpi_gpio_get_group_name(struct pinctrl_dev *pctldev,
> +					   unsigned int group)
> +{
> +	struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
> +
> +	return pctrl->data->groups[group].name;
> +}
> +
> +static int lpi_gpio_get_group_pins(struct pinctrl_dev *pctldev,
> +				   unsigned int group,
> +				   const unsigned int **pins,
> +				   unsigned int *num_pins)
> +{
> +	struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
> +
> +	*pins = pctrl->data->groups[group].pins;
> +	*num_pins = pctrl->data->groups[group].npins;
> +
> +	return 0;
> +}
> +
> +static const struct pinctrl_ops lpi_gpio_pinctrl_ops = {
> +	.get_groups_count	= lpi_gpio_get_groups_count,
> +	.get_group_name		= lpi_gpio_get_group_name,
> +	.get_group_pins		= lpi_gpio_get_group_pins,
> +	.dt_node_to_map		= pinconf_generic_dt_node_to_map_group,
> +	.dt_free_map		= pinctrl_utils_free_map,
> +};
> +
> +static int lpi_gpio_get_functions_count(struct pinctrl_dev *pctldev)
> +{
> +	struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
> +
> +	return pctrl->data->nfunctions;
> +}
> +
> +static const char *lpi_gpio_get_function_name(struct pinctrl_dev *pctldev,
> +					      unsigned int function)
> +{
> +	struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
> +
> +	return pctrl->data->functions[function].name;
> +}
> +
> +static int lpi_gpio_get_function_groups(struct pinctrl_dev *pctldev,
> +					unsigned int function,
> +					const char *const **groups,
> +					unsigned *const num_qgroups)
> +{
> +	struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
> +
> +	*groups = pctrl->data->functions[function].groups;
> +	*num_qgroups = pctrl->data->functions[function].ngroups;
> +
> +	return 0;
> +}
> +
> +static int lpi_gpio_set_mux(struct pinctrl_dev *pctldev, unsigned int function,
> +			    unsigned int group_num)
> +{
> +	struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
> +	const struct lpi_pingroup *g = &pctrl->data->groups[group_num];
> +	u32 val;
> +	int i, pin = g->pin;
> +
> +	for (i = 0; i < g->nfuncs; i++) {
> +		if (g->funcs[i] == function)
> +			break;
> +	}
> +
> +	if (WARN_ON(i == g->nfuncs))
> +		return -EINVAL;
> +
> +	val = lpi_gpio_read(pctrl, pin, LPI_GPIO_CFG_REG);
> +	u32p_replace_bits(&val, i, LPI_GPIO_FUNCTION_MASK);

I really meant FIELD_SET(), but now realize that there's only
FIELD_PREP() and FIELD_GET() in linux/bitfields.h. I think that should
be corrected, but this seems to do the trick...

> +	lpi_gpio_write(pctrl, pin, LPI_GPIO_CFG_REG, val);
> +
> +	return 0;
> +}
> +
> +static const struct pinmux_ops lpi_gpio_pinmux_ops = {
> +	.get_functions_count	= lpi_gpio_get_functions_count,
> +	.get_function_name	= lpi_gpio_get_function_name,
> +	.get_function_groups	= lpi_gpio_get_function_groups,
> +	.set_mux		= lpi_gpio_set_mux,
> +};
> +
> +static int lpi_config_get(struct pinctrl_dev *pctldev,
> +			  unsigned int pin, unsigned long *config)
> +{
> +	unsigned int param = pinconf_to_config_param(*config);
> +	struct lpi_pinctrl *state = dev_get_drvdata(pctldev->dev);
> +	unsigned int arg = 0;
> +	int is_out;
> +	int pull;
> +	u32 ctl_reg;
> +
> +	ctl_reg = lpi_gpio_read(state, pin, LPI_GPIO_CFG_REG);
> +	is_out = ctl_reg & LPI_GPIO_OE_MASK;
> +	pull = (ctl_reg & LPI_GPIO_PULL_MASK) >> LPI_GPIO_PULL_SHIFT;
> +
> +	switch (param) {
> +	case PIN_CONFIG_BIAS_DISABLE:
> +		if (pull == LPI_GPIO_BIAS_DISABLE)
> +			arg = 1;
> +		break;
> +	case PIN_CONFIG_BIAS_PULL_DOWN:
> +		if (pull == LPI_GPIO_PULL_DOWN)
> +			arg = 1;
> +		break;
> +	case PIN_CONFIG_BIAS_BUS_HOLD:
> +		if (pull == LPI_GPIO_KEEPER)
> +			arg = 1;
> +		break;
> +	case PIN_CONFIG_BIAS_PULL_UP:
> +		if (pull == LPI_GPIO_PULL_UP)
> +			arg = 1;
> +		break;
> +	case PIN_CONFIG_INPUT_ENABLE:
> +	case PIN_CONFIG_OUTPUT:
> +		if (is_out)
> +			arg = 1;
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	*config = pinconf_to_config_packed(param, arg);
> +	return 0;
> +}
> +
> +static int lpi_config_set(struct pinctrl_dev *pctldev, unsigned int group,
> +			  unsigned long *configs, unsigned int nconfs)
> +{
> +	struct lpi_pinctrl *pctrl = dev_get_drvdata(pctldev->dev);
> +	unsigned int param, arg, pullup, strength;
> +	bool value, output_enabled = false;
> +	const struct lpi_pingroup *g;
> +	unsigned long sval;
> +	int i, slew_offset;
> +	u32 val;
> +
> +	g = &pctrl->data->groups[group];
> +	for (i = 0; i < nconfs; i++) {
> +		param = pinconf_to_config_param(configs[i]);
> +		arg = pinconf_to_config_argument(configs[i]);
> +
> +		switch (param) {
> +		case PIN_CONFIG_BIAS_DISABLE:
> +			pullup = LPI_GPIO_BIAS_DISABLE;
> +			break;
> +		case PIN_CONFIG_BIAS_PULL_DOWN:
> +			pullup = LPI_GPIO_PULL_DOWN;
> +			break;
> +		case PIN_CONFIG_BIAS_BUS_HOLD:
> +			pullup = LPI_GPIO_KEEPER;
> +			break;
> +		case PIN_CONFIG_BIAS_PULL_UP:
> +			pullup = LPI_GPIO_PULL_UP;
> +			break;
> +		case PIN_CONFIG_INPUT_ENABLE:
> +			output_enabled = false;
> +			break;
> +		case PIN_CONFIG_OUTPUT:
> +			output_enabled = true;
> +			value = arg;
> +			break;
> +		case PIN_CONFIG_DRIVE_STRENGTH:
> +			strength = arg;
> +			break;
> +		case PIN_CONFIG_SLEW_RATE:
> +			if (arg > LPI_SLEW_RATE_MAX) {
> +				dev_err(pctldev->dev, "invalid slew rate %u for pin: %d\n",
> +					arg, group);
> +				return -EINVAL;
> +			}
> +
> +			slew_offset = g->slew_offset;
> +			if (slew_offset == NO_SLEW)
> +				break;
> +
> +			mutex_lock(&pctrl->slew_access_lock);
> +			sval = ioread32(pctrl->slew_base + LPI_SLEW_RATE_CTL_REG);
> +
> +			for (i = 0; i < LPI_SLEW_BITS_SIZE; i++) {
> +				assign_bit(slew_offset, &sval, arg & 0x01);
> +				slew_offset++;
> +				arg = arg >> 1;
> +			}

Isn't this loop just the same as

	FIELD_SET(3 << slew_offset, arg & 3, sval)

And as you already checked arg agains LPI_SLEW_RATE_MAX you should be
able to drop the & 3 there in the middle.

> +
> +			iowrite32(sval, pctrl->slew_base + LPI_SLEW_RATE_CTL_REG);
> +
> +			mutex_unlock(&pctrl->slew_access_lock);
> +			break;
> +		default:
> +			return -EINVAL;
> +		}
> +	}
> +
> +	val = lpi_gpio_read(pctrl, group, LPI_GPIO_CFG_REG);
> +
> +	u32p_replace_bits(&val, pullup, LPI_GPIO_PULL_MASK);
> +	u32p_replace_bits(&val, LPI_GPIO_DS_TO_VAL(strength),
> +			  LPI_GPIO_OUT_STRENGTH_MASK);
> +	u32p_replace_bits(&val, output_enabled, LPI_GPIO_OE_MASK);
> +
> +	lpi_gpio_write(pctrl, group, LPI_GPIO_CFG_REG, val);
> +
> +	if (output_enabled)
> +		lpi_gpio_write(pctrl, group, LPI_GPIO_VALUE_REG,
> +			       value << LPI_GPIO_DIR_SHIFT);
> +
> +	return 0;
> +}
> +
> +static const struct pinconf_ops lpi_gpio_pinconf_ops = {
> +	.is_generic			= true,
> +	.pin_config_group_get		= lpi_config_get,
> +	.pin_config_group_set		= lpi_config_set,
> +};
> +
> +static int lpi_gpio_direction_input(struct gpio_chip *chip, unsigned int pin)
> +{
> +	struct lpi_pinctrl *state = gpiochip_get_data(chip);
> +	unsigned long config;
> +
> +	config = pinconf_to_config_packed(PIN_CONFIG_INPUT_ENABLE, 1);
> +
> +	return lpi_config_set(state->ctrl, pin, &config, 1);
> +}
> +
> +static int lpi_gpio_direction_output(struct gpio_chip *chip,
> +				     unsigned int pin, int val)
> +{
> +	struct lpi_pinctrl *state = gpiochip_get_data(chip);
> +	unsigned long config;
> +
> +	config = pinconf_to_config_packed(PIN_CONFIG_OUTPUT, val);
> +
> +	return lpi_config_set(state->ctrl, pin, &config, 1);
> +}
> +
> +static int lpi_gpio_get(struct gpio_chip *chip, unsigned int pin)
> +{
> +	struct lpi_pinctrl *state = gpiochip_get_data(chip);
> +	int value;
> +
> +	value = lpi_gpio_read(state, pin, LPI_GPIO_CFG_REG);
> +	return value;

I must have missed this last round, gpio_get() should return the current
value of the pin, i.e:

	return lpi_gpio_read(state, pin, LPI_GPIO_VALUE_REG) & BIT(0);

> +}
> +
> +static void lpi_gpio_set(struct gpio_chip *chip, unsigned int pin, int value)
> +{
> +	struct lpi_pinctrl *state = gpiochip_get_data(chip);
> +	unsigned long config;
> +
> +	config = pinconf_to_config_packed(PIN_CONFIG_OUTPUT, value);
> +
> +	lpi_config_set(state->ctrl, pin, &config, 1);
> +}
> +
> +#ifdef CONFIG_DEBUG_FS
> +#include <linux/seq_file.h>
> +
> +static unsigned int lpi_regval_to_drive(u32 val)
> +{
> +	return (val + 1) * 2;
> +}
> +
> +static void lpi_gpio_dbg_show_one(struct seq_file *s,
> +				  struct pinctrl_dev *pctldev,
> +				  struct gpio_chip *chip,
> +				  unsigned int offset,
> +				  unsigned int gpio)
> +{
> +	struct lpi_pinctrl *state = gpiochip_get_data(chip);
> +	struct pinctrl_pin_desc pindesc;
> +	unsigned int func;
> +	int is_out;
> +	int drive;
> +	int pull;
> +	u32 ctl_reg;
> +
> +	static const char * const pulls[] = {
> +		"no pull",
> +		"pull down",
> +		"keeper",
> +		"pull up"
> +	};
> +
> +	pctldev = pctldev ? : state->ctrl;
> +	pindesc = pctldev->desc->pins[offset];
> +	ctl_reg = lpi_gpio_read(state, offset, LPI_GPIO_CFG_REG);
> +	is_out = ctl_reg & LPI_GPIO_OE_MASK;
> +
> +	func = (ctl_reg & LPI_GPIO_FUNCTION_MASK) >> LPI_GPIO_FUNCTION_SHIFT;

func = FIELD_GET(LPI_GPIO_FUNCTION_MASK, ctl_reg);

> +	drive = (ctl_reg & LPI_GPIO_OUT_STRENGTH_MASK) >>
> +		 LPI_GPIO_OUT_STRENGTH_SHIFT;

drive = FIELD_GET(LPI_GPIO_OUT_STRENGTH_MASK, ctl_reg);

> +	pull = (ctl_reg & LPI_GPIO_PULL_MASK) >> LPI_GPIO_PULL_SHIFT;

pull = FIELD_GET(LPI_GPIO_PULL_MASK, ctl_reg);

> +
> +	seq_printf(s, " %-8s: %-3s %d",
> +		   pindesc.name, is_out ? "out" : "in", func);

This line doesn't need to be broken.

Regards,
Bjorn

> +	seq_printf(s, " %dmA", lpi_regval_to_drive(drive));
> +	seq_printf(s, " %s", pulls[pull]);
> +}
> +
> +static void lpi_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
> +{
> +	unsigned int gpio = chip->base;
> +	unsigned int i;
> +
> +	for (i = 0; i < chip->ngpio; i++, gpio++) {
> +		lpi_gpio_dbg_show_one(s, NULL, chip, i, gpio);
> +		seq_puts(s, "\n");
> +	}
> +}
> +
> +#else
> +#define lpi_gpio_dbg_show NULL
> +#endif
> +
> +static const struct gpio_chip lpi_gpio_template = {
> +	.direction_input	= lpi_gpio_direction_input,
> +	.direction_output	= lpi_gpio_direction_output,
> +	.get			= lpi_gpio_get,
> +	.set			= lpi_gpio_set,
> +	.request		= gpiochip_generic_request,
> +	.free			= gpiochip_generic_free,
> +	.dbg_show		= lpi_gpio_dbg_show,
> +};
> +
> +static int lpi_pinctrl_probe(struct platform_device *pdev)
> +{
> +	const struct lpi_pinctrl_variant_data *data;
> +	struct device *dev = &pdev->dev;
> +	struct lpi_pinctrl *pctrl;
> +	int ret;
> +
> +	pctrl = devm_kzalloc(dev, sizeof(*pctrl), GFP_KERNEL);
> +	if (!pctrl)
> +		return -ENOMEM;
> +
> +	platform_set_drvdata(pdev, pctrl);
> +
> +	data = of_device_get_match_data(dev);
> +	if (!data)
> +		return -EINVAL;
> +
> +	pctrl->data = data;
> +	pctrl->dev = &pdev->dev;
> +
> +	pctrl->clks[0].id = "core";
> +	pctrl->clks[1].id = "audio";
> +
> +	pctrl->tlmm_base = devm_platform_ioremap_resource(pdev, 0);
> +	if (IS_ERR(pctrl->tlmm_base))
> +		return dev_err_probe(dev, PTR_ERR(pctrl->tlmm_base),
> +				     "TLMM resource not provided\n");
> +
> +	pctrl->slew_base = devm_platform_ioremap_resource(pdev, 1);
> +	if (IS_ERR(pctrl->slew_base))
> +		return dev_err_probe(dev, PTR_ERR(pctrl->slew_base),
> +				     "Slew resource not provided\n");
> +
> +	ret = devm_clk_bulk_get(dev, MAX_LPI_NUM_CLKS, pctrl->clks);
> +	if (ret)
> +		return dev_err_probe(dev, ret, "Can't get clocks\n");
> +
> +	ret = clk_bulk_prepare_enable(MAX_LPI_NUM_CLKS, pctrl->clks);
> +	if (ret)
> +		return dev_err_probe(dev, ret, "Can't enable clocks\n");
> +
> +	pctrl->desc.pctlops = &lpi_gpio_pinctrl_ops;
> +	pctrl->desc.pmxops = &lpi_gpio_pinmux_ops;
> +	pctrl->desc.confops = &lpi_gpio_pinconf_ops;
> +	pctrl->desc.owner = THIS_MODULE;
> +	pctrl->desc.name = dev_name(dev);
> +	pctrl->desc.pins = data->pins;
> +	pctrl->desc.npins = data->npins;
> +	pctrl->chip = lpi_gpio_template;
> +	pctrl->chip.parent = dev;
> +	pctrl->chip.base = -1;
> +	pctrl->chip.ngpio = data->npins;
> +	pctrl->chip.label = dev_name(dev);
> +	pctrl->chip.of_gpio_n_cells = 2;
> +	pctrl->chip.can_sleep = false;
> +
> +	mutex_init(&pctrl->slew_access_lock);
> +
> +	pctrl->ctrl = devm_pinctrl_register(dev, &pctrl->desc, pctrl);
> +	if (IS_ERR(pctrl->ctrl)) {
> +		ret = PTR_ERR(pctrl->ctrl);
> +		dev_err(dev, "failed to add pin controller\n");
> +		goto err_pinctrl;
> +	}
> +
> +	ret = devm_gpiochip_add_data(dev, &pctrl->chip, pctrl);
> +	if (ret) {
> +		dev_err(pctrl->dev, "can't add gpio chip\n");
> +		goto err_pinctrl;
> +	}
> +
> +	return 0;
> +
> +err_pinctrl:
> +	mutex_destroy(&pctrl->slew_access_lock);
> +	clk_bulk_disable_unprepare(MAX_LPI_NUM_CLKS, pctrl->clks);
> +
> +	return ret;
> +}
> +
> +static int lpi_pinctrl_remove(struct platform_device *pdev)
> +{
> +	struct lpi_pinctrl *pctrl = platform_get_drvdata(pdev);
> +
> +	mutex_destroy(&pctrl->slew_access_lock);
> +	clk_bulk_disable_unprepare(MAX_LPI_NUM_CLKS, pctrl->clks);
> +
> +	return 0;
> +}
> +
> +static const struct of_device_id lpi_pinctrl_of_match[] = {
> +	{
> +	       .compatible = "qcom,sm8250-lpass-lpi-pinctrl",
> +	       .data = &sm8250_lpi_data,
> +	},
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, lpi_pinctrl_of_match);
> +
> +static struct platform_driver lpi_pinctrl_driver = {
> +	.driver = {
> +		   .name = "qcom-lpass-lpi-pinctrl",
> +		   .of_match_table = lpi_pinctrl_of_match,
> +	},
> +	.probe = lpi_pinctrl_probe,
> +	.remove = lpi_pinctrl_remove,
> +};
> +
> +module_platform_driver(lpi_pinctrl_driver);
> +MODULE_DESCRIPTION("QTI LPI GPIO pin control driver");
> +MODULE_LICENSE("GPL");
> -- 
> 2.21.0
>