From 318d2e62b47d53e3435f119fa67e1c65171ea8ae Mon Sep 17 00:00:00 2001 From: Peter De Schrijver Date: Wed, 12 Oct 2011 14:53:03 +0300 Subject: [PATCH] --- yaml --- r: 272871 b: refs/heads/master c: e146245453986974a294d91d691481da8b61696b h: refs/heads/master i: 272869: 19ce9543ca5c04bf24357b8b9d4b9c5023efa9e5 272867: f30038c34890926cded4af8c7b9f4598d9a00113 272863: 3daf4544d49b34c7da2ca79cdce11f6604b9e140 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8f5aef0bbd46..05f8a68071cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48f2eceefb9d1b79e4c37795d2121933fcbc34f5 +refs/heads/master: e146245453986974a294d91d691481da8b61696b diff --git a/trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c b/trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c index 9c0f6d7527b9..841e4672b520 100644 --- a/trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c +++ b/trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c @@ -1,5 +1,6 @@ /* - * Copyright (C) 2010 NVIDIA Corporation + * Copyright (C) 2010,2011 NVIDIA Corporation + * Copyright (C) 2011 Google, Inc. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -163,7 +164,7 @@ static struct platform_device *pinmux_devices[] = { &tegra_pinmux_device, }; -static struct tegra_gpio_table gpio_table[] = { +static struct tegra_gpio_table common_gpio_table[] = { { .gpio = TEGRA_GPIO_SD2_CD, .enable = true }, { .gpio = TEGRA_GPIO_SD2_WP, .enable = true }, { .gpio = TEGRA_GPIO_SD2_POWER, .enable = true }, @@ -172,7 +173,7 @@ static struct tegra_gpio_table gpio_table[] = { { .gpio = TEGRA_GPIO_ISL29018_IRQ, .enable = true }, }; -void __init seaboard_pinmux_init(void) +void __init seaboard_common_pinmux_init(void) { platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices)); @@ -181,5 +182,10 @@ void __init seaboard_pinmux_init(void) tegra_drive_pinmux_config_table(seaboard_drive_pinmux, ARRAY_SIZE(seaboard_drive_pinmux)); - tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table)); + tegra_gpio_config(common_gpio_table, ARRAY_SIZE(common_gpio_table)); +} + +void __init seaboard_pinmux_init(void) +{ + seaboard_common_pinmux_init(); }