Commit 6ea5c72b authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Linus Walleij
Browse files

pinctrl: qcom: lpass-lpi: allow slew rate bit in main pin config register 



Existing Qualcomm SoCs have the LPASS pin controller slew rate control
in separate register, however this will change with upcoming Qualcomm
SoCs.  The slew rate will be part of the main register for pin
configuration, thus second device IO address space is not needed.

Prepare for supporting new SoCs by adding flag customizing the driver
behavior for slew rate.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20231013145935.220945-3-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 28bb7c55

drivers/pinctrl/qcom/pinctrl-lpass-lpi.c

+14 −6
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ static int lpi_config_set_slew_rate(struct lpi_pinctrl *pctrl, 
				    unsigned int group, unsigned int slew)

{

	unsigned long sval;

	void __iomem *reg;

	int slew_offset;



	if (slew > LPI_SLEW_RATE_MAX) {
@@ -203,12 +204,17 @@ static int lpi_config_set_slew_rate(struct lpi_pinctrl *pctrl, 
	if (slew_offset == LPI_NO_SLEW)

		return 0;



	if (pctrl->data->flags & LPI_FLAG_SLEW_RATE_SAME_REG)

		reg = pctrl->tlmm_base + LPI_TLMM_REG_OFFSET * group + LPI_GPIO_CFG_REG;

	else

		reg = pctrl->slew_base + LPI_SLEW_RATE_CTL_REG;



	mutex_lock(&pctrl->lock);



	sval = ioread32(pctrl->slew_base + LPI_SLEW_RATE_CTL_REG);

	sval = ioread32(reg);

	sval &= ~(LPI_SLEW_RATE_MASK << slew_offset);

	sval |= slew << slew_offset;

	iowrite32(sval, pctrl->slew_base + LPI_SLEW_RATE_CTL_REG);

	iowrite32(sval, reg);



	mutex_unlock(&pctrl->lock);
@@ -452,10 +458,12 @@ int lpi_pinctrl_probe(struct platform_device *pdev) 
		return dev_err_probe(dev, PTR_ERR(pctrl->tlmm_base),

				     "TLMM resource not provided\n");



	if (!(data->flags & LPI_FLAG_SLEW_RATE_SAME_REG)) {

		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_optional(dev, MAX_LPI_NUM_CLKS, pctrl->clks);

	if (ret)

drivers/pinctrl/qcom/pinctrl-lpass-lpi.h

+7 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ struct pinctrl_pin_desc; 
		.nfuncs = 5,				\

	}



/*

 * Slew rate control is done in the same register as rest of the

 * pin configuration.

 */

#define LPI_FLAG_SLEW_RATE_SAME_REG			BIT(0)



struct lpi_pingroup {

	struct group_desc group;

	unsigned int pin;
@@ -82,6 +88,7 @@ struct lpi_pinctrl_variant_data { 
	int ngroups;

	const struct lpi_function *functions;

	int nfunctions;

	unsigned int flags;

};



int lpi_pinctrl_probe(struct platform_device *pdev);