diff options
| author | Andrew Jeffery <andrew@aj.id.au> | 2019-07-29 07:56:00 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-08-05 12:39:27 +0200 |
| commit | 7b38897081666532b434e067bdfa85789f42fa4e (patch) | |
| tree | 7bff257381c05584ef81371879f986d7abfcef03 /drivers/pinctrl/aspeed/pinmux-aspeed.h | |
| parent | dt-bindings: pinctrl: aspeed: Document AST2600 pinmux (diff) | |
| download | linux-7b38897081666532b434e067bdfa85789f42fa4e.tar.xz linux-7b38897081666532b434e067bdfa85789f42fa4e.zip | |
pinctrl: aspeed: Rename pin declaration macros
Rename macros as follows:
* s/SS_PIN_DECL()/PIN_DECL_1()/
* s/MS_PIN_DECL()/PIN_DECL_2()/
* s/MS_PIN_DECL_()/PIN_DECL_()/
This is in preparation for adding PIN_DECL_3(). We could clean this up
with e.g. CPPMAGIC_MAP() from ccan, but that might be a bridge too far
given how much of a macro jungle we already have.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Link: https://lore.kernel.org/r/20190729055604.13239-3-andrew@aj.id.au
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/pinctrl/aspeed/pinmux-aspeed.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/pinctrl/aspeed/pinmux-aspeed.h b/drivers/pinctrl/aspeed/pinmux-aspeed.h index 329d54d48667..0406beedd5ba 100644 --- a/drivers/pinctrl/aspeed/pinmux-aspeed.h +++ b/drivers/pinctrl/aspeed/pinmux-aspeed.h @@ -598,14 +598,14 @@ struct aspeed_pin_desc { #define PIN_EXPRS_PTR(pin) (&PIN_EXPRS_SYM(pin)[0]) #define PIN_SYM(pin) pin_ ## pin -#define MS_PIN_DECL_(pin, ...) \ +#define PIN_DECL_(pin, ...) \ static const struct aspeed_sig_expr **PIN_EXPRS_SYM(pin)[] = \ { __VA_ARGS__, NULL }; \ static const struct aspeed_pin_desc PIN_SYM(pin) = \ { #pin, PIN_EXPRS_PTR(pin) } /** - * Declare a multi-signal pin + * Declare a two-signal pin * * @pin: The pin number * @other: Macro name for "other" functionality (subjected to stringification) @@ -621,11 +621,11 @@ struct aspeed_pin_desc { * SIG_EXPR_LIST_DECL(ROMD8, SIG_EXPR_PTR(ROMD8, ROM16), * SIG_EXPR_PTR(ROMD8, ROM16S)); * SIG_EXPR_LIST_DECL_SINGLE(NCTS6, NCTS6, SIG_DESC_SET(SCU90, 7)); - * MS_PIN_DECL(A8, GPIOH0, ROMD8, NCTS6); + * PIN_DECL_2(A8, GPIOH0, ROMD8, NCTS6); */ -#define MS_PIN_DECL(pin, other, high, low) \ +#define PIN_DECL_2(pin, other, high, low) \ SIG_EXPR_LIST_DECL_SINGLE(other, other); \ - MS_PIN_DECL_(pin, \ + PIN_DECL_(pin, \ SIG_EXPR_LIST_PTR(high), \ SIG_EXPR_LIST_PTR(low), \ SIG_EXPR_LIST_PTR(other)) @@ -647,11 +647,11 @@ struct aspeed_pin_desc { * * #define E3 80 * SIG_EXPR_LIST_DECL_SINGLE(SCL5, I2C5, I2C5_DESC); - * SS_PIN_DECL(E3, GPIOK0, SCL5); + * PIN_DECL_1(E3, GPIOK0, SCL5); */ -#define SS_PIN_DECL(pin, other, sig) \ +#define PIN_DECL_1(pin, other, sig) \ SIG_EXPR_LIST_DECL_SINGLE(other, other); \ - MS_PIN_DECL_(pin, SIG_EXPR_LIST_PTR(sig), SIG_EXPR_LIST_PTR(other)) + PIN_DECL_(pin, SIG_EXPR_LIST_PTR(sig), SIG_EXPR_LIST_PTR(other)) /** * Single signal, single function pin declaration @@ -668,12 +668,12 @@ struct aspeed_pin_desc { #define SSSF_PIN_DECL(pin, other, sig, ...) \ SIG_EXPR_LIST_DECL_SINGLE(sig, sig, __VA_ARGS__); \ SIG_EXPR_LIST_DECL_SINGLE(other, other); \ - MS_PIN_DECL_(pin, SIG_EXPR_LIST_PTR(sig), SIG_EXPR_LIST_PTR(other)); \ + PIN_DECL_(pin, SIG_EXPR_LIST_PTR(sig), SIG_EXPR_LIST_PTR(other)); \ FUNC_GROUP_DECL(sig, pin) #define GPIO_PIN_DECL(pin, gpio) \ SIG_EXPR_LIST_DECL_SINGLE(gpio, gpio); \ - MS_PIN_DECL_(pin, SIG_EXPR_LIST_PTR(gpio)) + PIN_DECL_(pin, SIG_EXPR_LIST_PTR(gpio)) struct aspeed_pin_group { const char *name; |