summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-12-09 16:59:04 -0700
committerLinus Walleij <linus.walleij@linaro.org>2012-01-03 09:10:05 +0100
commit528b78306ecf82af06c4862aa5518643fe20a440 (patch)
treec45e87145ea216822c734893c66f19cbb4cf74bb /arch/arm/mach-u300
parent1ddb6ff03c0cdec58c6cfdbada95acddcce4a7b7 (diff)
downloadop-kernel-dev-528b78306ecf82af06c4862aa5518643fe20a440.zip
op-kernel-dev-528b78306ecf82af06c4862aa5518643fe20a440.tar.gz
arm/u300: don't use PINMUX_MAP_PRIMARY*
The next patch will remove these macros. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 839fa15..39e2208 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 = {
/* Pinmux settings */
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 {
OpenPOWER on IntegriCloud