From: Andre Przywara <andre.przywara@arm.com>
To: Samuel Holland <samuel@sholland.org>
Cc: u-boot@lists.denx.de, Jagan Teki <jagan@amarulasolutions.com>,
Sean Anderson <seanga2@gmail.com>, Simon Glass <sjg@chromium.org>,
Heinrich Schuchardt <heinrich.schuchardt@canonical.com>,
Heiko Schocher <hs@denx.de>,
Joe Hershberger <joe.hershberger@ni.com>
Subject: Re: [PATCH v2 13/23] pinctrl: sunxi: Add I2C pinmuxes
Date: Sun, 27 Mar 2022 18:22:21 +0100 [thread overview]
Message-ID: <20220327182221.0b58601f@slackpad.lan> (raw)
In-Reply-To: <20220318035420.15058-14-samuel@sholland.org>
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 */
> };
>
next prev parent reply other threads:[~2022-03-27 17:23 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-18 3:53 [PATCH v2 00/23] sunxi: Add and use a pinctrl driver Samuel Holland
2022-03-18 3:53 ` [PATCH v2 01/23] sunxi: pinctrl: Create the driver skeleton Samuel Holland
2022-03-18 3:53 ` [PATCH v2 02/23] sunxi: pinctrl: Implement pin muxing functions Samuel Holland
2022-03-31 23:34 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 03/23] sunxi: pinctrl: Implement get_pin_muxing function Samuel Holland
2022-03-31 23:36 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 04/23] sunxi: pinctrl: Implement pin configuration Samuel Holland
2022-03-18 3:54 ` [PATCH v2 05/23] pinctrl: sunxi: Add UART pinmuxes Samuel Holland
2022-03-31 23:18 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 06/23] sunxi: Skip non-DM UART pin setup when PINCTRL=y Samuel Holland
2022-03-31 23:19 ` Andre Przywara
2022-03-31 23:59 ` Samuel Holland
2022-03-18 3:54 ` [PATCH v2 07/23] pinctrl: sunxi: Add sun4i EMAC pinmuxes Samuel Holland
2022-03-31 23:19 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 08/23] net: sunxi_emac: Remove non-DM pin setup Samuel Holland
2022-03-31 23:19 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 09/23] pinctrl: sunxi: Add sunxi GMAC pinmuxes Samuel Holland
2022-03-31 23:19 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 10/23] sunxi: Remove non-DM GMAC pin setup Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 11/23] pinctrl: sunxi: Add sun8i EMAC pinmuxes Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 12/23] net: sun8i_emac: Remove non-DM pin setup Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 13/23] pinctrl: sunxi: Add I2C pinmuxes Samuel Holland
2022-03-27 17:22 ` Andre Przywara [this message]
2022-03-18 3:54 ` [PATCH v2 14/23] sunxi: Remove options and setup code for I2C2-I2C4 Samuel Holland
2022-03-18 3:54 ` [PATCH v2 15/23] sunxi: Remove non-DM I2C clock/pin setup from U-Boot Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-04-01 0:04 ` Samuel Holland
2022-03-18 3:54 ` [PATCH v2 16/23] i2c: sun6i_p2wi: Only do non-DM pin setup for non-DM I2C Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 17/23] i2c: sun8i_rsb: " Samuel Holland
2022-03-20 7:17 ` Heinrich Schuchardt
2022-03-20 7:22 ` Heinrich Schuchardt
2022-03-31 23:20 ` Andre Przywara
2022-04-01 0:10 ` Samuel Holland
2022-03-18 3:54 ` [PATCH v2 18/23] pinctrl: sunxi: Add MMC pinmuxes Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 19/23] sunxi: Remove non-DM MMC pin setup Samuel Holland
2022-03-31 23:21 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 20/23] pinctrl: sunxi: Add the A64 PWM pinmux Samuel Holland
2022-03-31 23:21 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 21/23] pwm: sunxi: Remove non-DM pin setup Samuel Holland
2022-03-31 23:21 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 22/23] pinctrl: sunxi: Add SPI0 pinmuxes Samuel Holland
2022-03-31 23:21 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 23/23] spi: sun4i_spi: Remove non-DM pin setup Samuel Holland
2022-03-31 23:21 ` Andre Przywara
2022-04-04 0:54 ` [PATCH v2 00/23] sunxi: Add and use a pinctrl driver Andre Przywara
2022-04-04 1:24 ` Samuel Holland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220327182221.0b58601f@slackpad.lan \
--to=andre.przywara@arm.com \
--cc=heinrich.schuchardt@canonical.com \
--cc=hs@denx.de \
--cc=jagan@amarulasolutions.com \
--cc=joe.hershberger@ni.com \
--cc=samuel@sholland.org \
--cc=seanga2@gmail.com \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).