diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-ardbeg-power.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-loki-power.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-macallan-power.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-tn8-power.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-ardbeg-power.c b/arch/arm/mach-tegra/board-ardbeg-power.c index 190f76790974..29ccf3ea7a77 100644 --- a/arch/arm/mach-tegra/board-ardbeg-power.c +++ b/arch/arm/mach-tegra/board-ardbeg-power.c @@ -559,8 +559,8 @@ static struct palmas_extcon_platform_data palmas_extcon_pdata = { static struct palmas_pinctrl_config palmas_ti913_pincfg[] = { PALMAS_PINMUX("powergood", "powergood", NULL, NULL), PALMAS_PINMUX("vac", "vac", NULL, NULL), - PALMAS_PINMUX("gpio0", "id", NULL, NULL), - PALMAS_PINMUX("gpio1", "gpio", NULL, NULL), + PALMAS_PINMUX("gpio0", "id", "pull-up", NULL), + PALMAS_PINMUX("gpio1", "vbus-det", NULL, NULL), PALMAS_PINMUX("gpio2", "gpio", NULL, NULL), PALMAS_PINMUX("gpio3", "gpio", NULL, NULL), PALMAS_PINMUX("gpio4", "gpio", NULL, NULL), diff --git a/arch/arm/mach-tegra/board-loki-power.c b/arch/arm/mach-tegra/board-loki-power.c index a1b793fc2c55..7fd5da35470c 100644 --- a/arch/arm/mach-tegra/board-loki-power.c +++ b/arch/arm/mach-tegra/board-loki-power.c @@ -304,7 +304,7 @@ static struct palmas_reg_init *loki_reg_init[PALMAS_NUM_REGS] = { static struct palmas_pinctrl_config palmas_pincfg[] = { PALMAS_PINMUX("powergood", "powergood", NULL, NULL), PALMAS_PINMUX("vac", "vac", NULL, NULL), - PALMAS_PINMUX("gpio0", "gpio", NULL, NULL), + PALMAS_PINMUX("gpio0", "id", "pull-up", NULL), PALMAS_PINMUX("gpio1", "gpio", NULL, NULL), PALMAS_PINMUX("gpio2", "gpio", NULL, NULL), PALMAS_PINMUX("gpio3", "gpio", NULL, NULL), diff --git a/arch/arm/mach-tegra/board-macallan-power.c b/arch/arm/mach-tegra/board-macallan-power.c index 437f01db05b5..de24bf9e0cea 100644 --- a/arch/arm/mach-tegra/board-macallan-power.c +++ b/arch/arm/mach-tegra/board-macallan-power.c @@ -376,8 +376,8 @@ static struct palmas_pmic_platform_data pmic_platform = { static struct palmas_pinctrl_config palmas_pincfg[] = { PALMAS_PINMUX("powergood", "powergood", NULL, NULL), PALMAS_PINMUX("vac", "vac", NULL, NULL), - PALMAS_PINMUX("gpio0", "gpio", NULL, NULL), - PALMAS_PINMUX("gpio1", "gpio", NULL, NULL), + PALMAS_PINMUX("gpio0", "id", "pull-up", NULL), + PALMAS_PINMUX("gpio1", "vbus-det", NULL, NULL), PALMAS_PINMUX("gpio2", "gpio", NULL, NULL), PALMAS_PINMUX("gpio3", "gpio", NULL, NULL), PALMAS_PINMUX("gpio4", "gpio", NULL, NULL), diff --git a/arch/arm/mach-tegra/board-tn8-power.c b/arch/arm/mach-tegra/board-tn8-power.c index a89f0613637f..ea01a4eb4b35 100644 --- a/arch/arm/mach-tegra/board-tn8-power.c +++ b/arch/arm/mach-tegra/board-tn8-power.c @@ -362,8 +362,8 @@ static struct palmas_reg_init *tn8_reg_init[PALMAS_NUM_REGS] = { static struct palmas_pinctrl_config palmas_pincfg[] = { PALMAS_PINMUX("powergood", "powergood", NULL, NULL), PALMAS_PINMUX("vac", "vac", NULL, NULL), - PALMAS_PINMUX("gpio0", "gpio", NULL, NULL), - PALMAS_PINMUX("gpio1", "gpio", NULL, NULL), + PALMAS_PINMUX("gpio0", "id", "pull-up", NULL), + PALMAS_PINMUX("gpio1", "vbus_det", NULL, NULL), PALMAS_PINMUX("gpio2", "gpio", NULL, NULL), PALMAS_PINMUX("gpio3", "gpio", NULL, NULL), PALMAS_PINMUX("gpio4", "gpio", NULL, NULL), |