aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-11-15 04:07:48 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-11-26 15:01:56 -0500
commit3ae2750a8c7112b83697dda5ef915886cb2a38cf (patch)
treef830a5ec2f1330005512dd1f6be0fdfe51c3595e /arch/arm/mach-ux500
parentfda989c0b51a563d23d3cf3d4c20dd3405268644 (diff)
ARM: ux500: move old HREF ipgpio to the device tree
The old HREFs (MOP500) were controlling an image-processor GPIO (IPGPIO) by using hogs. Do the same thing with device tree and get rid of the mop500_pins setting. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/board-mop500-pins.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index c311d11d6c3d..257c97a214a5 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -312,28 +312,6 @@ static struct pinctrl_map __initdata ab8505_pinmap[] = {
312}; 312};
313 313
314/* 314/*
315 * These are specifically for the MOP500 and HREFP (pre-v60) version of the
316 * board, which utilized a TC35892 GPIO expander instead of using a lot of
317 * on-chip pins as the HREFv60 and later does.
318 */
319static struct pinctrl_map __initdata mop500_pinmap[] = {
320 /*
321 * XENON Flashgun on image processor GPIO (controlled from image
322 * processor firmware), mux in these image processor GPIO lines 0
323 * (XENON_FLASH_ID) and 1 (XENON_READY) on altfunction C and pull up
324 * the pins.
325 */
326 DB8500_MUX_HOG("ipgpio0_c_1", "ipgpio"),
327 DB8500_MUX_HOG("ipgpio1_c_1", "ipgpio"),
328 DB8500_PIN_HOG("GPIO6_AF6", in_pu),
329 DB8500_PIN_HOG("GPIO7_AG5", in_pu),
330 /*
331 * Runtime stuff: make it possible to mux in the SKE keypad
332 * and bias the pins
333 */
334};
335
336/*
337 * The HREFv60 series of platforms is using available pins on the DB8500 315 * The HREFv60 series of platforms is using available pins on the DB8500
338 * insteaf of the Toshiba I2C GPIO expander, reusing some pins like the SSP0 316 * insteaf of the Toshiba I2C GPIO expander, reusing some pins like the SSP0
339 * and SSP1 ports (previously connected to the AB8500) as generic GPIO lines. 317 * and SSP1 ports (previously connected to the AB8500) as generic GPIO lines.
@@ -496,8 +474,6 @@ static void __init mop500_href_family_pinmaps_init(void)
496 474
497void __init mop500_pinmaps_init(void) 475void __init mop500_pinmaps_init(void)
498{ 476{
499 pinctrl_register_mappings(mop500_pinmap,
500 ARRAY_SIZE(mop500_pinmap));
501 mop500_href_family_pinmaps_init(); 477 mop500_href_family_pinmaps_init();
502 if (machine_is_u8520()) 478 if (machine_is_u8520())
503 pinctrl_register_mappings(ab8505_pinmap, 479 pinctrl_register_mappings(ab8505_pinmap,