Takashi Iwai 859391
From 4f45f45b081eb37b9f8b627cc14cff67838968ab Mon Sep 17 00:00:00 2001
Takashi Iwai 859391
From: Chen-Yu Tsai <wens@csie.org>
Takashi Iwai 859391
Date: Mon, 3 Dec 2018 23:41:00 +0800
Takashi Iwai 859391
Subject: [PATCH] pinctrl: sunxi: a64: Rename function ts0 to ts
Takashi Iwai 859391
Git-commit: 4f45f45b081eb37b9f8b627cc14cff67838968ab
Takashi Iwai 859391
Patch-mainline: v5.0-rc1
Takashi Iwai 859391
References: bsc#1051510
Takashi Iwai 859391
Takashi Iwai 859391
The A64 only has one TS (transport stream) controller. The datasheet
Takashi Iwai 859391
also lists the function as TS_XXX instead of TS0_XXX.
Takashi Iwai 859391
Takashi Iwai 859391
Rename the function names now before any there are any users.
Takashi Iwai 859391
Takashi Iwai 859391
Fixes: 96851d391d02 ("drivers: pinctrl: add driver for Allwinner A64 SoC")
Takashi Iwai 859391
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Takashi Iwai 859391
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Takashi Iwai 859391
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Takashi Iwai 859391
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 859391
Takashi Iwai 859391
---
Takashi Iwai 859391
 drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c | 24 ++++++++++++------------
Takashi Iwai 859391
 1 file changed, 12 insertions(+), 12 deletions(-)
Takashi Iwai 859391
Takashi Iwai 859391
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c
Takashi Iwai 859391
index 8b974b2a2486..7b83d3755a0e 100644
Takashi Iwai 859391
--- a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c
Takashi Iwai 859391
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c
Takashi Iwai 859391
@@ -324,62 +324,62 @@ static const struct sunxi_desc_pin a64_pins[] = {
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* PCK */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* CLK */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* CLK */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 1),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* CK */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* ERR */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* ERR */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 2),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* HSYNC */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* SYNC */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* SYNC */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 3),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* VSYNC */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* DVLD */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* DVLD */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 4),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* D0 */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* D0 */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* D0 */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 5),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* D1 */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* D1 */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* D1 */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 6),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* D2 */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* D2 */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* D2 */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 7),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* D3 */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* D3 */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* D3 */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 8),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* D4 */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* D4 */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* D4 */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 9),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* D5 */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* D5 */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* D5 */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 10),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* D6 */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* D6 */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* D6 */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 11),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x2, "csi"),		/* D7 */
Takashi Iwai 859391
-		  SUNXI_FUNCTION(0x4, "ts0")),		/* D7 */
Takashi Iwai 859391
+		  SUNXI_FUNCTION(0x4, "ts")),		/* D7 */
Takashi Iwai 859391
 	SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 12),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x0, "gpio_in"),
Takashi Iwai 859391
 		  SUNXI_FUNCTION(0x1, "gpio_out"),
Takashi Iwai 859391
-- 
Takashi Iwai 859391
2.16.4
Takashi Iwai 859391