Re: [PATCH v2 13/23] pinctrl: sunxi: Add I2C pinmuxes

Andre Przywara
2022-03-27T17:23:27Z

On Thu, 17 Mar 2022 22:54:10 -0500
Samuel Holland <samuel@sholland.org> wrote:

Hi,

> Where multiple options were available, the one matching board.c and the
> device trees was chosen.
>
> Pin lists and mux values were taken from the Linux drivers.
>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
> ---
>
> (no changes since v1)
>
> drivers/pinctrl/sunxi/pinctrl-sunxi.c | 37 +++++++++++++++++++++++++++
> 1 file changed, 37 insertions(+)
>
> diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> index 2de793689a..3a2fbee324 100644
> --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> @@ -225,6 +225,8 @@ static int sunxi_pinctrl_probe(struct udevice *dev)
> static const struct sunxi_pinctrl_function suniv_f1c100s_pinctrl_functions[] = {
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 3 }, /* PE11-PE12 */
> + { "i2c1", 3 }, /* PD5-PD6 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 3 }, /* PF2-PF4 */
> #else
> @@ -243,6 +245,8 @@ static const struct sunxi_pinctrl_function sun4i_a10_pinctrl_functions[] = {
> { "emac", 2 }, /* PA0-PA17 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PB0-PB1 */
> + { "i2c1", 2 }, /* PB18-PB19 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 4 }, /* PF2-PF4 */
> #else
> @@ -261,6 +265,8 @@ static const struct sunxi_pinctrl_function sun5i_a13_pinctrl_functions[] = {
> { "emac", 2 }, /* PA0-PA17 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PB0-PB1 */
> + { "i2c1", 2 }, /* PB15-PB16 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 4 }, /* PF2-PF4 */
> #else
> @@ -280,6 +286,8 @@ static const struct sunxi_pinctrl_function sun6i_a31_pinctrl_functions[] = {
> { "gmac", 2 }, /* PA0-PA27 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PH14-PH15 */
> + { "i2c1", 2 }, /* PH16-PH17 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 3 }, /* PF2-PF4 */
> #else
> @@ -297,6 +305,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_i2c", 2 }, /* PL0-PL1 */
> { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> @@ -312,6 +321,8 @@ static const struct sunxi_pinctrl_function sun7i_a20_pinctrl_functions[] = {
> { "gmac", 5 }, /* PA0-PA17 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PB0-PB1 */
> + { "i2c1", 2 }, /* PB18-PB19 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 4 }, /* PF2-PF4 */
> #else
> @@ -329,6 +340,8 @@ 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 },
> + { "i2c0", 2 }, /* PH2-PH3 */
> + { "i2c1", 2 }, /* PH4-PH5 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 3 }, /* PF2-PF4 */
> #endif
> @@ -346,6 +359,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_i2c", 3 }, /* PL0-PL1 */
> { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> @@ -359,6 +373,8 @@ 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 },
> + { "i2c0", 2 }, /* PH2-PH3 */
> + { "i2c1", 2 }, /* PH4-PH5 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 3 }, /* PF2-PF4 */
> #else
> @@ -379,6 +395,8 @@ static const struct sunxi_pinctrl_function sun8i_a83t_pinctrl_functions[] = {
> { "gmac", 4 }, /* PD2-PD23 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PH0-PH1 */
> + { "i2c1", 2 }, /* PH2-PH3 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 3 }, /* PF2-PF4 */
> #else
> @@ -398,6 +416,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_i2c", 2 }, /* PL8-PL9 */
> { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> @@ -412,6 +431,8 @@ static const struct sunxi_pinctrl_function sun8i_h3_pinctrl_functions[] = {
> { "emac", 2 }, /* PD0-PD17 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PA11-PA12 */
> + { "i2c1", 3 }, /* PA18-PA19 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 3 }, /* PF2-PF4 */
> #else
> @@ -431,6 +452,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_i2c", 2 }, /* PL0-PL1 */
> { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> @@ -445,6 +467,8 @@ static const struct sunxi_pinctrl_function sun8i_v3s_pinctrl_functions[] = {
> { "emac", 4 }, /* PD0-PD17 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PB6-PB7 */
> + { "i2c1", 2 }, /* PB8-PB9 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 3 }, /* PF2-PF4 */
> #else
> @@ -465,6 +489,8 @@ static const struct sunxi_pinctrl_function sun9i_a80_pinctrl_functions[] = {
> { "gmac", 2 }, /* PA0-PA17 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PH0-PH1 */
> + { "i2c1", 2 }, /* PH2-PH3 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 4 }, /* PF2-PF4 */
> #else
> @@ -482,6 +508,8 @@ 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_i2c0", 2 }, /* PN0-PN1 */
> + { "s_i2c1", 3 }, /* PM8-PM9 */
> { "s_uart", 3 }, /* PL0-PL1 */
> };
>
> @@ -496,6 +524,8 @@ static const struct sunxi_pinctrl_function sun50i_a64_pinctrl_functions[] = {
> { "emac", 4 }, /* PD8-PD23 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PH0-PH1 */
> + { "i2c1", 2 }, /* PH2-PH3 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 3 }, /* PF2-PF4 */
> #else
> @@ -515,6 +545,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_i2c", 2 }, /* PL8-PL9 */
> { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> @@ -529,6 +560,8 @@ static const struct sunxi_pinctrl_function sun50i_h5_pinctrl_functions[] = {
> { "emac", 2 }, /* PD0-PD17 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PA11-PA12 */
> + { "i2c1", 2 }, /* PA18-PA19 */

According to both the user manual and the Linux driver this should be a
mux value of 3 (I guess mix up with I2S vs. I2C)

Cheers,
Andre

> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 3 }, /* PF2-PF4 */
> #else
> @@ -549,6 +582,8 @@ static const struct sunxi_pinctrl_function sun50i_h6_pinctrl_functions[] = {
> { "emac", 5 }, /* PD0-PD20 */
> { "gpio_in", 0 },
> { "gpio_out", 1 },
> + { "i2c0", 2 }, /* PD25-PD26 */
> + { "i2c1", 4 }, /* PH5-PH6 */
> #if IS_ENABLED(CONFIG_UART0_PORT_F)
> { "uart0", 3 }, /* PF2-PF4 */
> #else
> @@ -567,6 +602,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_i2c", 3 }, /* PL0-PL1 */
> { "s_uart", 2 }, /* PL2-PL3 */
> };
>
> @@ -599,6 +635,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_i2c", 3 }, /* PL0-PL1 */
> { "s_uart", 2 }, /* PL2-PL3 */
> };
>