iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: aspeed: Use masks to describe pinconf bitfields

Browse Source 
Since some of the AST2600 pinconf setting are not just single bit, modified
aspeed_pin_config @bit to @mask and add @mask to aspeed_pin_config_map to
support configuring multiple bits.

Signed-off-by: Johnny Huang <johnny_huang@aspeedtech.com>
[AJ: Tweak commit message]
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Link: https://lore.kernel.org/r/20191202061432.3996-7-andrew@aj.id.au
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Johnny Huang 2019-12-02 16:44:31 +10:30 committed by Linus Walleij
parent 5b854f2842
commit 5f52c85384
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
View File

@ -2595,11 +2595,11 @@ static int aspeed_g4_sig_expr_set(struct aspeed_pinmux_data *ctx,
} }
static const struct aspeed_pin_config_map aspeed_g4_pin_config_map[] = { static const struct aspeed_pin_config_map aspeed_g4_pin_config_map[] = {
{ PIN_CONFIG_BIAS_PULL_DOWN, 0, 1}, { PIN_CONFIG_BIAS_PULL_DOWN, 0, 1, BIT_MASK(0)},
{ PIN_CONFIG_BIAS_PULL_DOWN, -1, 0}, { PIN_CONFIG_BIAS_PULL_DOWN, -1, 0, BIT_MASK(0)},
{ PIN_CONFIG_BIAS_DISABLE, -1, 1}, { PIN_CONFIG_BIAS_DISABLE, -1, 1, BIT_MASK(0)},
{ PIN_CONFIG_DRIVE_STRENGTH, 8, 0}, { PIN_CONFIG_DRIVE_STRENGTH, 8, 0, BIT_MASK(0)},
{ PIN_CONFIG_DRIVE_STRENGTH, 16, 1}, { PIN_CONFIG_DRIVE_STRENGTH, 16, 1, BIT_MASK(0)},
}; };
static const struct aspeed_pinmux_ops aspeed_g4_ops = { static const struct aspeed_pinmux_ops aspeed_g4_ops = {

10
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
View File

@ -2781,11 +2781,11 @@ static int aspeed_g5_sig_expr_set(struct aspeed_pinmux_data *ctx,
} }
static const struct aspeed_pin_config_map aspeed_g5_pin_config_map[] = { static const struct aspeed_pin_config_map aspeed_g5_pin_config_map[] = {
{ PIN_CONFIG_BIAS_PULL_DOWN, 0, 1}, { PIN_CONFIG_BIAS_PULL_DOWN, 0, 1, BIT_MASK(0)},
{ PIN_CONFIG_BIAS_PULL_DOWN, -1, 0}, { PIN_CONFIG_BIAS_PULL_DOWN, -1, 0, BIT_MASK(0)},
{ PIN_CONFIG_BIAS_DISABLE, -1, 1}, { PIN_CONFIG_BIAS_DISABLE, -1, 1, BIT_MASK(0)},
{ PIN_CONFIG_DRIVE_STRENGTH, 8, 0}, { PIN_CONFIG_DRIVE_STRENGTH, 8, 0, BIT_MASK(0)},
{ PIN_CONFIG_DRIVE_STRENGTH, 16, 1}, { PIN_CONFIG_DRIVE_STRENGTH, 16, 1, BIT_MASK(0)},
}; };
static const struct aspeed_pinmux_ops aspeed_g5_ops = { static const struct aspeed_pinmux_ops aspeed_g5_ops = {

12
drivers/pinctrl/aspeed/pinctrl-aspeed.c
View File

@ -464,7 +464,7 @@ int aspeed_pin_config_get(struct pinctrl_dev *pctldev, unsigned int offset,
return rc; return rc;
pmap = find_pinconf_map(pdata, param, MAP_TYPE_VAL, pmap = find_pinconf_map(pdata, param, MAP_TYPE_VAL,
(val & BIT(pconf->bit)) >> pconf->bit); (val & pconf->mask) >> __ffs(pconf->mask));
if (!pmap) if (!pmap)
return -EINVAL; return -EINVAL;
@ -512,17 +512,17 @@ int aspeed_pin_config_set(struct pinctrl_dev *pctldev, unsigned int offset,
if (WARN_ON(!pmap)) if (WARN_ON(!pmap))
return -EINVAL; return -EINVAL;
val = pmap->val << pconf->bit; val = pmap->val << __ffs(pconf->mask);
rc = regmap_update_bits(pdata->scu, pconf->reg, rc = regmap_update_bits(pdata->scu, pconf->reg,
BIT(pconf->bit), val); pmap->mask, val);
if (rc < 0) if (rc < 0)
return rc; return rc;
pr_debug("%s: Set SCU%02X[%d]=%d for param %d(=%d) on pin %d\n", pr_debug("%s: Set SCU%02X[%lu]=%d for param %d(=%d) on pin %d\n",
__func__, pconf->reg, pconf->bit, pmap->val, __func__, pconf->reg, __ffs(pconf->mask),
param, arg, offset); pmap->val, param, arg, offset);
} }
return 0; return 0;

7
drivers/pinctrl/aspeed/pinctrl-aspeed.h
View File

@ -24,8 +24,7 @@ struct aspeed_pin_config {
enum pin_config_param param; enum pin_config_param param;
unsigned int pins[2]; unsigned int pins[2];
unsigned int reg; unsigned int reg;
u8 bit; u32 mask;
u8 value;
}; };
#define ASPEED_PINCTRL_PIN(name_) \ #define ASPEED_PINCTRL_PIN(name_) \
@ -39,7 +38,7 @@ struct aspeed_pin_config {
.param = param_, \ .param = param_, \
.pins = {pin0_, pin1_}, \ .pins = {pin0_, pin1_}, \
.reg = reg_, \ .reg = reg_, \
.bit = bit_ \ .mask = BIT_MASK(bit_) \
} }
/* /*
@ -48,6 +47,7 @@ struct aspeed_pin_config {
* @param: pinconf configuration parameter * @param: pinconf configuration parameter
* @arg: The supported argument for @param, or -1 if any value is supported * @arg: The supported argument for @param, or -1 if any value is supported
* @val: The register value to write to configure @arg for @param * @val: The register value to write to configure @arg for @param
* @mask: The bitfield mask for @val
* *
* The map is to be used in conjunction with the configuration array supplied * The map is to be used in conjunction with the configuration array supplied
* by the driver implementation. * by the driver implementation.
@ -56,6 +56,7 @@ struct aspeed_pin_config_map {
enum pin_config_param param; enum pin_config_param param;
s32 arg; s32 arg;
u32 val; u32 val;
u32 mask;
}; };
struct aspeed_pinctrl_data { struct aspeed_pinctrl_data {