Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-tegra / board-ventana.c

diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c
index 60948ad9dba449ab2dc02b1ad5ee74fd0e507b9f..6302118a335b7a286555fc7e6eba70cd8074042f 100644 (file)
--- a/arch/arm/mach-tegra/board-ventana.c
+++ b/arch/arm/mach-tegra/board-ventana.c
@@ -181,10 +181,10 @@ static void ventana_i2c_init(void)
        }
 
 static struct gpio_keys_button ventana_keys[] = {
-       [0] = GPIO_KEY(KEY_MENU, PQ0, 0),
+       [0] = GPIO_KEY(KEY_MENU, PQ3, 0),
        [1] = GPIO_KEY(KEY_HOME, PQ1, 0),
        [2] = GPIO_KEY(KEY_BACK, PQ2, 0),
-       [3] = GPIO_KEY(KEY_VOLUMEUP, PQ3, 0),
+       [3] = GPIO_KEY(KEY_VOLUMEUP, PQ5, 0),
        [4] = GPIO_KEY(KEY_VOLUMEDOWN, PQ4, 0),
        [5] = GPIO_KEY(KEY_POWER, PV2, 1),
 };
@@ -209,6 +209,7 @@ static struct platform_device *ventana_devices[] __initdata = {
        &pmu_device,
        &tegra_udc_device,
        &tegra_gart_device,
+       &tegra_aes_device,
        &ventana_keys_device,
 };