mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pinctrl: sunxi: Prepare for alternative bias voltage setting methods 

H6 has a different I/O voltage bias setting method than A80. Prepare
existing code for using alternative bias voltage setting methods.

Signed-off-by: Ondrej Jirman <megous@megous.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Ondrej Jirman 2019-04-13 18:54:12 +02:00 committed by Linus Walleij
parent 483d70d73b
commit f727534572
4 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c
View File

@ -153,7 +153,7 @@ static const struct sunxi_pinctrl_desc sun9i_a80_r_pinctrl_data = {
.pin_base = PL_BASE, .pin_base = PL_BASE,
.irq_banks = 2, .irq_banks = 2,
.disable_strict_mode = true, .disable_strict_mode = true,
.has_io_bias_cfg = true, .io_bias_cfg_variant = BIAS_VOLTAGE_GRP_CONFIG,
}; };
static int sun9i_a80_r_pinctrl_probe(struct platform_device *pdev) static int sun9i_a80_r_pinctrl_probe(struct platform_device *pdev)

2
drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
View File

@ -722,7 +722,7 @@ static const struct sunxi_pinctrl_desc sun9i_a80_pinctrl_data = {
.npins = ARRAY_SIZE(sun9i_a80_pins), .npins = ARRAY_SIZE(sun9i_a80_pins),
.irq_banks = 5, .irq_banks = 5,
.disable_strict_mode = true, .disable_strict_mode = true,
.has_io_bias_cfg = true, .io_bias_cfg_variant = BIAS_VOLTAGE_GRP_CONFIG,
}; };
static int sun9i_a80_pinctrl_probe(struct platform_device *pdev) static int sun9i_a80_pinctrl_probe(struct platform_device *pdev)

43
drivers/pinctrl/sunxi/pinctrl-sunxi.c
View File

@ -617,7 +617,7 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl,
u32 val, reg; u32 val, reg;
int uV; int uV;
if (!pctl->desc->has_io_bias_cfg) if (!pctl->desc->io_bias_cfg_variant)
return 0; return 0;
uV = regulator_get_voltage(supply); uV = regulator_get_voltage(supply);
@ -628,25 +628,32 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl,
if (uV == 0) if (uV == 0)
return 0; return 0;
/* Configured value must be equal or greater to actual voltage */ switch (pctl->desc->io_bias_cfg_variant) {
if (uV <= 1800000) case BIAS_VOLTAGE_GRP_CONFIG:
val = 0x0; /* 1.8V */ /*
else if (uV <= 2500000) * Configured value must be equal or greater to actual
val = 0x6; /* 2.5V */ * voltage.
else if (uV <= 2800000) */
val = 0x9; /* 2.8V */ if (uV <= 1800000)
else if (uV <= 3000000) val = 0x0; /* 1.8V */
val = 0xA; /* 3.0V */ else if (uV <= 2500000)
else val = 0x6; /* 2.5V */
val = 0xD; /* 3.3V */ else if (uV <= 2800000)
val = 0x9; /* 2.8V */
else if (uV <= 3000000)
val = 0xA; /* 3.0V */
else
val = 0xD; /* 3.3V */
pin -= pctl->desc->pin_base; pin -= pctl->desc->pin_base;
reg = readl(pctl->membase + sunxi_grp_config_reg(pin)); reg = readl(pctl->membase + sunxi_grp_config_reg(pin));
reg &= ~IO_BIAS_MASK; reg &= ~IO_BIAS_MASK;
writel(reg | val, pctl->membase + sunxi_grp_config_reg(pin)); writel(reg | val, pctl->membase + sunxi_grp_config_reg(pin));
return 0;
return 0; default:
return -EINVAL;
}
} }
static int sunxi_pmx_get_funcs_cnt(struct pinctrl_dev *pctldev) static int sunxi_pmx_get_funcs_cnt(struct pinctrl_dev *pctldev)

11
drivers/pinctrl/sunxi/pinctrl-sunxi.h
View File

@ -95,6 +95,15 @@
#define PINCTRL_SUN7I_A20 BIT(7) #define PINCTRL_SUN7I_A20 BIT(7)
#define PINCTRL_SUN8I_R40 BIT(8) #define PINCTRL_SUN8I_R40 BIT(8)
enum sunxi_desc_bias_voltage {
BIAS_VOLTAGE_NONE,
/*
* Bias voltage configuration is done through
* Pn_GRP_CONFIG registers, as seen on A80 SoC.
*/
BIAS_VOLTAGE_GRP_CONFIG,
};
struct sunxi_desc_function { struct sunxi_desc_function {
unsigned long variant; unsigned long variant;
const char *name; const char *name;
@ -117,7 +126,7 @@ struct sunxi_pinctrl_desc {
const unsigned int *irq_bank_map; const unsigned int *irq_bank_map;
bool irq_read_needs_mux; bool irq_read_needs_mux;
bool disable_strict_mode; bool disable_strict_mode;
bool has_io_bias_cfg; enum sunxi_desc_bias_voltage io_bias_cfg_variant;
}; };
struct sunxi_pinctrl_function { struct sunxi_pinctrl_function {