]> git.efficios.com Git - deliverable/linux.git/commitdiff
pinctrl: sunxi: Rename wemac functions to emac
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Wed, 27 Mar 2013 13:12:33 +0000 (14:12 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 9 Apr 2013 08:47:52 +0000 (10:47 +0200)
The pin functions associated to the ethernet controller were introduced
with the label "wemac", which was the name of the ethernet driver in the
allwinner source tree, while the real name of the IP is actually "emac",
as advertised in several documents including the datasheet.

Since this is part of the device tree bindings, and that these part of
the bindings have not yet be released in a kernel version, it seems like
the good timing to change it and assure consistency.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-sunxi.c

index 617d351a0a44b9ac04fcd65ed2da6a20cf071509..c52fc2c087327c6239c867bec7553a4eadd99d0c 100644 (file)
@@ -32,101 +32,101 @@ static const struct sunxi_desc_pin sun4i_a10_pins[] = {
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA0,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ERXD3 */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ERXD3 */
                SUNXI_FUNCTION(0x3, "spi1"),            /* CS0 */
                SUNXI_FUNCTION(0x4, "uart2")),          /* RTS */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA1,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ERXD2 */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ERXD2 */
                SUNXI_FUNCTION(0x3, "spi1"),            /* CLK */
                SUNXI_FUNCTION(0x4, "uart2")),          /* CTS */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA2,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ERXD1 */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ERXD1 */
                SUNXI_FUNCTION(0x3, "spi1"),            /* MOSI */
                SUNXI_FUNCTION(0x4, "uart2")),          /* TX */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA3,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ERXD0 */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ERXD0 */
                SUNXI_FUNCTION(0x3, "spi1"),            /* MISO */
                SUNXI_FUNCTION(0x4, "uart2")),          /* RX */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA4,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ETXD3 */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ETXD3 */
                SUNXI_FUNCTION(0x3, "spi1")),           /* CS1 */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA5,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ETXD2 */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ETXD2 */
                SUNXI_FUNCTION(0x3, "spi3")),           /* CS0 */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA6,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ETXD1 */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ETXD1 */
                SUNXI_FUNCTION(0x3, "spi3")),           /* CLK */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA7,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ETXD0 */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ETXD0 */
                SUNXI_FUNCTION(0x3, "spi3")),           /* MOSI */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA8,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ERXCK */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ERXCK */
                SUNXI_FUNCTION(0x3, "spi3")),           /* MISO */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA9,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ERXERR */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ERXERR */
                SUNXI_FUNCTION(0x3, "spi3")),           /* CS1 */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA10,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ERXDV */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ERXDV */
                SUNXI_FUNCTION(0x4, "uart1")),          /* TX */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA11,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* EMDC */
+               SUNXI_FUNCTION(0x2, "emac"),            /* EMDC */
                SUNXI_FUNCTION(0x4, "uart1")),          /* RX */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA12,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* EMDIO */
+               SUNXI_FUNCTION(0x2, "emac"),            /* EMDIO */
                SUNXI_FUNCTION(0x3, "uart6"),           /* TX */
                SUNXI_FUNCTION(0x4, "uart1")),          /* RTS */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA13,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ETXEN */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ETXEN */
                SUNXI_FUNCTION(0x3, "uart6"),           /* RX */
                SUNXI_FUNCTION(0x4, "uart1")),          /* CTS */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA14,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ETXCK */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ETXCK */
                SUNXI_FUNCTION(0x3, "uart7"),           /* TX */
                SUNXI_FUNCTION(0x4, "uart1")),          /* DTR */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA15,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ECRS */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ECRS */
                SUNXI_FUNCTION(0x3, "uart7"),           /* RX */
                SUNXI_FUNCTION(0x4, "uart1")),          /* DSR */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA16,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ECOL */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ECOL */
                SUNXI_FUNCTION(0x3, "can"),             /* TX */
                SUNXI_FUNCTION(0x4, "uart1")),          /* DCD */
        SUNXI_PIN(SUNXI_PINCTRL_PIN_PA17,
                SUNXI_FUNCTION(0x0, "gpio_in"),
                SUNXI_FUNCTION(0x1, "gpio_out"),
-               SUNXI_FUNCTION(0x2, "wemac"),           /* ETXERR */
+               SUNXI_FUNCTION(0x2, "emac"),            /* ETXERR */
                SUNXI_FUNCTION(0x3, "can"),             /* RX */
                SUNXI_FUNCTION(0x4, "uart1")),          /* RING */
        /* Hole */
This page took 0.031821 seconds and 5 git commands to generate.