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 <sam...@sholland.org>
---
drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 2 ++
drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 2 ++
21 files changed, 35 insertions(+)
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
index 4a74496598..0c3684cb6a 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
@@ -10,6 +10,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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
index 3bbca3a19f..27943bee46 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
@@ -9,6 +9,7 @@
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 */
};
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c
b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c
index 91e34c032e..8b72e9d3cc 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c
@@ -10,6 +10,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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c
b/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c
index 6e37bd6b12..1a8dbd38b4 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c
@@ -10,6 +10,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 */
#if IS_ENABLED(CONFIG_UART0_PORT_F)
{ "uart0", 3 }, /* PF2-PF4 */
#else
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c
b/drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c
index d45e580ceb..93057a9160 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c
@@ -9,6 +9,7 @@
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 */
};
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c
b/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c
index ae05d08bb7..9f7e809160 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c
@@ -10,6 +10,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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c
b/drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c
index 7fb7692239..3084c2c22e 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c
@@ -9,6 +9,7 @@
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 */
};
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
b/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
index 22eb9b9f3b..6eef17f2fb 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
@@ -10,6 +10,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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
index 57182f1dc8..3b11f76d3b 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
@@ -9,6 +9,7 @@
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 */
};
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
index b7aa9dabbe..468b5d4a30 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
@@ -10,6 +10,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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
b/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
index a978fce733..fabd4de3d1 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
@@ -11,6 +11,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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
index e602808c38..77f1ee4382 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
@@ -9,6 +9,7 @@
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 */
};
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
index 0325d8cc54..da790a8f14 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
@@ -9,6 +9,8 @@
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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
b/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
index 259c9bbeb5..c644f97816 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
@@ -9,6 +9,8 @@
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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c
b/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c
index 4daed78ac2..b5ec485a83 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c
@@ -9,6 +9,7 @@
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 */
};
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
b/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
index 265987c86e..1f3eea6c02 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
@@ -10,6 +10,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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c
b/drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c
index c05a30c8df..176ae67d82 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c
@@ -9,6 +9,7 @@
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 */
};
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c
b/drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c
index fd164a5da0..e5862e1775 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c
@@ -10,6 +10,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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c
b/drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c
index 8b241e3c30..d1db92c4f4 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c
@@ -10,6 +10,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
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c
b/drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c
index cf46a06f8f..b867089e3f 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c
@@ -9,6 +9,8 @@
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 */
};
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
b/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
index 70998d7b27..f6b45127ca 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
@@ -10,6 +10,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
--
2.32.0
