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

Commit f17248ed authored by Tony Prisk's avatar Tony Prisk Committed by Linus Walleij
Browse files

pinctrl: vt8500: Change devicetree data parsing 



Due to an assumption in the VT8500 pinctrl driver, the value passed
from devicetree for 'wm,pull' was not explicitly translated before
being passed to pinconf.

Since v3.10, changes to 'enum pin_config_param', PIN_CONFIG_BIAS_PULL_(UP/DOWN)
no longer map 1-to-1 with the expected values in devicetree.

This patch adds a small translation between the devicetree values (0..2)
and the enum pin_config_param equivalent values.

Cc: <stable@vger.kernel.org> # v3.10+
Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 795779df

drivers/pinctrl/vt8500/pinctrl-wmt.c

+14 −1
Original line number Diff line number Diff line
@@ -276,7 +276,20 @@ static int wmt_pctl_dt_node_to_map_pull(struct wmt_pinctrl_data *data, 
	if (!configs)

		return -ENOMEM;



	configs[0] = pull;

	switch (pull) {

	case 0:

		configs[0] = PIN_CONFIG_BIAS_DISABLE;

		break;

	case 1:

		configs[0] = PIN_CONFIG_BIAS_PULL_DOWN;

		break;

	case 2:

		configs[0] = PIN_CONFIG_BIAS_PULL_UP;

		break;

	default:

		configs[0] = PIN_CONFIG_BIAS_DISABLE;

		dev_err(data->dev, "invalid pull state %d - disabling\n", pull);

	}



	map->type = PIN_MAP_TYPE_CONFIGS_PIN;

	map->data.configs.group_or_pin = data->groups[group];