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

Commit 58957d2e authored by Mika Westerberg's avatar Mika Westerberg Committed by Linus Walleij
Browse files

pinctrl: Widen the generic pinconf argument from 16 to 24 bits 



The current pinconf packed format allows only 16-bit argument limiting
the maximum value 65535. For most types this is enough. However,
debounce time can be in range of hundreths of milliseconds in case of
mechanical switches so we cannot represent the worst case using the
current format.

In order to support larger values change the packed format so that the
lower 8 bits are used as type which leaves 24 bits for the argument.
This allows representing values up to 16777215 and debounce times up to
16 seconds.

We also convert the existing users to use 32-bit integer when extracting
argument from the packed configuration value.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7ce7d89f

drivers/pinctrl/bcm/pinctrl-bcm281xx.c

+3 −3
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ static int bcm281xx_std_pin_update(struct pinctrl_dev *pctldev, 
	struct bcm281xx_pinctrl_data *pdata = pinctrl_dev_get_drvdata(pctldev);

	int i;

	enum pin_config_param param;

	u16 arg;

	u32 arg;



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

		param = pinconf_to_config_param(configs[i]);
@@ -1222,7 +1222,7 @@ static int bcm281xx_i2c_pin_update(struct pinctrl_dev *pctldev, 
	struct bcm281xx_pinctrl_data *pdata = pinctrl_dev_get_drvdata(pctldev);

	int i, j;

	enum pin_config_param param;

	u16 arg;

	u32 arg;



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

		param = pinconf_to_config_param(configs[i]);
@@ -1292,7 +1292,7 @@ static int bcm281xx_hdmi_pin_update(struct pinctrl_dev *pctldev, 
	struct bcm281xx_pinctrl_data *pdata = pinctrl_dev_get_drvdata(pctldev);

	int i;

	enum pin_config_param param;

	u16 arg;

	u32 arg;



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

		param = pinconf_to_config_param(configs[i]);

drivers/pinctrl/bcm/pinctrl-iproc-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static int iproc_pin_config_set(struct pinctrl_dev *pctldev, unsigned pin, 
{

	struct iproc_gpio *chip = pinctrl_dev_get_drvdata(pctldev);

	enum pin_config_param param;

	u16 arg;

	u32 arg;

	unsigned i, gpio = iproc_pin_to_gpio(pin);

	int ret = -ENOTSUPP;

drivers/pinctrl/bcm/pinctrl-ns2-mux.c

+3 −3
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ static int ns2_pin_get_enable(struct pinctrl_dev *pctrldev, unsigned int pin) 
}



static int ns2_pin_set_slew(struct pinctrl_dev *pctrldev, unsigned int pin,

			    u16 slew)

			    u32 slew)

{

	struct ns2_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctrldev);

	struct ns2_pin *pin_data = pctrldev->desc->pins[pin].drv_data;
@@ -793,7 +793,7 @@ static void ns2_pin_get_pull(struct pinctrl_dev *pctrldev, 
}



static int ns2_pin_set_strength(struct pinctrl_dev *pctrldev, unsigned int pin,

				u16 strength)

				u32 strength)

{

	struct ns2_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctrldev);

	struct ns2_pin *pin_data = pctrldev->desc->pins[pin].drv_data;
@@ -904,7 +904,7 @@ static int ns2_pin_config_set(struct pinctrl_dev *pctrldev, unsigned int pin, 
	struct ns2_pin *pin_data = pctrldev->desc->pins[pin].drv_data;

	enum pin_config_param param;

	unsigned int i;

	u16 arg;

	u32 arg;

	int ret = -ENOTSUPP;



	if (pin_data->pin_conf.base == -1)

drivers/pinctrl/bcm/pinctrl-nsp-gpio.c

+3 −3
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static const struct pinctrl_ops nsp_pctrl_ops = { 
	.dt_free_map = pinctrl_utils_free_map,

};



static int nsp_gpio_set_slew(struct nsp_gpio *chip, unsigned gpio, u16 slew)

static int nsp_gpio_set_slew(struct nsp_gpio *chip, unsigned gpio, u32 slew)

{

	if (slew)

		nsp_set_bit(chip, IO_CTRL, NSP_GPIO_SLEW_RATE_EN, gpio, true);
@@ -403,7 +403,7 @@ static void nsp_gpio_get_pull(struct nsp_gpio *chip, unsigned gpio, 
}



static int nsp_gpio_set_strength(struct nsp_gpio *chip, unsigned gpio,

				 u16 strength)

				 u32 strength)

{

	u32 offset, shift, i;

	u32 val;
@@ -522,7 +522,7 @@ static int nsp_pin_config_set(struct pinctrl_dev *pctldev, unsigned pin, 
{

	struct nsp_gpio *chip = pinctrl_dev_get_drvdata(pctldev);

	enum pin_config_param param;

	u16 arg;

	u32 arg;

	unsigned int i, gpio;

	int ret = -ENOTSUPP;

drivers/pinctrl/intel/pinctrl-cherryview.c

+2 −2
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned pin, 
}



static int chv_config_set_pull(struct chv_pinctrl *pctrl, unsigned pin,

			       enum pin_config_param param, u16 arg)

			       enum pin_config_param param, u32 arg)

{

	void __iomem *reg = chv_padreg(pctrl, pin, CHV_PADCTRL0);

	unsigned long flags;
@@ -1151,7 +1151,7 @@ static int chv_config_set(struct pinctrl_dev *pctldev, unsigned pin, 
	struct chv_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);

	enum pin_config_param param;

	int i, ret;

	u16 arg;

	u32 arg;



	if (chv_pad_locked(pctrl, pin))

		return -EBUSY;