Code Review / kvmfornfv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / pinctrl / mvebu / pinctrl-armada-375.c
diff --git a/kernel/drivers/pinctrl/mvebu/pinctrl-armada-375.c b/kernel/drivers/pinctrl/mvebu/pinctrl-armada-375.c
index 203291b..54e9fbd 100644 (file)
--- a/kernel/drivers/pinctrl/mvebu/pinctrl-armada-375.c
+++ b/kernel/drivers/pinctrl/mvebu/pinctrl-armada-375.c
@@ -51,7 +51,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
        MPP_MODE(2,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x1, "dev", "ad4"),
-                MPP_FUNCTION(0x2, "ptp", "eventreq"),
+                MPP_FUNCTION(0x2, "ptp", "evreq"),
                 MPP_FUNCTION(0x3, "led", "c0"),
                 MPP_FUNCTION(0x4, "audio", "sdi"),
                 MPP_FUNCTION(0x5, "nand", "io4"),
@@ -59,7 +59,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
        MPP_MODE(3,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x1, "dev", "ad5"),
-                MPP_FUNCTION(0x2, "ptp", "triggen"),
+                MPP_FUNCTION(0x2, "ptp", "trig"),
                 MPP_FUNCTION(0x3, "led", "p3"),
                 MPP_FUNCTION(0x4, "audio", "mclk"),
                 MPP_FUNCTION(0x5, "nand", "io5"),
@@ -81,7 +81,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x1, "dev", "ad0"),
                 MPP_FUNCTION(0x3, "led", "p1"),
-                MPP_FUNCTION(0x4, "audio", "rclk"),
+                MPP_FUNCTION(0x4, "audio", "lrclk"),
                 MPP_FUNCTION(0x5, "nand", "io0")),
        MPP_MODE(7,
                 MPP_FUNCTION(0x0, "gpio", NULL),
@@ -120,9 +120,9 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x5, "nand", "ale")),
        MPP_MODE(13,
                 MPP_FUNCTION(0x0, "gpio", NULL),
-                MPP_FUNCTION(0x1, "dev", "readyn"),
-                MPP_FUNCTION(0x2, "pcie0", "rstoutn"),
-                MPP_FUNCTION(0x3, "pcie1", "rstoutn"),
+                MPP_FUNCTION(0x1, "dev", "ready"),
+                MPP_FUNCTION(0x2, "pcie0", "rstout"),
+                MPP_FUNCTION(0x3, "pcie1", "rstout"),
                 MPP_FUNCTION(0x5, "nand", "rb"),
                 MPP_FUNCTION(0x6, "spi1", "mosi")),
        MPP_MODE(14,
@@ -141,10 +141,10 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x2, "uart0", "rxd")),
        MPP_MODE(18,
                 MPP_FUNCTION(0x0, "gpio", NULL),
-                MPP_FUNCTION(0x2, "tdm", "intn")),
+                MPP_FUNCTION(0x2, "tdm", "int")),
        MPP_MODE(19,
                 MPP_FUNCTION(0x0, "gpio", NULL),
-                MPP_FUNCTION(0x2, "tdm", "rstn")),
+                MPP_FUNCTION(0x2, "tdm", "rst")),
        MPP_MODE(20,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x2, "tdm", "pclk")),
@@ -201,13 +201,13 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x2, "ge1", "rxclk"),
                 MPP_FUNCTION(0x3, "sd", "d3"),
                 MPP_FUNCTION(0x5, "spi0", "sck"),
-                MPP_FUNCTION(0x6, "pcie0", "rstoutn")),
+                MPP_FUNCTION(0x6, "pcie0", "rstout")),
        MPP_MODE(30,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x2, "ge1", "txd0"),
                 MPP_FUNCTION(0x3, "spi1", "cs0"),
                 MPP_FUNCTION(0x5, "led", "p3"),
-                MPP_FUNCTION(0x6, "ptp", "eventreq")),
+                MPP_FUNCTION(0x6, "ptp", "evreq")),
        MPP_MODE(31,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x2, "ge1", "txd1"),
@@ -217,7 +217,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x2, "ge1", "txd2"),
                 MPP_FUNCTION(0x3, "spi1", "sck"),
