diff options
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t30.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c index 5216641f7076..3ca9abc20e44 100644 --- a/arch/arm/mach-tegra/board-colibri_t20.c +++ b/arch/arm/mach-tegra/board-colibri_t20.c @@ -317,6 +317,7 @@ static struct gpio colibri_t20_gpios[] = { #endif {TEGRA_GPIO_PI3, GPIOF_IN, "SODIMM pin 130"}, {TEGRA_GPIO_PI6, GPIOF_IN, "SODIMM pin 132"}, +//conflicts with GMI_ADV_N used for multiplexed address/data bus {TEGRA_GPIO_PK0, GPIOF_IN, "SODIMM pin 150"}, //multiplexed OWR {TEGRA_GPIO_PK1, GPIOF_IN, "SODIMM pin 152"}, diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index b6851988cddf..6256c299d861 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -292,6 +292,7 @@ static struct gpio colibri_t30_gpios[] = { {TEGRA_GPIO_PI6, GPIOF_IN, "SODIMM pin 132"}, //{TEGRA_GPIO_PJ0, GPIOF_IN, "SODIMM pin 126"}, //{TEGRA_GPIO_PJ2, GPIOF_IN, "SODIMM pin 128"}, +//conflicts with GMI_ADV_N used for multiplexed address/data bus // {TEGRA_GPIO_PK0, GPIOF_IN, "SODIMM pin 150"}, // {TEGRA_GPIO_PK1, GPIOF_IN, "SODIMM pin 152"}, #ifndef CONFIG_KEYBOARD_GPIO |