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

Commit 0ec1b606 authored by Olof Johansson's avatar Olof Johansson
Browse files

ARM: tegra: harmony: move over to tegra_gpio_config



Move harmony over to use the new gpio config table instead of having
separate settings in various parts of the code.

(The tegra sdhci driver should have the tegra_gpio_* ops removed, but
that will be done separately from this change.)

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Acked-by: default avatarErik Gilling <konkers@android.com>
parent 632095ea
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@
 */

#include <linux/kernel.h>
#include <linux/gpio.h>
#include <mach/pinmux.h>

#include "gpio-names.h"
#include "board-harmony.h"

static struct tegra_pingroup_config harmony_pinmux[] = {
@@ -138,7 +140,18 @@ static struct tegra_pingroup_config harmony_pinmux[] = {
	{TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
};

static struct tegra_gpio_table gpio_table[] = {
	{ .gpio = TEGRA_GPIO_PI5,	.enable = true	}, /* mmc2 cd	*/
	{ .gpio = TEGRA_GPIO_PH1,	.enable = true	}, /* mmc2 wp	*/
	{ .gpio = TEGRA_GPIO_PT3,	.enable = true	}, /* mmc2 pwr	*/
	{ .gpio = TEGRA_GPIO_PH2,	.enable = true	}, /* mmc4 cd	*/
	{ .gpio = TEGRA_GPIO_PH3,	.enable = true	}, /* mmc4 wp	*/
	{ .gpio = TEGRA_GPIO_PI6,	.enable = true	}, /* mmc4 pwr	*/
};

void harmony_pinmux_init(void)
{
	tegra_pinmux_config_table(harmony_pinmux, ARRAY_SIZE(harmony_pinmux));

	tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table));
}