]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
pinctrl: mvebu: armada-39x: normalize ref clock naming
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 9 Jun 2015 16:47:16 +0000 (18:47 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 10 Jun 2015 12:08:44 +0000 (14:08 +0200)
This commit normalizes the subnames of the reference clock MPP pins in
the Armada 39x pinctrl driver to match with the name used on other
SoCs.

Since only the subnames are changed, DT backward compatibility is not
affected.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/mvebu/pinctrl-armada-39x.c

index 433291a1540a0b0df9d641f39961d01507846f75..08ee427d501501ca127f0722deadd41a11ffd480 100644 (file)
@@ -205,7 +205,7 @@ static struct mvebu_mpp_mode armada_39x_mpp_modes[] = {
                 MPP_VAR_FUNCTION(5, "dev",     "ad1",      V_88F6920_PLUS)),
        MPP_MODE(35,
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),
-                MPP_VAR_FUNCTION(1, "ref",     "clk",      V_88F6920_PLUS),
+                MPP_VAR_FUNCTION(1, "ref",     "clk_out1", V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(5, "dev",     "a1",       V_88F6920_PLUS)),
        MPP_MODE(36,
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),
@@ -217,7 +217,7 @@ static struct mvebu_mpp_mode armada_39x_mpp_modes[] = {
                 MPP_VAR_FUNCTION(8, "ge",      "rxclk",    V_88F6920_PLUS)),
        MPP_MODE(38,
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),
-                MPP_VAR_FUNCTION(3, "ref",     "clk",      V_88F6920_PLUS),
+                MPP_VAR_FUNCTION(3, "ref",     "clk_out0", V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(4, "sd0",     "d0",       V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(5, "dev",     "ad4",      V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(8, "ge",      "rxd1",     V_88F6920_PLUS)),
@@ -263,12 +263,12 @@ static struct mvebu_mpp_mode armada_39x_mpp_modes[] = {
                 MPP_VAR_FUNCTION(7, "led",     "clk",      V_88F6920_PLUS)),
        MPP_MODE(45,
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),
-                MPP_VAR_FUNCTION(1, "ref",     "clk",      V_88F6920_PLUS),
+                MPP_VAR_FUNCTION(1, "ref",     "clk_out0", V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(2, "pcie0",   "rstout",   V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(6, "ua1",     "rxd",      V_88F6920_PLUS)),
        MPP_MODE(46,
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),
-                MPP_VAR_FUNCTION(1, "ref",     "clk",      V_88F6920_PLUS),
+                MPP_VAR_FUNCTION(1, "ref",     "clk_out1", V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(2, "pcie0",   "rstout",   V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(6, "ua1",     "txd",      V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(7, "led",     "stb",      V_88F6920_PLUS)),