On Thu, 17 Mar 2022 22:54:02 -0500
Samuel Holland <sam...@sholland.org> wrote:
> This includes UART0 and R_UART (s_uart) on all supported platforms, plus
> the additional UART configurations from arch/arm/mach-sunxi/board.c.
>
> Pin lists and mux values were taken from the Linux drivers.
>
> Signed-off-by: Samuel Holland <sam...@sholland.org>
Compare against the individual manuals.
Reviewed-by: Andre Przywara <andre.przyw...@arm.com>
Cheers,
Andre
> ---
>
> (no changes since v1)
>
> drivers/pinctrl/sunxi/pinctrl-sunxi.c | 98 +++++++++++++++++++++++++++
> 1 file changed, 98 insertions(+)
>
> diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> index 24b9647054..751b47d687 100644
> --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> @@ -225,6 +225,11 @@ static int sunxi_pinctrl_probe(struct udevice *dev)
> static const struct sunxi_pinctrl_function suniv_f1c100s_pinctrl_functions[]
> = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#else
> + { "uart0", 5 }, /* PE0-PE1 */
> +#endif
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> suniv_f1c100s_pinctrl_desc = {
> @@ -237,6 +242,11 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> suniv_f1c100s_pinctrl_desc
> static const struct sunxi_pinctrl_function sun4i_a10_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 4 }, /* PF2-PF4 */
> +#else
> + { "uart0", 2 }, /* PB22-PB23 */
> +#endif
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun4i_a10_pinctrl_desc
> = {
> @@ -249,6 +259,12 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun4i_a10_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun5i_a13_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 4 }, /* PF2-PF4 */
> +#else
> + { "uart0", 2 }, /* PB19-PB20 */
> +#endif
> + { "uart1", 4 }, /* PG3-PG4 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun5i_a13_pinctrl_desc
> = {
> @@ -261,6 +277,11 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun5i_a13_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun6i_a31_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#else
> + { "uart0", 2 }, /* PH20-PH21 */
> +#endif
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun6i_a31_pinctrl_desc
> = {
> @@ -273,6 +294,7 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun6i_a31_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun6i_a31_r_pinctrl_functions[] =
> {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun6i_a31_r_pinctrl_desc = {
> @@ -285,6 +307,11 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun6i_a31_r_pinctrl_desc =
> static const struct sunxi_pinctrl_function sun7i_a20_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 4 }, /* PF2-PF4 */
> +#else
> + { "uart0", 2 }, /* PB22-PB23 */
> +#endif
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun7i_a20_pinctrl_desc
> = {
> @@ -297,6 +324,11 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun7i_a20_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun8i_a23_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#endif
> + { "uart1", 2 }, /* PG6-PG7 */
> + { "uart2", 2 }, /* PB0-PB1 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun8i_a23_pinctrl_desc
> = {
> @@ -309,6 +341,7 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_a23_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun8i_a23_r_pinctrl_functions[] =
> {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_a23_r_pinctrl_desc = {
> @@ -321,6 +354,13 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_a23_r_pinctrl_desc =
> static const struct sunxi_pinctrl_function sun8i_a33_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#else
> + { "uart0", 3 }, /* PB0-PB1 */
> +#endif
> + { "uart1", 2 }, /* PG6-PG7 */
> + { "uart2", 2 }, /* PB0-PB1 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun8i_a33_pinctrl_desc
> = {
> @@ -333,6 +373,13 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_a33_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun8i_a83t_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#else
> + { "uart0", 2 }, /* PB9-PB10 */
> +#endif
> + { "uart1", 2 }, /* PG6-PG7 */
> + { "uart2", 2 }, /* PB0-PB1 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_a83t_pinctrl_desc = {
> @@ -345,6 +392,7 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_a83t_pinctrl_desc =
> static const struct sunxi_pinctrl_function sun8i_a83t_r_pinctrl_functions[]
> = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_a83t_r_pinctrl_desc = {
> @@ -357,6 +405,13 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_a83t_r_pinctrl_desc
> static const struct sunxi_pinctrl_function sun8i_h3_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#else
> + { "uart0", 2 }, /* PA4-PA5 */
> +#endif
> + { "uart1", 2 }, /* PG6-PG7 */
> + { "uart2", 2 }, /* PA0-PA1 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun8i_h3_pinctrl_desc
> = {
> @@ -369,6 +424,7 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_h3_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun8i_h3_r_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_h3_r_pinctrl_desc = {
> @@ -381,6 +437,13 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_h3_r_pinctrl_desc =
> static const struct sunxi_pinctrl_function sun8i_v3s_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#else
> + { "uart0", 3 }, /* PB8-PB9 */
> +#endif
> + { "uart1", 2 }, /* PG6-PG7 */
> + { "uart2", 2 }, /* PB0-PB1 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun8i_v3s_pinctrl_desc
> = {
> @@ -393,6 +456,11 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun8i_v3s_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun9i_a80_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 4 }, /* PF2-PF4 */
> +#else
> + { "uart0", 2 }, /* PH12-PH13 */
> +#endif
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun9i_a80_pinctrl_desc
> = {
> @@ -405,6 +473,7 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun9i_a80_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun9i_a80_r_pinctrl_functions[] =
> {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "s_uart", 3 }, /* PL0-PL1 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun9i_a80_r_pinctrl_desc = {
> @@ -417,6 +486,13 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun9i_a80_r_pinctrl_desc =
> static const struct sunxi_pinctrl_function sun50i_a64_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#else
> + { "uart0", 4 }, /* PB8-PB9 */
> +#endif
> + { "uart1", 2 }, /* PG6-PG7 */
> + { "uart2", 2 }, /* PB0-PB1 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_a64_pinctrl_desc = {
> @@ -429,6 +505,7 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_a64_pinctrl_desc =
> static const struct sunxi_pinctrl_function sun50i_a64_r_pinctrl_functions[]
> = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_a64_r_pinctrl_desc = {
> @@ -441,6 +518,13 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_a64_r_pinctrl_desc
> static const struct sunxi_pinctrl_function sun50i_h5_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#else
> + { "uart0", 2 }, /* PA4-PA5 */
> +#endif
> + { "uart1", 2 }, /* PG6-PG7 */
> + { "uart2", 2 }, /* PA0-PA1 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun50i_h5_pinctrl_desc
> = {
> @@ -453,6 +537,12 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_h5_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun50i_h6_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#else
> + { "uart0", 2 }, /* PH0-PH1 */
> +#endif
> + { "uart1", 2 }, /* PG6-PG7 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused sun50i_h6_pinctrl_desc
> = {
> @@ -465,6 +555,7 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_h6_pinctrl_desc = {
> static const struct sunxi_pinctrl_function sun50i_h6_r_pinctrl_functions[] =
> {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_h6_r_pinctrl_desc = {
> @@ -477,6 +568,12 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_h6_r_pinctrl_desc =
> static const struct sunxi_pinctrl_function sun50i_h616_pinctrl_functions[] =
> {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> +#if IS_ENABLED(CONFIG_UART0_PORT_F)
> + { "uart0", 3 }, /* PF2-PF4 */
> +#else
> + { "uart0", 2 }, /* PH0-PH1 */
> +#endif
> + { "uart1", 2 }, /* PG6-PG7 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_h616_pinctrl_desc = {
> @@ -489,6 +586,7 @@ static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_h616_pinctrl_desc =
> static const struct sunxi_pinctrl_function sun50i_h616_r_pinctrl_functions[]
> = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> static const struct sunxi_pinctrl_desc __maybe_unused
> sun50i_h616_r_pinctrl_desc = {
