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

Commit 9eaa98a6 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Walleij
Browse files

pinctrl: uniphier: rename macros for drive strength control 



The new ARMv8 SoC, PH1-LD20, supports more fine-grained drive
strength control.  Some of the configuration registers on it have
3-bit width.

The feature will be supported in the next commit, but a problem is
that macro names are getting longer and longer in the current naming
scheme.

Before moving forward, this commit renames macros as follows:

  UNIPHIER_PIN_DRV_4_8        -> UNIPHIER_PIN_DRV_1BIT
  UNIPHIER_PIN_DRV_8_12_16_20 -> UNIPHIER_PIN_DRV_2BIT
  UNIPHIER_PIN_DRV_FIXED_4    -> UNIPHIER_PIN_DRV_FIXED4
  UNIPHIER_PIN_DRV_FIXED_5    -> UNIPHIER_PIN_DRV_FIXED5
  UNIPHIER_PIN_DRV_FIXED_8    -> UNIPHIER_PIN_DRV_FIXED8

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent fc78a566

drivers/pinctrl/uniphier/pinctrl-uniphier-core.c

+35 −35
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void uniphier_pctl_pin_dbg_show(struct pinctrl_dev *pctldev, 
				       struct seq_file *s, unsigned offset)

{

	const struct pinctrl_pin_desc *pin = &pctldev->desc->pins[offset];

	const char *pull_dir, *drv_str;

	const char *pull_dir, *drv_type;



	switch (uniphier_pin_get_pull_dir(pin->drv_data)) {

	case UNIPHIER_PIN_PULL_UP:
@@ -87,30 +87,30 @@ static void uniphier_pctl_pin_dbg_show(struct pinctrl_dev *pctldev, 
		BUG();

	}



	switch (uniphier_pin_get_drv_str(pin->drv_data)) {

	case UNIPHIER_PIN_DRV_4_8:

		drv_str = "4/8(mA)";

	switch (uniphier_pin_get_drv_type(pin->drv_data)) {

	case UNIPHIER_PIN_DRV_1BIT:

		drv_type = "4/8(mA)";

		break;

	case UNIPHIER_PIN_DRV_8_12_16_20:

		drv_str = "8/12/16/20(mA)";

	case UNIPHIER_PIN_DRV_2BIT:

		drv_type = "8/12/16/20(mA)";

		break;

	case UNIPHIER_PIN_DRV_FIXED_4:

		drv_str = "4(mA)";

	case UNIPHIER_PIN_DRV_FIXED4:

		drv_type = "4(mA)";

		break;

	case UNIPHIER_PIN_DRV_FIXED_5:

		drv_str = "5(mA)";

	case UNIPHIER_PIN_DRV_FIXED5:

		drv_type = "5(mA)";

		break;

	case UNIPHIER_PIN_DRV_FIXED_8:

		drv_str = "8(mA)";

	case UNIPHIER_PIN_DRV_FIXED8:

		drv_type = "8(mA)";

		break;

	case UNIPHIER_PIN_DRV_NONE:

		drv_str = "NONE";

		drv_type = "NONE";

		break;

	default:

		BUG();

	}



	seq_printf(s, " PULL_DIR=%s  DRV_STR=%s", pull_dir, drv_str);

	seq_printf(s, " PULL_DIR=%s  DRV_TYPE=%s", pull_dir, drv_type);

}

#endif
@@ -180,30 +180,30 @@ static int uniphier_conf_pin_drive_get(struct pinctrl_dev *pctldev, 
				       u16 *strength)

{

	struct uniphier_pinctrl_priv *priv = pinctrl_dev_get_drvdata(pctldev);

	enum uniphier_pin_drv_str drv_str =

				uniphier_pin_get_drv_str(pin->drv_data);

	const unsigned int strength_4_8[] = {4, 8};

	const unsigned int strength_8_12_16_20[] = {8, 12, 16, 20};

	enum uniphier_pin_drv_type type =

				uniphier_pin_get_drv_type(pin->drv_data);

	const unsigned int strength_1bit[] = {4, 8};

	const unsigned int strength_2bit[] = {8, 12, 16, 20};

	const unsigned int *supported_strength;

	unsigned int drvctrl, reg, shift, mask, width, val;

	int ret;



	switch (drv_str) {

	case UNIPHIER_PIN_DRV_4_8:

		supported_strength = strength_4_8;

	switch (type) {

	case UNIPHIER_PIN_DRV_1BIT:

		supported_strength = strength_1bit;

		width = 1;

		break;

	case UNIPHIER_PIN_DRV_8_12_16_20:

		supported_strength = strength_8_12_16_20;

	case UNIPHIER_PIN_DRV_2BIT:

		supported_strength = strength_2bit;

		width = 2;

		break;

	case UNIPHIER_PIN_DRV_FIXED_4:

	case UNIPHIER_PIN_DRV_FIXED4:

		*strength = 4;

		return 0;

	case UNIPHIER_PIN_DRV_FIXED_5:

	case UNIPHIER_PIN_DRV_FIXED5:

		*strength = 5;

		return 0;

	case UNIPHIER_PIN_DRV_FIXED_8:

	case UNIPHIER_PIN_DRV_FIXED8:

		*strength = 8;

		return 0;

	default:
@@ -364,20 +364,20 @@ static int uniphier_conf_pin_drive_set(struct pinctrl_dev *pctldev, 
				       u16 strength)

{

	struct uniphier_pinctrl_priv *priv = pinctrl_dev_get_drvdata(pctldev);

	enum uniphier_pin_drv_str drv_str =

				uniphier_pin_get_drv_str(pin->drv_data);

	const unsigned int strength_4_8[] = {4, 8, -1};

	const unsigned int strength_8_12_16_20[] = {8, 12, 16, 20, -1};

	enum uniphier_pin_drv_type type =

				uniphier_pin_get_drv_type(pin->drv_data);

	const unsigned int strength_1bit[] = {4, 8, -1};

	const unsigned int strength_2bit[] = {8, 12, 16, 20, -1};

	const unsigned int *supported_strength;

	unsigned int drvctrl, reg, shift, mask, width, val;



	switch (drv_str) {

	case UNIPHIER_PIN_DRV_4_8:

		supported_strength = strength_4_8;

	switch (type) {

	case UNIPHIER_PIN_DRV_1BIT:

		supported_strength = strength_1bit;

		width = 1;

		break;

	case UNIPHIER_PIN_DRV_8_12_16_20:

		supported_strength = strength_8_12_16_20;

	case UNIPHIER_PIN_DRV_2BIT:

		supported_strength = strength_2bit;

		width = 2;

		break;

	default:

drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c

+165 −165

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c

+235 −235

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c

+325 −325

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c

+256 −256

File changed.

Preview size limit exceeded, changes collapsed.