pinctrl: pinctrl-adi: combine multiple groups of one function together

The data pins of some peripheral are different if connecting to different
devices in one pinmux function. In the PPI case, data pins can be used
in 8, 16 and 24 pin groups individually. Add these groups into one ppi
function.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/pinctrl-adi2-bf54x.c b/drivers/pinctrl/pinctrl-adi2-bf54x.c
index ea9d9ab9cda1dc3c1342f83a00e1e8f40a0dc2df..008a29e92e56dffe8f8151b81aa364267a69ec56 100644 (file)
--- a/drivers/pinctrl/pinctrl-adi2-bf54x.c
+++ b/drivers/pinctrl/pinctrl-adi2-bf54x.c
@@ -309,39 +309,6 @@ static const unsigned keys_8x8_pins[] = {
        GPIO_PE4, GPIO_PE5, GPIO_PE6, GPIO_PE7,
 };
 
-static const struct adi_pin_group adi_pin_groups[] = {
-       ADI_PIN_GROUP("uart0grp", uart0_pins),
-       ADI_PIN_GROUP("uart1grp", uart1_pins),
-       ADI_PIN_GROUP("uart1ctsrtsgrp", uart1_ctsrts_pins),
-       ADI_PIN_GROUP("uart2grp", uart2_pins),
-       ADI_PIN_GROUP("uart3grp", uart3_pins),
-       ADI_PIN_GROUP("uart3ctsrtsgrp", uart3_ctsrts_pins),
-       ADI_PIN_GROUP("rsi0grp", rsi0_pins),
-       ADI_PIN_GROUP("spi0grp", spi0_pins),
-       ADI_PIN_GROUP("spi1grp", spi1_pins),
-       ADI_PIN_GROUP("twi0grp", twi0_pins),
-       ADI_PIN_GROUP("twi1grp", twi1_pins),
-       ADI_PIN_GROUP("rotarygrp", rotary_pins),
-       ADI_PIN_GROUP("can0grp", can0_pins),
-       ADI_PIN_GROUP("can1grp", can1_pins),
-       ADI_PIN_GROUP("smc0grp", smc0_pins),
-       ADI_PIN_GROUP("sport0grp", sport0_pins),
-       ADI_PIN_GROUP("sport1grp", sport1_pins),
-       ADI_PIN_GROUP("sport2grp", sport2_pins),
-       ADI_PIN_GROUP("sport3grp", sport3_pins),
-       ADI_PIN_GROUP("ppi0_8bgrp", ppi0_8b_pins),
-       ADI_PIN_GROUP("ppi0_16bgrp", ppi0_16b_pins),
-       ADI_PIN_GROUP("ppi0_24bgrp", ppi0_24b_pins),
-       ADI_PIN_GROUP("ppi1_8bgrp", ppi1_8b_pins),
-       ADI_PIN_GROUP("ppi1_16bgrp", ppi1_16b_pins),
-       ADI_PIN_GROUP("ppi2_8bgrp", ppi2_8b_pins),
-       ADI_PIN_GROUP("atapigrp", atapi_pins),
-       ADI_PIN_GROUP("atapialtergrp", atapi_alter_pins),
-       ADI_PIN_GROUP("nfc0grp", nfc0_pins),
-       ADI_PIN_GROUP("keys_4x4grp", keys_4x4_pins),
-       ADI_PIN_GROUP("keys_8x8grp", keys_8x8_pins),
-};
-
 static const unsigned short uart0_mux[] = {
        P_UART0_TX, P_UART0_RX,
        0
@@ -513,6 +480,39 @@ static const unsigned short keys_8x8_mux[] = {
        0
 };
 
+static const struct adi_pin_group adi_pin_groups[] = {
+       ADI_PIN_GROUP("uart0grp", uart0_pins, uart0_mux),
+       ADI_PIN_GROUP("uart1grp", uart1_pins, uart1_mux),
+       ADI_PIN_GROUP("uart1ctsrtsgrp", uart1_ctsrts_pins, uart1_ctsrts_mux),
+       ADI_PIN_GROUP("uart2grp", uart2_pins, uart2_mux),
+       ADI_PIN_GROUP("uart3grp", uart3_pins, uart3_mux),
+       ADI_PIN_GROUP("uart3ctsrtsgrp", uart3_ctsrts_pins, uart3_ctsrts_mux),
+       ADI_PIN_GROUP("rsi0grp", rsi0_pins, rsi0_mux),
+       ADI_PIN_GROUP("spi0grp", spi0_pins, spi0_mux),
+       ADI_PIN_GROUP("spi1grp", spi1_pins, spi1_mux),
+       ADI_PIN_GROUP("twi0grp", twi0_pins, twi0_mux),
+       ADI_PIN_GROUP("twi1grp", twi1_pins, twi1_mux),
+       ADI_PIN_GROUP("rotarygrp", rotary_pins, rotary_mux),
+       ADI_PIN_GROUP("can0grp", can0_pins, can0_mux),
+       ADI_PIN_GROUP("can1grp", can1_pins, can1_mux),
+       ADI_PIN_GROUP("smc0grp", smc0_pins, smc0_mux),
+       ADI_PIN_GROUP("sport0grp", sport0_pins, sport0_mux),
+       ADI_PIN_GROUP("sport1grp", sport1_pins, sport1_mux),
+       ADI_PIN_GROUP("sport2grp", sport2_pins, sport2_mux),
+       ADI_PIN_GROUP("sport3grp", sport3_pins, sport3_mux),
+       ADI_PIN_GROUP("ppi0_8bgrp", ppi0_8b_pins, ppi0_8b_mux),
+       ADI_PIN_GROUP("ppi0_16bgrp", ppi0_16b_pins, ppi0_16b_mux),
+       ADI_PIN_GROUP("ppi0_24bgrp", ppi0_24b_pins, ppi0_24b_mux),
+       ADI_PIN_GROUP("ppi1_8bgrp", ppi1_8b_pins, ppi1_8b_mux),
+       ADI_PIN_GROUP("ppi1_16bgrp", ppi1_16b_pins, ppi1_16b_mux),
+       ADI_PIN_GROUP("ppi2_8bgrp", ppi2_8b_pins, ppi2_8b_mux),
+       ADI_PIN_GROUP("atapigrp", atapi_pins, atapi_mux),
+       ADI_PIN_GROUP("atapialtergrp", atapi_alter_pins, atapi_alter_mux),
+       ADI_PIN_GROUP("nfc0grp", nfc0_pins, nfc0_mux),
+       ADI_PIN_GROUP("keys_4x4grp", keys_4x4_pins, keys_4x4_mux),
+       ADI_PIN_GROUP("keys_8x8grp", keys_8x8_pins, keys_8x8_mux),
+};
+
 static const char * const uart0grp[] = { "uart0grp" };
 static const char * const uart1grp[] = { "uart1grp" };
 static const char * const uart1ctsrtsgrp[] = { "uart1ctsrtsgrp" };
@@ -532,49 +532,45 @@ static const char * const sport0grp[] = { "sport0grp" };
 static const char * const sport1grp[] = { "sport1grp" };
 static const char * const sport2grp[] = { "sport2grp" };
 static const char * const sport3grp[] = { "sport3grp" };
-static const char * const ppi0_8bgrp[] = { "ppi0_8bgrp" };
-static const char * const ppi0_16bgrp[] = { "ppi0_16bgrp" };
-static const char * const ppi0_24bgrp[] = { "ppi0_24bgrp" };
-static const char * const ppi1_8bgrp[] = { "ppi1_8bgrp" };
-static const char * const ppi1_16bgrp[] = { "ppi1_16bgrp" };
-static const char * const ppi2_8bgrp[] = { "ppi2_8bgrp" };
+static const char * const ppi0grp[] = { "ppi0_8bgrp",
+                                       "ppi0_16bgrp",
+                                       "ppi0_24bgrp" };
+static const char * const ppi1grp[] = { "ppi1_8bgrp",
+                                       "ppi1_16bgrp" };
+static const char * const ppi2grp[] = { "ppi2_8bgrp" };
 static const char * const atapigrp[] = { "atapigrp" };
 static const char * const atapialtergrp[] = { "atapialtergrp" };
 static const char * const nfc0grp[] = { "nfc0grp" };
-static const char * const keys_4x4grp[] = { "keys_4x4grp" };
-static const char * const keys_8x8grp[] = { "keys_8x8grp" };
+static const char * const keysgrp[] = { "keys_4x4grp",
+                                       "keys_8x8grp" };
 
 static const struct adi_pmx_func adi_pmx_functions[] = {
-       ADI_PMX_FUNCTION("uart0", uart0grp, uart0_mux),
-       ADI_PMX_FUNCTION("uart1", uart1grp, uart1_mux),
-       ADI_PMX_FUNCTION("uart1_ctsrts", uart1ctsrtsgrp, uart1_ctsrts_mux),
-       ADI_PMX_FUNCTION("uart2", uart2grp, uart2_mux),
-       ADI_PMX_FUNCTION("uart3", uart3grp, uart3_mux),
-       ADI_PMX_FUNCTION("uart3_ctsrts", uart3ctsrtsgrp, uart3_ctsrts_mux),
-       ADI_PMX_FUNCTION("rsi0", rsi0grp, rsi0_mux),
-       ADI_PMX_FUNCTION("spi0", spi0grp, spi0_mux),
-       ADI_PMX_FUNCTION("spi1", spi1grp, spi1_mux),
-       ADI_PMX_FUNCTION("twi0", twi0grp, twi0_mux),
-       ADI_PMX_FUNCTION("twi1", twi1grp, twi1_mux),
-       ADI_PMX_FUNCTION("rotary", rotarygrp, rotary_mux),
-       ADI_PMX_FUNCTION("can0", can0grp, can0_mux),
-       ADI_PMX_FUNCTION("can1", can1grp, can1_mux),
-       ADI_PMX_FUNCTION("smc0", smc0grp, smc0_mux),
-       ADI_PMX_FUNCTION("sport0", sport0grp, sport0_mux),
-       ADI_PMX_FUNCTION("sport1", sport1grp, sport1_mux),
-       ADI_PMX_FUNCTION("sport2", sport2grp, sport2_mux),
-       ADI_PMX_FUNCTION("sport3", sport3grp, sport3_mux),
-       ADI_PMX_FUNCTION("ppi0_8b", ppi0_8bgrp, ppi0_8b_mux),
-       ADI_PMX_FUNCTION("ppi0_16b", ppi0_16bgrp, ppi0_16b_mux),
-       ADI_PMX_FUNCTION("ppi0_24b", ppi0_24bgrp, ppi0_24b_mux),
-       ADI_PMX_FUNCTION("ppi1_8b", ppi1_8bgrp, ppi1_8b_mux),
-       ADI_PMX_FUNCTION("ppi1_16b", ppi1_16bgrp, ppi1_16b_mux),
-       ADI_PMX_FUNCTION("ppi2_8b", ppi2_8bgrp, ppi2_8b_mux),
-       ADI_PMX_FUNCTION("atapi", atapigrp, atapi_mux),
-       ADI_PMX_FUNCTION("atapi_alter", atapialtergrp, atapi_alter_mux),
-       ADI_PMX_FUNCTION("nfc0", nfc0grp, nfc0_mux),
-       ADI_PMX_FUNCTION("keys_4x4", keys_4x4grp, keys_4x4_mux),
-       ADI_PMX_FUNCTION("keys_8x8", keys_8x8grp, keys_8x8_mux),
+       ADI_PMX_FUNCTION("uart0", uart0grp),
+       ADI_PMX_FUNCTION("uart1", uart1grp),
+       ADI_PMX_FUNCTION("uart1_ctsrts", uart1ctsrtsgrp),
+       ADI_PMX_FUNCTION("uart2", uart2grp),
+       ADI_PMX_FUNCTION("uart3", uart3grp),
+       ADI_PMX_FUNCTION("uart3_ctsrts", uart3ctsrtsgrp),
+       ADI_PMX_FUNCTION("rsi0", rsi0grp),
+       ADI_PMX_FUNCTION("spi0", spi0grp),
+       ADI_PMX_FUNCTION("spi1", spi1grp),
+       ADI_PMX_FUNCTION("twi0", twi0grp),
+       ADI_PMX_FUNCTION("twi1", twi1grp),
+       ADI_PMX_FUNCTION("rotary", rotarygrp),
+       ADI_PMX_FUNCTION("can0", can0grp),
+       ADI_PMX_FUNCTION("can1", can1grp),
+       ADI_PMX_FUNCTION("smc0", smc0grp),
+       ADI_PMX_FUNCTION("sport0", sport0grp),
+       ADI_PMX_FUNCTION("sport1", sport1grp),
+       ADI_PMX_FUNCTION("sport2", sport2grp),
+       ADI_PMX_FUNCTION("sport3", sport3grp),
+       ADI_PMX_FUNCTION("ppi0", ppi0grp),
+       ADI_PMX_FUNCTION("ppi1", ppi1grp),
+       ADI_PMX_FUNCTION("ppi2", ppi2grp),
+       ADI_PMX_FUNCTION("atapi", atapigrp),
+       ADI_PMX_FUNCTION("atapi_alter", atapialtergrp),
+       ADI_PMX_FUNCTION("nfc0", nfc0grp),
+       ADI_PMX_FUNCTION("keys", keysgrp),
 };
 
 static const struct adi_pinctrl_soc_data adi_bf54x_soc = {

diff --git a/drivers/pinctrl/pinctrl-adi2-bf60x.c b/drivers/pinctrl/pinctrl-adi2-bf60x.c
index bf57aea2826c737bcba2482614a2b690d0832b3e..4cb59fe9be7039154079f572af6a24634b9d5ac4 100644 (file)
--- a/drivers/pinctrl/pinctrl-adi2-bf60x.c
+++ b/drivers/pinctrl/pinctrl-adi2-bf60x.c
@@ -259,37 +259,6 @@ static const unsigned lp3_pins[] = {
        GPIO_PF12, GPIO_PF13, GPIO_PF14, GPIO_PF15,
 };
 
-static const struct adi_pin_group adi_pin_groups[] = {
-       ADI_PIN_GROUP("uart0grp", uart0_pins),
-       ADI_PIN_GROUP("uart0ctsrtsgrp", uart0_ctsrts_pins),
-       ADI_PIN_GROUP("uart1grp", uart1_pins),
-       ADI_PIN_GROUP("uart1ctsrtsgrp", uart1_ctsrts_pins),
-       ADI_PIN_GROUP("rsi0grp", rsi0_pins),
-       ADI_PIN_GROUP("eth0grp", eth0_pins),
-       ADI_PIN_GROUP("eth1grp", eth1_pins),
-       ADI_PIN_GROUP("spi0grp", spi0_pins),
-       ADI_PIN_GROUP("spi1grp", spi1_pins),
-       ADI_PIN_GROUP("twi0grp", twi0_pins),
-       ADI_PIN_GROUP("twi1grp", twi1_pins),
-       ADI_PIN_GROUP("rotarygrp", rotary_pins),
-       ADI_PIN_GROUP("can0grp", can0_pins),
-       ADI_PIN_GROUP("smc0grp", smc0_pins),
-       ADI_PIN_GROUP("sport0grp", sport0_pins),
-       ADI_PIN_GROUP("sport1grp", sport1_pins),
-       ADI_PIN_GROUP("sport2grp", sport2_pins),
-       ADI_PIN_GROUP("ppi0_8bgrp", ppi0_8b_pins),
-       ADI_PIN_GROUP("ppi0_16bgrp", ppi0_16b_pins),
-       ADI_PIN_GROUP("ppi0_24bgrp", ppi0_24b_pins),
-       ADI_PIN_GROUP("ppi1_8bgrp", ppi1_8b_pins),
-       ADI_PIN_GROUP("ppi1_16bgrp", ppi1_16b_pins),
-       ADI_PIN_GROUP("ppi2_8bgrp", ppi2_8b_pins),
-       ADI_PIN_GROUP("ppi2_16bgrp", ppi2_16b_pins),
-       ADI_PIN_GROUP("lp0grp", lp0_pins),
-       ADI_PIN_GROUP("lp1grp", lp1_pins),
-       ADI_PIN_GROUP("lp2grp", lp2_pins),
-       ADI_PIN_GROUP("lp3grp", lp3_pins),
-};
-
 static const unsigned short uart0_mux[] = {
        P_UART0_TX, P_UART0_RX,
        0
@@ -446,6 +415,37 @@ static const unsigned short lp3_mux[] = {
         0
 };
 
+static const struct adi_pin_group adi_pin_groups[] = {
+       ADI_PIN_GROUP("uart0grp", uart0_pins, uart0_mux),
+       ADI_PIN_GROUP("uart0ctsrtsgrp", uart0_ctsrts_pins, uart0_ctsrts_mux),
+       ADI_PIN_GROUP("uart1grp", uart1_pins, uart1_mux),
+       ADI_PIN_GROUP("uart1ctsrtsgrp", uart1_ctsrts_pins, uart1_ctsrts_mux),
+       ADI_PIN_GROUP("rsi0grp", rsi0_pins, rsi0_mux),
+       ADI_PIN_GROUP("eth0grp", eth0_pins, eth0_mux),
+       ADI_PIN_GROUP("eth1grp", eth1_pins, eth1_mux),
+       ADI_PIN_GROUP("spi0grp", spi0_pins, spi0_mux),
+       ADI_PIN_GROUP("spi1grp", spi1_pins, spi1_mux),
+       ADI_PIN_GROUP("twi0grp", twi0_pins, twi0_mux),
+       ADI_PIN_GROUP("twi1grp", twi1_pins, twi1_mux),
+       ADI_PIN_GROUP("rotarygrp", rotary_pins, rotary_mux),
+       ADI_PIN_GROUP("can0grp", can0_pins, can0_mux),
+       ADI_PIN_GROUP("smc0grp", smc0_pins, smc0_mux),
+       ADI_PIN_GROUP("sport0grp", sport0_pins, sport0_mux),
+       ADI_PIN_GROUP("sport1grp", sport1_pins, sport1_mux),
+       ADI_PIN_GROUP("sport2grp", sport2_pins, sport2_mux),
+       ADI_PIN_GROUP("ppi0_8bgrp", ppi0_8b_pins, ppi0_8b_mux),
+       ADI_PIN_GROUP("ppi0_16bgrp", ppi0_16b_pins, ppi0_16b_mux),
+       ADI_PIN_GROUP("ppi0_24bgrp", ppi0_24b_pins, ppi0_24b_mux),
+       ADI_PIN_GROUP("ppi1_8bgrp", ppi1_8b_pins, ppi1_8b_mux),
+       ADI_PIN_GROUP("ppi1_16bgrp", ppi1_16b_pins, ppi1_16b_mux),
+       ADI_PIN_GROUP("ppi2_8bgrp", ppi2_8b_pins, ppi2_8b_mux),
+       ADI_PIN_GROUP("ppi2_16bgrp", ppi2_16b_pins, ppi2_16b_mux),
+       ADI_PIN_GROUP("lp0grp", lp0_pins, lp0_mux),
+       ADI_PIN_GROUP("lp1grp", lp1_pins, lp1_mux),
+       ADI_PIN_GROUP("lp2grp", lp2_pins, lp2_mux),
+       ADI_PIN_GROUP("lp3grp", lp3_pins, lp3_mux),
+};
+
 static const char * const uart0grp[] = { "uart0grp" };
 static const char * const uart0ctsrtsgrp[] = { "uart0ctsrtsgrp" };
 static const char * const uart1grp[] = { "uart1grp" };
@@ -463,47 +463,43 @@ static const char * const smc0grp[] = { "smc0grp" };
 static const char * const sport0grp[] = { "sport0grp" };
 static const char * const sport1grp[] = { "sport1grp" };
 static const char * const sport2grp[] = { "sport2grp" };
-static const char * const ppi0_8bgrp[] = { "ppi0_8bgrp" };
-static const char * const ppi0_16bgrp[] = { "ppi0_16bgrp" };
-static const char * const ppi0_24bgrp[] = { "ppi0_24bgrp" };
-static const char * const ppi1_8bgrp[] = { "ppi1_8bgrp" };
-static const char * const ppi1_16bgrp[] = { "ppi1_16bgrp" };
-static const char * const ppi2_8bgrp[] = { "ppi2_8bgrp" };
-static const char * const ppi2_16bgrp[] = { "ppi2_16bgrp" };
+static const char * const ppi0grp[] = { "ppi0_8bgrp",
+                                       "ppi0_16bgrp",
+                                       "ppi0_24bgrp" };
+static const char * const ppi1grp[] = { "ppi1_8bgrp",
+                                       "ppi1_16bgrp" };
+static const char * const ppi2grp[] = { "ppi2_8bgrp",
+                                       "ppi2_16bgrp" };
 static const char * const lp0grp[] = { "lp0grp" };
 static const char * const lp1grp[] = { "lp1grp" };
 static const char * const lp2grp[] = { "lp2grp" };
 static const char * const lp3grp[] = { "lp3grp" };
 
 static const struct adi_pmx_func adi_pmx_functions[] = {
-       ADI_PMX_FUNCTION("uart0", uart0grp, uart0_mux),
-       ADI_PMX_FUNCTION("uart0_ctsrts", uart0ctsrtsgrp, uart0_ctsrts_mux),
-       ADI_PMX_FUNCTION("uart1", uart1grp, uart1_mux),
-       ADI_PMX_FUNCTION("uart1_ctsrts", uart1ctsrtsgrp, uart1_ctsrts_mux),
-       ADI_PMX_FUNCTION("rsi0", rsi0grp, rsi0_mux),
-       ADI_PMX_FUNCTION("eth0", eth0grp, eth0_mux),
-       ADI_PMX_FUNCTION("eth1", eth1grp, eth1_mux),
-       ADI_PMX_FUNCTION("spi0", spi0grp, spi0_mux),
-       ADI_PMX_FUNCTION("spi1", spi1grp, spi1_mux),
-       ADI_PMX_FUNCTION("twi0", twi0grp, twi0_mux),
-       ADI_PMX_FUNCTION("twi1", twi1grp, twi1_mux),
-       ADI_PMX_FUNCTION("rotary", rotarygrp, rotary_mux),
-       ADI_PMX_FUNCTION("can0", can0grp, can0_mux),
-       ADI_PMX_FUNCTION("smc0", smc0grp, smc0_mux),
-       ADI_PMX_FUNCTION("sport0", sport0grp, sport0_mux),
-       ADI_PMX_FUNCTION("sport1", sport1grp, sport1_mux),
-       ADI_PMX_FUNCTION("sport2", sport2grp, sport2_mux),
-       ADI_PMX_FUNCTION("ppi0_8b", ppi0_8bgrp, ppi0_8b_mux),
-       ADI_PMX_FUNCTION("ppi0_16b", ppi0_16bgrp, ppi0_16b_mux),
-       ADI_PMX_FUNCTION("ppi0_24b", ppi0_24bgrp, ppi0_24b_mux),
-       ADI_PMX_FUNCTION("ppi1_8b", ppi1_8bgrp, ppi1_8b_mux),
-       ADI_PMX_FUNCTION("ppi1_16b", ppi1_16bgrp, ppi1_16b_mux),
-       ADI_PMX_FUNCTION("ppi2_8b", ppi2_8bgrp, ppi2_8b_mux),
-       ADI_PMX_FUNCTION("ppi2_16b", ppi2_16bgrp, ppi2_16b_mux),
-       ADI_PMX_FUNCTION("lp0", lp0grp, lp0_mux),
-       ADI_PMX_FUNCTION("lp1", lp1grp, lp1_mux),
-       ADI_PMX_FUNCTION("lp2", lp2grp, lp2_mux),
-       ADI_PMX_FUNCTION("lp3", lp3grp, lp3_mux),
+       ADI_PMX_FUNCTION("uart0", uart0grp),
+       ADI_PMX_FUNCTION("uart0_ctsrts", uart0ctsrtsgrp),
+       ADI_PMX_FUNCTION("uart1", uart1grp),
+       ADI_PMX_FUNCTION("uart1_ctsrts", uart1ctsrtsgrp),
+       ADI_PMX_FUNCTION("rsi0", rsi0grp),
+       ADI_PMX_FUNCTION("eth0", eth0grp),
+       ADI_PMX_FUNCTION("eth1", eth1grp),
+       ADI_PMX_FUNCTION("spi0", spi0grp),
+       ADI_PMX_FUNCTION("spi1", spi1grp),
+       ADI_PMX_FUNCTION("twi0", twi0grp),
+       ADI_PMX_FUNCTION("twi1", twi1grp),
+       ADI_PMX_FUNCTION("rotary", rotarygrp),
+       ADI_PMX_FUNCTION("can0", can0grp),
+       ADI_PMX_FUNCTION("smc0", smc0grp),
+       ADI_PMX_FUNCTION("sport0", sport0grp),
+       ADI_PMX_FUNCTION("sport1", sport1grp),
+       ADI_PMX_FUNCTION("sport2", sport2grp),
+       ADI_PMX_FUNCTION("ppi0", ppi0grp),
+       ADI_PMX_FUNCTION("ppi1", ppi1grp),
+       ADI_PMX_FUNCTION("ppi2", ppi2grp),
+       ADI_PMX_FUNCTION("lp0", lp0grp),
+       ADI_PMX_FUNCTION("lp1", lp1grp),
+       ADI_PMX_FUNCTION("lp2", lp2grp),
+       ADI_PMX_FUNCTION("lp3", lp3grp),
 };
 
 static const struct adi_pinctrl_soc_data adi_bf60x_soc = {

diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
index 72450a120a54cff8a3d454ec7206023072c6325e..200ea1e72d4040afb75254beef022948d45b2811 100644 (file)
--- a/drivers/pinctrl/pinctrl-adi2.c
+++ b/drivers/pinctrl/pinctrl-adi2.c
@@ -618,8 +618,8 @@ static struct pinctrl_ops adi_pctrl_ops = {
        .get_group_pins = adi_get_group_pins,
 };
 
-static int adi_pinmux_enable(struct pinctrl_dev *pctldev, unsigned selector,
-       unsigned group)
+static int adi_pinmux_enable(struct pinctrl_dev *pctldev, unsigned func_id,
+       unsigned group_id)
 {
        struct adi_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctldev);
        struct gpio_port *port;
@@ -627,7 +627,7 @@ static int adi_pinmux_enable(struct pinctrl_dev *pctldev, unsigned selector,
        unsigned long flags;
        unsigned short *mux, pin;
 
-       mux = (unsigned short *)pinctrl->soc->functions[selector].mux;
+       mux = (unsigned short *)pinctrl->soc->groups[group_id].mux;
 
        while (*mux) {
                pin = P_IDENT(*mux);
@@ -651,8 +651,8 @@ static int adi_pinmux_enable(struct pinctrl_dev *pctldev, unsigned selector,
        return 0;
 }
 
-static void adi_pinmux_disable(struct pinctrl_dev *pctldev, unsigned selector,
-       unsigned group)
+static void adi_pinmux_disable(struct pinctrl_dev *pctldev, unsigned func_id,
+       unsigned group_id)
 {
        struct adi_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctldev);
        struct gpio_port *port;
@@ -660,7 +660,7 @@ static void adi_pinmux_disable(struct pinctrl_dev *pctldev, unsigned selector,
        unsigned long flags;
        unsigned short *mux, pin;
 
-       mux = (unsigned short *)pinctrl->soc->functions[selector].mux;
+       mux = (unsigned short *)pinctrl->soc->groups[group_id].mux;
 
        while (*mux) {
                pin = P_IDENT(*mux);

diff --git a/drivers/pinctrl/pinctrl-adi2.h b/drivers/pinctrl/pinctrl-adi2.h
index 1f06f8df1fa380c6d0e832d24bdf28dd428aed1e..3ca29738213f7ba5895a886dfbf7977195acd043 100644 (file)
--- a/drivers/pinctrl/pinctrl-adi2.h
+++ b/drivers/pinctrl/pinctrl-adi2.h
@@ -21,13 +21,15 @@ struct adi_pin_group {
        const char *name;
        const unsigned *pins;
        const unsigned num;
+       const unsigned short *mux;
 };
 
-#define ADI_PIN_GROUP(n, p)  \
+#define ADI_PIN_GROUP(n, p, m)  \
        {                       \
                .name = n,      \
                .pins = p,      \
                .num = ARRAY_SIZE(p),   \
+               .mux = m,                       \
        }
 
  /**
@@ -41,15 +43,13 @@ struct adi_pmx_func {
        const char *name;
        const char * const *groups;
        const unsigned num_groups;
-       const unsigned short *mux;
 };
 
-#define ADI_PMX_FUNCTION(n, g, m)              \
+#define ADI_PMX_FUNCTION(n, g)         \
        {                                       \
                .name = n,                      \
                .groups = g,                    \
                .num_groups = ARRAY_SIZE(g),    \
-               .mux = m,                       \
        }
 
 /**