These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / pinctrl / mvebu / pinctrl-armada-370.c

diff --git a/kernel/drivers/pinctrl/mvebu/pinctrl-armada-370.c b/kernel/drivers/pinctrl/mvebu/pinctrl-armada-370.c
index 1eb084c..73dc1bc 100644 (file)
--- a/kernel/drivers/pinctrl/mvebu/pinctrl-armada-370.c
+++ b/kernel/drivers/pinctrl/mvebu/pinctrl-armada-370.c
@@ -52,12 +52,12 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
           MPP_FUNCTION(0x2, "uart0", "rxd")),
        MPP_MODE(4,
           MPP_FUNCTION(0x0, "gpio", NULL),
-          MPP_FUNCTION(0x1, "cpu_pd", "vdd")),
+          MPP_FUNCTION(0x1, "vdd", "cpu-pd")),
        MPP_MODE(5,
           MPP_FUNCTION(0x0, "gpo", NULL),
-          MPP_FUNCTION(0x1, "ge0", "txclko"),
+          MPP_FUNCTION(0x1, "ge0", "txclkout"),
           MPP_FUNCTION(0x2, "uart1", "txd"),
-          MPP_FUNCTION(0x4, "spi1", "clk"),
+          MPP_FUNCTION(0x4, "spi1", "sck"),
           MPP_FUNCTION(0x5, "audio", "mclk")),
        MPP_MODE(6,
           MPP_FUNCTION(0x0, "gpio", NULL),
@@ -68,7 +68,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
        MPP_MODE(7,
           MPP_FUNCTION(0x0, "gpo", NULL),
           MPP_FUNCTION(0x1, "ge0", "txd1"),
-          MPP_FUNCTION(0x4, "tdm", "tdx"),
+          MPP_FUNCTION(0x4, "tdm", "dtx"),
           MPP_FUNCTION(0x5, "audio", "lrclk")),
        MPP_MODE(8,
           MPP_FUNCTION(0x0, "gpio", NULL),
@@ -207,11 +207,11 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
           MPP_FUNCTION(0x2, "spi0", "cs0")),
        MPP_MODE(34,
           MPP_FUNCTION(0x0, "gpo", NULL),
-          MPP_FUNCTION(0x1, "dev", "wen0"),
+          MPP_FUNCTION(0x1, "dev", "we0"),
           MPP_FUNCTION(0x2, "spi0", "mosi")),
        MPP_MODE(35,
           MPP_FUNCTION(0x0, "gpo", NULL),
-          MPP_FUNCTION(0x1, "dev", "oen"),
+          MPP_FUNCTION(0x1, "dev", "oe"),
           MPP_FUNCTION(0x2, "spi0", "sck")),
        MPP_MODE(36,
           MPP_FUNCTION(0x0, "gpo", NULL),
@@ -348,13 +348,13 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
           MPP_FUNCTION(0x1, "dev", "ale1"),
           MPP_FUNCTION(0x2, "uart1", "rxd"),
           MPP_FUNCTION(0x3, "sata0", "prsnt"),
-          MPP_FUNCTION(0x4, "pcie", "rst-out"),
+          MPP_FUNCTION(0x4, "pcie", "rstout"),
           MPP_FUNCTION(0x5, "audio", "sdi")),
        MPP_MODE(61,
           MPP_FUNCTION(0x0, "gpo", NULL),
-          MPP_FUNCTION(0x1, "dev", "wen1"),
+          MPP_FUNCTION(0x1, "dev", "we1"),
           MPP_FUNCTION(0x2, "uart1", "txd"),
-          MPP_FUNCTION(0x5, "audio", "rclk")),
+          MPP_FUNCTION(0x5, "audio", "lrclk")),
        MPP_MODE(62,
           MPP_FUNCTION(0x0, "gpio", NULL),
           MPP_FUNCTION(0x1, "dev", "a2"),