-                MPP_FUNCTION(0x4, "ptp", "triggen"),
+                MPP_FUNCTION(0x4, "ptp", "trig"),
                 MPP_FUNCTION(0x5, "led", "c0")),
        MPP_MODE(33,
                 MPP_FUNCTION(0x0, "gpio", NULL),
@@ -242,7 +242,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
        MPP_MODE(37,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x1, "pcie0", "clkreq"),
-                MPP_FUNCTION(0x2, "tdm", "intn"),
+                MPP_FUNCTION(0x2, "tdm", "int"),
                 MPP_FUNCTION(0x4, "ge", "mdc")),
        MPP_MODE(38,
                 MPP_FUNCTION(0x0, "gpio", NULL),
@@ -276,7 +276,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
        MPP_MODE(45,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x2, "spi0", "cs2"),
-                MPP_FUNCTION(0x4, "pcie0", "rstoutn"),
+                MPP_FUNCTION(0x4, "pcie0", "rstout"),
                 MPP_FUNCTION(0x5, "led", "c2"),
                 MPP_FUNCTION(0x6, "spi1", "cs2")),
        MPP_MODE(46,
@@ -284,13 +284,13 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x1, "led", "p0"),
                 MPP_FUNCTION(0x2, "ge0", "txd0"),
                 MPP_FUNCTION(0x3, "ge1", "txd0"),
-                MPP_FUNCTION(0x6, "dev", "wen1")),
+                MPP_FUNCTION(0x6, "dev", "we1")),
        MPP_MODE(47,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x1, "led", "p1"),
                 MPP_FUNCTION(0x2, "ge0", "txd1"),
                 MPP_FUNCTION(0x3, "ge1", "txd1"),
-                MPP_FUNCTION(0x5, "ptp", "triggen"),
+                MPP_FUNCTION(0x5, "ptp", "trig"),
                 MPP_FUNCTION(0x6, "dev", "ale0")),
        MPP_MODE(48,
                 MPP_FUNCTION(0x0, "gpio", NULL),
@@ -309,7 +309,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x1, "led", "c0"),
                 MPP_FUNCTION(0x2, "ge0", "rxd0"),
                 MPP_FUNCTION(0x3, "ge1", "rxd0"),
-                MPP_FUNCTION(0x5, "ptp", "eventreq"),
+                MPP_FUNCTION(0x5, "ptp", "evreq"),
                 MPP_FUNCTION(0x6, "dev", "ad12")),
        MPP_MODE(51,
                 MPP_FUNCTION(0x0, "gpio", NULL),
@@ -326,14 +326,14 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x6, "dev", "ad9")),
        MPP_MODE(53,
                 MPP_FUNCTION(0x0, "gpio", NULL),
-                MPP_FUNCTION(0x1, "pcie1", "rstoutn"),
+                MPP_FUNCTION(0x1, "pcie1", "rstout"),
                 MPP_FUNCTION(0x2, "ge0", "rxd3"),
                 MPP_FUNCTION(0x3, "ge1", "rxd3"),
                 MPP_FUNCTION(0x5, "i2c0", "sck"),
                 MPP_FUNCTION(0x6, "dev", "ad10")),
        MPP_MODE(54,
                 MPP_FUNCTION(0x0, "gpio", NULL),
-                MPP_FUNCTION(0x1, "pcie0", "rstoutn"),
+                MPP_FUNCTION(0x1, "pcie0", "rstout"),
                 MPP_FUNCTION(0x2, "ge0", "rxctl"),
                 MPP_FUNCTION(0x3, "ge1", "rxctl"),
                 MPP_FUNCTION(0x6, "dev", "ad11")),
@@ -351,7 +351,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x2, "ge0", "txctl"),
                 MPP_FUNCTION(0x3, "ge1", "txctl"),
-                MPP_FUNCTION(0x6, "dev", "wen0")),
+                MPP_FUNCTION(0x6, "dev", "we0")),
        MPP_MODE(58,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x4, "led", "c0")),
@@ -377,9 +377,9 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x6, "dev", "ad15")),
        MPP_MODE(63,
                 MPP_FUNCTION(0x0, "gpio", NULL),
-                MPP_FUNCTION(0x2, "ptp", "triggen"),
+                MPP_FUNCTION(0x2, "ptp", "trig"),
                 MPP_FUNCTION(0x4, "led", "p2"),
-                MPP_FUNCTION(0x6, "dev", "burst")),
+                MPP_FUNCTION(0x6, "dev", "burst/last")),
        MPP_MODE(64,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x2, "dram", "vttctrl"),
@@ -389,9 +389,9 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x1, "sata1", "prsnt")),
        MPP_MODE(66,
                 MPP_FUNCTION(0x0, "gpio", NULL),
-                MPP_FUNCTION(0x2, "ptp", "eventreq"),
+                MPP_FUNCTION(0x2, "ptp", "evreq"),
                 MPP_FUNCTION(0x4, "spi1", "cs3"),
-                MPP_FUNCTION(0x5, "pcie0", "rstoutn"),
+                MPP_FUNCTION(0x5, "pcie0", "rstout"),
                 MPP_FUNCTION(0x6, "dev", "cs3")),
 };