Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland...

[~andy/linux] / arch / arm / mach-u300 / core.c

diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 697930761b3ec1f3b7cb8ce3a31a6557b91fe39a..b4c6926a700cc30c8187768d0a629e590b1d3417 100644 (file)
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -1605,15 +1605,15 @@ static struct platform_device pinmux_device = {
 };
 
 /* Pinmux settings */
-static struct pinmux_map u300_pinmux_map[] = {
+static struct pinmux_map __initdata u300_pinmux_map[] = {
        /* anonymous maps for chip power and EMIFs */
-       PINMUX_MAP_PRIMARY_SYS_HOG("POWER", "power"),
-       PINMUX_MAP_PRIMARY_SYS_HOG("EMIF0", "emif0"),
-       PINMUX_MAP_PRIMARY_SYS_HOG("EMIF1", "emif1"),
+       PINMUX_MAP_SYS_HOG("POWER", "pinmux-u300", "power"),
+       PINMUX_MAP_SYS_HOG("EMIF0", "pinmux-u300", "emif0"),
+       PINMUX_MAP_SYS_HOG("EMIF1", "pinmux-u300", "emif1"),
        /* per-device maps for MMC/SD, SPI and UART */
-       PINMUX_MAP_PRIMARY("MMCSD", "mmc0", "mmci"),
-       PINMUX_MAP_PRIMARY("SPI", "spi0", "pl022"),
-       PINMUX_MAP_PRIMARY("UART0", "uart0", "uart0"),
+       PINMUX_MAP("MMCSD", "pinmux-u300", "mmc0", "mmci"),
+       PINMUX_MAP("SPI", "pinmux-u300", "spi0", "pl022"),
+       PINMUX_MAP("UART0", "pinmux-u300", "uart0", "uart0"),
 };
 
 struct u300_mux_hog {