diff options
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r-- | arch/arm/mach-u300/core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 839fa15c4eb6..39e220864988 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c | |||
@@ -1607,13 +1607,13 @@ static struct platform_device pinmux_device = { | |||
1607 | /* Pinmux settings */ | 1607 | /* Pinmux settings */ |
1608 | static struct pinmux_map __initdata u300_pinmux_map[] = { | 1608 | static struct pinmux_map __initdata u300_pinmux_map[] = { |
1609 | /* anonymous maps for chip power and EMIFs */ | 1609 | /* anonymous maps for chip power and EMIFs */ |
1610 | PINMUX_MAP_PRIMARY_SYS_HOG("POWER", "power"), | 1610 | PINMUX_MAP_SYS_HOG("POWER", "pinmux-u300", "power"), |
1611 | PINMUX_MAP_PRIMARY_SYS_HOG("EMIF0", "emif0"), | 1611 | PINMUX_MAP_SYS_HOG("EMIF0", "pinmux-u300", "emif0"), |
1612 | PINMUX_MAP_PRIMARY_SYS_HOG("EMIF1", "emif1"), | 1612 | PINMUX_MAP_SYS_HOG("EMIF1", "pinmux-u300", "emif1"), |
1613 | /* per-device maps for MMC/SD, SPI and UART */ | 1613 | /* per-device maps for MMC/SD, SPI and UART */ |
1614 | PINMUX_MAP_PRIMARY("MMCSD", "mmc0", "mmci"), | 1614 | PINMUX_MAP("MMCSD", "pinmux-u300", "mmc0", "mmci"), |
1615 | PINMUX_MAP_PRIMARY("SPI", "spi0", "pl022"), | 1615 | PINMUX_MAP("SPI", "pinmux-u300", "spi0", "pl022"), |
1616 | PINMUX_MAP_PRIMARY("UART0", "uart0", "uart0"), | 1616 | PINMUX_MAP("UART0", "pinmux-u300", "uart0", "uart0"), |
1617 | }; | 1617 | }; |
1618 | 1618 | ||
1619 | struct u300_mux_hog { | 1619 | struct u300_mux_hog { |