Commit f3f7af95 authored by Saravanan Sekar's avatar Saravanan Sekar Committed by Linus Walleij
Browse files

pinctrl: actions: define pad control configurtion to SoC specific 



pad control for s900 and s700 are differs in number of
pull control configuraions
s900 has 4 pull controls - high impedence, pull up, pull down, repeater
s700, s500 has 2 pull controls - pull up and pull down

so pad control configuration has to SoC specific, moved out from pinctrl
common to s900 specific.

Signed-off-by: default avatarParthiban Nallathambi <pn@denx.de>
Signed-off-by: default avatarSaravanan Sekar <sravanhome@gmail.com>
Acked-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 0a98bf52

drivers/pinctrl/actions/pinctrl-owl.c

+8 −56
Original line number Diff line number Diff line
@@ -246,60 +246,6 @@ static int owl_pad_pinconf_reg(const struct owl_padinfo *info, 
	return 0;

}



static int owl_pad_pinconf_arg2val(const struct owl_padinfo *info,

				unsigned int param,

				u32 *arg)

{

	switch (param) {

	case PIN_CONFIG_BIAS_BUS_HOLD:

		*arg = OWL_PINCONF_PULL_HOLD;

		break;

	case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:

		*arg = OWL_PINCONF_PULL_HIZ;

		break;

	case PIN_CONFIG_BIAS_PULL_DOWN:

		*arg = OWL_PINCONF_PULL_DOWN;

		break;

	case PIN_CONFIG_BIAS_PULL_UP:

		*arg = OWL_PINCONF_PULL_UP;

		break;

	case PIN_CONFIG_INPUT_SCHMITT_ENABLE:

		*arg = (*arg >= 1 ? 1 : 0);

		break;

	default:

		return -ENOTSUPP;

	}



	return 0;

}



static int owl_pad_pinconf_val2arg(const struct owl_padinfo *padinfo,

				unsigned int param,

				u32 *arg)

{

	switch (param) {

	case PIN_CONFIG_BIAS_BUS_HOLD:

		*arg = *arg == OWL_PINCONF_PULL_HOLD;

		break;

	case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:

		*arg = *arg == OWL_PINCONF_PULL_HIZ;

		break;

	case PIN_CONFIG_BIAS_PULL_DOWN:

		*arg = *arg == OWL_PINCONF_PULL_DOWN;

		break;

	case PIN_CONFIG_BIAS_PULL_UP:

		*arg = *arg == OWL_PINCONF_PULL_UP;

		break;

	case PIN_CONFIG_INPUT_SCHMITT_ENABLE:

		*arg = *arg == 1;

		break;

	default:

		return -ENOTSUPP;

	}



	return 0;

}



static int owl_pin_config_get(struct pinctrl_dev *pctrldev,

				unsigned int pin,

				unsigned long *config)
