Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
ARM: Tegra: Harmony: Fix conflicting GPIO numbering
+5
-2
+3
-1
arch/arm/mach-tegra/board-harmony-power.c
+3
-1
arch/arm/mach-tegra/board-harmony-power.c
···
24
24
25
25
#include <mach/irqs.h>
26
26
27
+
#include "board-harmony.h"
28
+
27
29
#define PMC_CTRL 0x0
28
30
#define PMC_CTRL_INTR_LOW (1 << 17)
29
31
···
100
98
.irq_base = TEGRA_NR_IRQS,
101
99
.num_subdevs = ARRAY_SIZE(tps_devs),
102
100
.subdevs = tps_devs,
103
-
.gpio_base = TEGRA_NR_GPIOS,
101
+
.gpio_base = HARMONY_GPIO_TPS6586X(0),
104
102
};
105
103
106
104
static struct i2c_board_info __initdata harmony_regulators[] = {
+2
-1
arch/arm/mach-tegra/board-harmony.h
+2
-1
arch/arm/mach-tegra/board-harmony.h
···
17
17
#ifndef _MACH_TEGRA_BOARD_HARMONY_H
18
18
#define _MACH_TEGRA_BOARD_HARMONY_H
19
19
20
-
#define HARMONY_GPIO_WM8903(_x_) (TEGRA_NR_GPIOS + (_x_))
20
+
#define HARMONY_GPIO_TPS6586X(_x_) (TEGRA_NR_GPIOS + (_x_))
21
+
#define HARMONY_GPIO_WM8903(_x_) (HARMONY_GPIO_TPS6586X(4) + (_x_))
21
22
22
23
#define TEGRA_GPIO_SD2_CD TEGRA_GPIO_PI5
23
24
#define TEGRA_GPIO_SD2_WP TEGRA_GPIO_PH1