Commit 6f6835be authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Linus Walleij
Browse files

pinctrl: qcom: use generic pin function helpers 



With the pinmux core no longer duplicating memory used to store the
struct pinfunction objects in .rodata, we can now use the existing
infrastructure for storing and looking up pin functions in qualcomm
drivers. Remove hand-crafted callbacks.

Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Tested-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d57b7979

drivers/pinctrl/qcom/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ config PINCTRL_MSM 
	depends on OF

	select QCOM_SCM

	select PINMUX

	select GENERIC_PINMUX_FUNCTIONS

	select PINCONF

	select GENERIC_PINCONF

	select GPIOLIB_IRQCHIP

drivers/pinctrl/qcom/pinctrl-msm.c

+13 −30
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "../core.h"

#include "../pinconf.h"

#include "../pinctrl-utils.h"

#include "../pinmux.h"



#include "pinctrl-msm.h"
@@ -150,33 +151,6 @@ static int msm_pinmux_request(struct pinctrl_dev *pctldev, unsigned offset) 
	return gpiochip_line_is_valid(chip, offset) ? 0 : -EINVAL;

}



static int msm_get_functions_count(struct pinctrl_dev *pctldev)

{

	struct msm_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);



	return pctrl->soc->nfunctions;

}



static const char *msm_get_function_name(struct pinctrl_dev *pctldev,

					 unsigned function)

{

	struct msm_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);



	return pctrl->soc->functions[function].name;

}



static int msm_get_function_groups(struct pinctrl_dev *pctldev,

				   unsigned function,

				   const char * const **groups,

				   unsigned * const num_groups)

{

	struct msm_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);



	*groups = pctrl->soc->functions[function].groups;

	*num_groups = pctrl->soc->functions[function].ngroups;

	return 0;

}



static int msm_pinmux_set_mux(struct pinctrl_dev *pctldev,

			      unsigned function,

			      unsigned group)
@@ -288,9 +262,9 @@ static int msm_pinmux_request_gpio(struct pinctrl_dev *pctldev, 


static const struct pinmux_ops msm_pinmux_ops = {

	.request		= msm_pinmux_request,

	.get_functions_count	= msm_get_functions_count,

	.get_function_name	= msm_get_function_name,

	.get_function_groups	= msm_get_function_groups,

	.get_functions_count	= pinmux_generic_get_function_count,

	.get_function_name	= pinmux_generic_get_function_name,

	.get_function_groups	= pinmux_generic_get_function_groups,

	.gpio_request_enable	= msm_pinmux_request_gpio,

	.set_mux		= msm_pinmux_set_mux,

};
@@ -1552,6 +1526,7 @@ EXPORT_SYMBOL(msm_pinctrl_dev_pm_ops); 
int msm_pinctrl_probe(struct platform_device *pdev,

		      const struct msm_pinctrl_soc_data *soc_data)

{

	const struct pinfunction *func;

	struct msm_pinctrl *pctrl;

	struct resource *res;

	int ret;
@@ -1606,6 +1581,14 @@ int msm_pinctrl_probe(struct platform_device *pdev, 
		return PTR_ERR(pctrl->pctrl);

	}



	for (i = 0; i < soc_data->nfunctions; i++) {

		func = &soc_data->functions[i];



		ret = pinmux_generic_add_pinfunction(pctrl->pctrl, func, NULL);

		if (ret < 0)

			return ret;

	}



	ret = msm_gpio_init(pctrl);

	if (ret)

		return ret;