tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

pinctrl: sunxi: a64: Rename function ts0 to ts

The A64 only has one TS (transport stream) controller. The datasheet
also lists the function as TS_XXX instead of TS0_XXX.

Rename the function names now before any there are any users.

Fixes: 96851d391d02 ("drivers: pinctrl: add driver for Allwinner A64 SoC")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Chen-Yu Tsai and committed by
Linus Walleij 4f45f45b 3504caa1

+12 -12
+12 -12
drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c
··· 324 324 SUNXI_FUNCTION(0x0, "gpio_in"), 325 325 SUNXI_FUNCTION(0x1, "gpio_out"), 326 326 SUNXI_FUNCTION(0x2, "csi"), /* PCK */ 327 - SUNXI_FUNCTION(0x4, "ts0")), /* CLK */ 327 + SUNXI_FUNCTION(0x4, "ts")), /* CLK */ 328 328 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 1), 329 329 SUNXI_FUNCTION(0x0, "gpio_in"), 330 330 SUNXI_FUNCTION(0x1, "gpio_out"), 331 331 SUNXI_FUNCTION(0x2, "csi"), /* CK */ 332 - SUNXI_FUNCTION(0x4, "ts0")), /* ERR */ 332 + SUNXI_FUNCTION(0x4, "ts")), /* ERR */ 333 333 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 2), 334 334 SUNXI_FUNCTION(0x0, "gpio_in"), 335 335 SUNXI_FUNCTION(0x1, "gpio_out"), 336 336 SUNXI_FUNCTION(0x2, "csi"), /* HSYNC */ 337 - SUNXI_FUNCTION(0x4, "ts0")), /* SYNC */ 337 + SUNXI_FUNCTION(0x4, "ts")), /* SYNC */ 338 338 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 3), 339 339 SUNXI_FUNCTION(0x0, "gpio_in"), 340 340 SUNXI_FUNCTION(0x1, "gpio_out"), 341 341 SUNXI_FUNCTION(0x2, "csi"), /* VSYNC */ 342 - SUNXI_FUNCTION(0x4, "ts0")), /* DVLD */ 342 + SUNXI_FUNCTION(0x4, "ts")), /* DVLD */ 343 343 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 4), 344 344 SUNXI_FUNCTION(0x0, "gpio_in"), 345 345 SUNXI_FUNCTION(0x1, "gpio_out"), 346 346 SUNXI_FUNCTION(0x2, "csi"), /* D0 */ 347 - SUNXI_FUNCTION(0x4, "ts0")), /* D0 */ 347 + SUNXI_FUNCTION(0x4, "ts")), /* D0 */ 348 348 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 5), 349 349 SUNXI_FUNCTION(0x0, "gpio_in"), 350 350 SUNXI_FUNCTION(0x1, "gpio_out"), 351 351 SUNXI_FUNCTION(0x2, "csi"), /* D1 */ 352 - SUNXI_FUNCTION(0x4, "ts0")), /* D1 */ 352 + SUNXI_FUNCTION(0x4, "ts")), /* D1 */ 353 353 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 6), 354 354 SUNXI_FUNCTION(0x0, "gpio_in"), 355 355 SUNXI_FUNCTION(0x1, "gpio_out"), 356 356 SUNXI_FUNCTION(0x2, "csi"), /* D2 */ 357 - SUNXI_FUNCTION(0x4, "ts0")), /* D2 */ 357 + SUNXI_FUNCTION(0x4, "ts")), /* D2 */ 358 358 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 7), 359 359 SUNXI_FUNCTION(0x0, "gpio_in"), 360 360 SUNXI_FUNCTION(0x1, "gpio_out"), 361 361 SUNXI_FUNCTION(0x2, "csi"), /* D3 */ 362 - SUNXI_FUNCTION(0x4, "ts0")), /* D3 */ 362 + SUNXI_FUNCTION(0x4, "ts")), /* D3 */ 363 363 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 8), 364 364 SUNXI_FUNCTION(0x0, "gpio_in"), 365 365 SUNXI_FUNCTION(0x1, "gpio_out"), 366 366 SUNXI_FUNCTION(0x2, "csi"), /* D4 */ 367 - SUNXI_FUNCTION(0x4, "ts0")), /* D4 */ 367 + SUNXI_FUNCTION(0x4, "ts")), /* D4 */ 368 368 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 9), 369 369 SUNXI_FUNCTION(0x0, "gpio_in"), 370 370 SUNXI_FUNCTION(0x1, "gpio_out"), 371 371 SUNXI_FUNCTION(0x2, "csi"), /* D5 */ 372 - SUNXI_FUNCTION(0x4, "ts0")), /* D5 */ 372 + SUNXI_FUNCTION(0x4, "ts")), /* D5 */ 373 373 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 10), 374 374 SUNXI_FUNCTION(0x0, "gpio_in"), 375 375 SUNXI_FUNCTION(0x1, "gpio_out"), 376 376 SUNXI_FUNCTION(0x2, "csi"), /* D6 */ 377 - SUNXI_FUNCTION(0x4, "ts0")), /* D6 */ 377 + SUNXI_FUNCTION(0x4, "ts")), /* D6 */ 378 378 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 11), 379 379 SUNXI_FUNCTION(0x0, "gpio_in"), 380 380 SUNXI_FUNCTION(0x1, "gpio_out"), 381 381 SUNXI_FUNCTION(0x2, "csi"), /* D7 */ 382 - SUNXI_FUNCTION(0x4, "ts0")), /* D7 */ 382 + SUNXI_FUNCTION(0x4, "ts")), /* D7 */ 383 383 SUNXI_PIN(SUNXI_PINCTRL_PIN(E, 12), 384 384 SUNXI_FUNCTION(0x0, "gpio_in"), 385 385 SUNXI_FUNCTION(0x1, "gpio_out"),