Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[karo-tx-linux.git] / drivers / pinctrl / berlin / berlin-bg2q.c

diff --git a/drivers/pinctrl/berlin/berlin-bg2q.c b/drivers/pinctrl/berlin/berlin-bg2q.c
index ba7a8a8ad010fc3509471a6b5fe2332bbceab76d..a466054a8206e31f15edab4c85d933d8652812b8 100644 (file)
--- a/drivers/pinctrl/berlin/berlin-bg2q.c
+++ b/drivers/pinctrl/berlin/berlin-bg2q.c
@@ -59,21 +59,21 @@ static const struct berlin_desc_group berlin2q_soc_pinctrl_groups[] = {
                        BERLIN_PINCTRL_FUNCTION(0x2, "gpio"),
                        BERLIN_PINCTRL_FUNCTION(0x3, "eddc")),
        BERLIN_PINCTRL_GROUP("G8", 0x18, 0x3, 0x18,
-                       BERLIN_PINCTRL_FUNCTION(0x0, "spi1"),
+                       BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* CLK/SDI/SDO */
                        BERLIN_PINCTRL_FUNCTION(0x1, "gpio")),
        BERLIN_PINCTRL_GROUP("G9", 0x18, 0x3, 0x1b,
-                       BERLIN_PINCTRL_FUNCTION(0x0, "spi1"),
+                       BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SS0n/SS1n */
                        BERLIN_PINCTRL_FUNCTION(0x1, "gpio"),
                        BERLIN_PINCTRL_FUNCTION(0x5, "sata")),
        BERLIN_PINCTRL_GROUP("G10", 0x1c, 0x3, 0x00,
                        BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
-                       BERLIN_PINCTRL_FUNCTION(0x1, "spi1"),
+                       BERLIN_PINCTRL_FUNCTION(0x1, "spi1"), /* SS2n */
                        BERLIN_PINCTRL_FUNCTION(0x3, "i2s0"),
                        BERLIN_PINCTRL_FUNCTION(0x4, "pwm"),
                        BERLIN_PINCTRL_FUNCTION(0x5, "sata")),
        BERLIN_PINCTRL_GROUP("G11", 0x1c, 0x3, 0x03,
                        BERLIN_PINCTRL_FUNCTION(0x0, "jtag"),
-                       BERLIN_PINCTRL_FUNCTION(0x1, "spi1"),
+                       BERLIN_PINCTRL_FUNCTION(0x1, "spi1"), /* SS3n */
                        BERLIN_PINCTRL_FUNCTION(0x2, "gpio"),
                        BERLIN_PINCTRL_FUNCTION(0x3, "i2s1"),
                        BERLIN_PINCTRL_FUNCTION(0x4, "pwm"),
@@ -301,19 +301,19 @@ static const struct berlin_desc_group berlin2q_sysmgr_pinctrl_groups[] = {
        /* GSM */
        BERLIN_PINCTRL_GROUP("GSM0", 0x40, 0x2, 0x00,
                        BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
-                       BERLIN_PINCTRL_FUNCTION(0x1, "spi2"),
+                       BERLIN_PINCTRL_FUNCTION(0x1, "spi2"), /* SS0n */
                        BERLIN_PINCTRL_FUNCTION(0x2, "eth1")),
        BERLIN_PINCTRL_GROUP("GSM1", 0x40, 0x2, 0x02,
                        BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
-                       BERLIN_PINCTRL_FUNCTION(0x1, "spi2"),
+                       BERLIN_PINCTRL_FUNCTION(0x1, "spi2"), /* SS1n */
                        BERLIN_PINCTRL_FUNCTION(0x2, "eth1")),
        BERLIN_PINCTRL_GROUP("GSM2", 0x40, 0x2, 0x04,
                        BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
-                       BERLIN_PINCTRL_FUNCTION(0x1, "spi2"),
+                       BERLIN_PINCTRL_FUNCTION(0x1, "spi2"), /* SS2n/SS3n */
                        BERLIN_PINCTRL_FUNCTION(0x2, "eddc")),
        BERLIN_PINCTRL_GROUP("GSM3", 0x40, 0x2, 0x06,
                        BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
-                       BERLIN_PINCTRL_FUNCTION(0x1, "spi2"),
+                       BERLIN_PINCTRL_FUNCTION(0x1, "spi2"), /* CLK/SDO */
                        BERLIN_PINCTRL_FUNCTION(0x2, "eddc")),
        BERLIN_PINCTRL_GROUP("GSM4", 0x40, 0x1, 0x08,
                        BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),