Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73b6d968 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pinctrl: msm: Fix pin parsing and remove CONFIG_PINCTRL_MSM"

parents ae3b73de 12dc8c08

drivers/pinctrl/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -159,16 +159,12 @@ config PINCTRL_SINGLE 
	help

	  This selects the device tree based generic pinctrl driver.



config PINCTRL_MSM

config PINCTRL_MSM_TLMM_V3

	depends on OF

	bool

	select PINMUX

	select GENERIC_PINCONF



config PINCTRL_MSM_TLMM_V3

	bool

	select PINCTRL_MSM



config PINCTRL_SIRF

	bool "CSR SiRFprimaII/SiRFmarco pin controller driver"

	depends on ARCH_SIRF

drivers/pinctrl/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ obj-$(CONFIG_PINCTRL_IMX53) += pinctrl-imx53.o 
obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6q.o

obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6dl.o

obj-$(CONFIG_PINCTRL_FALCON)	+= pinctrl-falcon.o

obj-$(CONFIG_PINCTRL_MSM)	+= pinctrl-msm.o

obj-$(CONFIG_PINCTRL_MSM_TLMM_V3)	+= pinctrl-msm-tlmm-v3.o

obj-$(CONFIG_PINCTRL_MSM_TLMM_V3)	+= pinctrl-msm.o pinctrl-msm-tlmm-v3.o

obj-$(CONFIG_PINCTRL_MXS)	+= pinctrl-mxs.o

obj-$(CONFIG_PINCTRL_IMX23)	+= pinctrl-imx23.o

obj-$(CONFIG_PINCTRL_IMX28)	+= pinctrl-imx28.o

drivers/pinctrl/pinctrl-msm.c

+5 −3
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int msm_of_get_pin(struct device_node *np, int index, 
				struct msm_pinctrl_dd *dd, uint *pin)

{

	struct of_phandle_args pargs;

	struct msm_pintype_info *pinfo;

	struct msm_pintype_info *pinfo, *pintype;

	int num_pintypes;

	int ret, i;
@@ -360,9 +360,10 @@ static int msm_of_get_pin(struct device_node *np, int index, 
								index, &pargs);

	if (ret)

		return ret;

	pinfo = dd->msm_pintype;

	pintype = dd->msm_pintype;

	num_pintypes = dd->num_pintypes;

	for (i = 0; i < num_pintypes; i++)  {

		pinfo = &pintype[i];

		/* Find the matching pin type node */

		if (pargs.np != pinfo->node)

			continue;
@@ -527,7 +528,8 @@ static int msm_pinctrl_dt_parse_pintype(struct device_node *dev_node, 
		for (i = 0; i < pinfo_entries; i++) {

			pintype = &pinfo[i];

			/* Check if node is pintype node */

			if (!of_find_property(pt_node, pinfo->prop_name, NULL))

			if (!of_find_property(pt_node, pintype->prop_name,

									NULL))

				continue;

			of_node_get(pt_node);

			pintype->node = pt_node;