Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 528b7830 authored by Stephen Warren's avatar Stephen Warren Committed by Linus Walleij
Browse files

arm/u300: don't use PINMUX_MAP_PRIMARY* 



The next patch will remove these macros.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1ddb6ff0

arch/arm/mach-u300/core.c

+6 −6
Original line number Diff line number Diff line
@@ -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 {