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

Commit 40ade582 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Geert Uytterhoeven
Browse files

pinctrl: sh-pfc: Return pinconf with arguments in packed format 



The pinconf-generic code expects configurations with arguments to be
returned in a packed format in order to be displayed properly by
pinconf_generic_dump_one().

Reading /sys/kernel/debug/pinctrl/e6060000.pfc/pinconf-pins on
r8a7795/salvator-x now shows:

    pin 101 (GP_3_5): output drive strength (9 mA), pin power source (3300 selector)

Instead of:

    pin 101 (GP_3_5): output drive strength (0 mA), pin power source (0 selector)

Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent c3071689

drivers/pinctrl/sh-pfc/pinctrl.c

+5 −3
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin, 
	struct sh_pfc *pfc = pmx->pfc;

	enum pin_config_param param = pinconf_to_config_param(*config);

	unsigned long flags;

	unsigned int arg;



	if (!sh_pfc_pinconf_validate(pfc, _pin, param))

		return -ENOTSUPP;
@@ -616,7 +617,7 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin, 
		if (bias != param)

			return -EINVAL;



		*config = 0;

		arg = 0;

		break;

	}
@@ -627,7 +628,7 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin, 
		if (ret < 0)

			return ret;



		*config = ret;

		arg = ret;

		break;

	}
@@ -646,7 +647,7 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin, 
		val = sh_pfc_read_reg(pfc, pocctrl, 32);

		spin_unlock_irqrestore(&pfc->lock, flags);



		*config = (val & BIT(bit)) ? 3300 : 1800;

		arg = (val & BIT(bit)) ? 3300 : 1800;

		break;

	}
@@ -654,6 +655,7 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin, 
		return -ENOTSUPP;

	}



	*config = pinconf_to_config_packed(param, arg);

	return 0;

}