@@ -318,7 +264,10 @@ static int owl_pin_config_get(struct pinctrl_dev *pctrldev, 


	arg = owl_read_field(pctrl, reg, bit, width);



	ret = owl_pad_pinconf_val2arg(info, param, &arg);

	if (!pctrl->soc->padctl_val2arg)

		return -ENOTSUPP;



	ret = pctrl->soc->padctl_val2arg(info, param, &arg);

	if (ret)

		return ret;
@@ -349,7 +298,10 @@ static int owl_pin_config_set(struct pinctrl_dev *pctrldev, 
		if (ret)

			return ret;



		ret = owl_pad_pinconf_arg2val(info, param, &arg);

		if (!pctrl->soc->padctl_arg2val)

			return -ENOTSUPP;



		ret = pctrl->soc->padctl_arg2val(info, param, &arg);

		if (ret)

			return ret;

drivers/pinctrl/actions/pinctrl-owl.h

+6 −7
Original line number Diff line number Diff line
@@ -145,13 +145,6 @@ 
		.shared_ctl_offset = _share,			\

	}



enum owl_pinconf_pull {

	OWL_PINCONF_PULL_HIZ,

	OWL_PINCONF_PULL_DOWN,

	OWL_PINCONF_PULL_UP,

	OWL_PINCONF_PULL_HOLD,

};



enum owl_pinconf_drv {

	OWL_PINCONF_DRV_2MA,

	OWL_PINCONF_DRV_4MA,
@@ -305,6 +298,12 @@ struct owl_pinctrl_soc_data { 
	unsigned int ngpios;

	const struct owl_gpio_port *ports;

	unsigned int nports;

	int (*padctl_val2arg)(const struct owl_padinfo *padinfo,

				unsigned int param,

				u32 *arg);

	int (*padctl_arg2val)(const struct owl_padinfo *info,

				unsigned int param,

				u32 *arg);

};



int owl_pinctrl_probe(struct platform_device *pdev,

drivers/pinctrl/actions/pinctrl-s900.c

+65 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinconf-generic.h>

#include "pinctrl-owl.h"



/* Pinctrl registers offset */
@@ -1717,6 +1718,67 @@ static const struct owl_gpio_port s900_gpio_ports[] = { 
	OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, 0x178, 0)

};



enum s900_pinconf_pull {

	OWL_PINCONF_PULL_HIZ,

	OWL_PINCONF_PULL_DOWN,

	OWL_PINCONF_PULL_UP,

	OWL_PINCONF_PULL_HOLD,

};



static int s900_pad_pinconf_arg2val(const struct owl_padinfo *info,

				unsigned int param,

				u32 *arg)

{

	switch (param) {

	case PIN_CONFIG_BIAS_BUS_HOLD:

		*arg = OWL_PINCONF_PULL_HOLD;

		break;

	case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:

		*arg = OWL_PINCONF_PULL_HIZ;

		break;

	case PIN_CONFIG_BIAS_PULL_DOWN:

		*arg = OWL_PINCONF_PULL_DOWN;

		break;

	case PIN_CONFIG_BIAS_PULL_UP:

		*arg = OWL_PINCONF_PULL_UP;

		break;

	case PIN_CONFIG_INPUT_SCHMITT_ENABLE:

		*arg = (*arg >= 1 ? 1 : 0);

		break;

	default:

		return -ENOTSUPP;

	}



	return 0;

}



static int s900_pad_pinconf_val2arg(const struct owl_padinfo *padinfo,

				unsigned int param,

				u32 *arg)

{

	switch (param) {

	case PIN_CONFIG_BIAS_BUS_HOLD:

		*arg = *arg == OWL_PINCONF_PULL_HOLD;

		break;

	case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:

		*arg = *arg == OWL_PINCONF_PULL_HIZ;

		break;

	case PIN_CONFIG_BIAS_PULL_DOWN:

		*arg = *arg == OWL_PINCONF_PULL_DOWN;

		break;

	case PIN_CONFIG_BIAS_PULL_UP:

		*arg = *arg == OWL_PINCONF_PULL_UP;

		break;

	case PIN_CONFIG_INPUT_SCHMITT_ENABLE:

		*arg = *arg == 1;

		break;

	default:

		return -ENOTSUPP;

	}



	return 0;

}



static struct owl_pinctrl_soc_data s900_pinctrl_data = {

	.padinfo = s900_padinfo,

	.pins = (const struct pinctrl_pin_desc *)s900_pads,
@@ -1727,7 +1789,9 @@ static struct owl_pinctrl_soc_data s900_pinctrl_data = { 
	.ngroups = ARRAY_SIZE(s900_groups),

	.ngpios = NUM_GPIOS,

	.ports = s900_gpio_ports,

	.nports = ARRAY_SIZE(s900_gpio_ports)

	.nports = ARRAY_SIZE(s900_gpio_ports),

	.padctl_arg2val = s900_pad_pinconf_arg2val,

	.padctl_val2arg = s900_pad_pinconf_val2arg,

};



static int s900_pinctrl_probe(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE