Commit 059b0798 authored Jul 30, 2017 by Icenowy Zheng Committed by Linus Walleij Aug 14, 2017

pinctrl: sunxi: rename R_PIO i2c pin function name



The I2C pin functions in R_PIO used to be named "s_twi".

As we usually use the name "i2c" instead of "twi" in the mainline
kernel, change these names to "s_i2c" for consistency.

The "s_twi" functions are not yet referenced by any device trees in
mainline kernel so I think it's safe to change the name.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent cad4e209

drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,12 +25,12 @@ static const struct sunxi_desc_pin sun6i_a31_r_pins[] = {
		SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
		SUNXI_FUNCTION(0x0, "gpio_in"),
		SUNXI_FUNCTION(0x1, "gpio_out"),
		SUNXI_FUNCTION(0x2, "s_twi"), /* SCK */
		SUNXI_FUNCTION(0x2, "s_i2c"), /* SCK */
		SUNXI_FUNCTION(0x3, "s_p2wi")), /* SCK */
		SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
		SUNXI_FUNCTION(0x0, "gpio_in"),
		SUNXI_FUNCTION(0x1, "gpio_out"),
		SUNXI_FUNCTION(0x2, "s_twi"), /* SDA */
		SUNXI_FUNCTION(0x2, "s_i2c"), /* SDA */
		SUNXI_FUNCTION(0x3, "s_p2wi")), /* SDA */
		SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
		SUNXI_FUNCTION(0x0, "gpio_in"),

drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,13 +29,13 @@ static const struct sunxi_desc_pin sun8i_a23_r_pins[] = {
		SUNXI_FUNCTION(0x0, "gpio_in"),
		SUNXI_FUNCTION(0x1, "gpio_out"),
		SUNXI_FUNCTION(0x2, "s_rsb"), /* SCK */
		SUNXI_FUNCTION(0x3, "s_twi"), /* SCK */
		SUNXI_FUNCTION(0x3, "s_i2c"), /* SCK */
		SUNXI_FUNCTION_IRQ_BANK(0x4, 0, 0)), /* PL_EINT0 */
		SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
		SUNXI_FUNCTION(0x0, "gpio_in"),
		SUNXI_FUNCTION(0x1, "gpio_out"),
		SUNXI_FUNCTION(0x2, "s_rsb"), /* SDA */
		SUNXI_FUNCTION(0x3, "s_twi"), /* SDA */
		SUNXI_FUNCTION(0x3, "s_i2c"), /* SDA */
		SUNXI_FUNCTION_IRQ_BANK(0x4, 0, 1)), /* PL_EINT1 */
		SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
		SUNXI_FUNCTION(0x0, "gpio_in"),

drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,12 +20,12 @@ static const struct sunxi_desc_pin sun8i_h3_r_pins[] = {
		SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 0),
		SUNXI_FUNCTION(0x0, "gpio_in"),
		SUNXI_FUNCTION(0x1, "gpio_out"),
		SUNXI_FUNCTION(0x2, "s_twi"), /* SCK */
		SUNXI_FUNCTION(0x2, "s_i2c"), /* SCK */
		SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 0)), /* PL_EINT0 */
		SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 1),
		SUNXI_FUNCTION(0x0, "gpio_in"),
		SUNXI_FUNCTION(0x1, "gpio_out"),
		SUNXI_FUNCTION(0x2, "s_twi"), /* SDA */
		SUNXI_FUNCTION(0x2, "s_i2c"), /* SDA */
		SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 1)), /* PL_EINT1 */
		SUNXI_PIN(SUNXI_PINCTRL_PIN(L, 2),
		SUNXI_FUNCTION(0x0, "gpio_in"),