summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Tenart <antoine.tenart@free-electrons.com>2015-06-02 11:37:47 +0200
committerLinus Walleij <linus.walleij@linaro.org>2015-06-10 09:15:27 +0200
commitbcb5f5b4f4176d5d413f8491c5f8d4b02b36018b (patch)
tree5ad053e02d0ceca0d5b74b461d740b0b4e334308
parent7164873e7c69d6bab74726debc3b495a86332b1f (diff)
downloadlinux-stable-bcb5f5b4f4176d5d413f8491c5f8d4b02b36018b.tar.gz
linux-stable-bcb5f5b4f4176d5d413f8491c5f8d4b02b36018b.tar.bz2
linux-stable-bcb5f5b4f4176d5d413f8491c5f8d4b02b36018b.zip
pinctrl: berlin: fix spi1 SS0n function name
Rename function ss0 to spi1 to be consistent with the other Berlin function names. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/berlin/berlin-bg2cd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/berlin/berlin-bg2cd.c b/drivers/pinctrl/berlin/berlin-bg2cd.c
index 19ac5a22c947..3fc05fb6ccf0 100644
--- a/drivers/pinctrl/berlin/berlin-bg2cd.c
+++ b/drivers/pinctrl/berlin/berlin-bg2cd.c
@@ -68,7 +68,7 @@ static const struct berlin_desc_group berlin2cd_soc_pinctrl_groups[] = {
BERLIN_PINCTRL_FUNCTION(0x1, "twsi1"),
BERLIN_PINCTRL_FUNCTION(0x2, "gpio")),
BERLIN_PINCTRL_GROUP("G8", 0x00, 0x3, 0x10,
- BERLIN_PINCTRL_FUNCTION(0x0, "ss0"),
+ BERLIN_PINCTRL_FUNCTION(0x0, "spi1"),
BERLIN_PINCTRL_FUNCTION(0x1, "gpio")),
BERLIN_PINCTRL_GROUP("G9", 0x00, 0x3, 0x13,
BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),