2 files changed, 2 insertions, 25 deletions

diff --git a/arch/arm/mach-tegra/include/mach/kbc.h b/arch/arm/mach-tegra/include/mach/kbc.h
index bd99744f27db..4f3572a1c684 100644
--- a/arch/arm/mach-tegra/include/mach/kbc.h
+++ b/arch/arm/mach-tegra/include/mach/kbc.h
@@ -50,9 +50,6 @@ struct tegra_kbc_platform_data {
         unsigned int debounce_cnt;
         unsigned int repeat_cnt;
 
-        unsigned int wake_cnt; /* 0:wake on any key >1:wake on wake_cfg */
-        const struct tegra_kbc_wake_key *wake_cfg;
-
         struct tegra_kbc_pin_cfg pin_cfg[KBC_MAX_GPIO];
         const struct matrix_keymap_data *keymap_data;
 
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 5fb4b972f205..2b3b73ec6689 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -66,8 +66,6 @@ struct tegra_kbc {
         void __iomem *mmio;
         struct input_dev *idev;
         unsigned int irq;
-        unsigned int wake_enable_rows;
-        unsigned int wake_enable_cols;
         spinlock_t lock;
         unsigned int repoll_dly;
         unsigned long cp_dly_jiffies;
@@ -418,21 +416,11 @@ static void tegra_kbc_setup_wakekeys(struct tegra_kbc *kbc, bool filter)
         int i;
         unsigned int rst_val;
 
-        BUG_ON(pdata->wake_cnt > KBC_MAX_KEY);
-        rst_val = (filter && pdata->wake_cnt) ? ~0 : 0;
+        /* Either mask all keys or none. */
+        rst_val = (filter && !pdata->wakeup) ? ~0 : 0;
 
         for (i = 0; i < KBC_MAX_ROW; i++)
                 writel(rst_val, kbc->mmio + KBC_ROW0_MASK_0 + i * 4);
-
-        if (filter) {
-                for (i = 0; i < pdata->wake_cnt; i++) {
-                        u32 val, addr;
-                        addr = pdata->wake_cfg[i].row * 4 + KBC_ROW0_MASK_0;
-                        val = readl(kbc->mmio + addr);
-                        val &= ~(1 << pdata->wake_cfg[i].col);
-                        writel(val, kbc->mmio + addr);
-                }
-        }
 }
 
 static void tegra_kbc_config_pins(struct tegra_kbc *kbc)
@@ -594,7 +582,6 @@ static int __devinit tegra_kbc_probe(struct platform_device *pdev)
         struct resource *res;
         int irq;
         int err;
-        int i;
         int num_rows = 0;
         unsigned int debounce_cnt;
         unsigned int scan_time_rows;
@@ -651,13 +638,6 @@ static int __devinit tegra_kbc_probe(struct platform_device *pdev)
                 goto err_iounmap;
         }
 
-        kbc->wake_enable_rows = 0;
-        kbc->wake_enable_cols = 0;
-        for (i = 0; i < pdata->wake_cnt; i++) {
-                kbc->wake_enable_rows |= (1 << pdata->wake_cfg[i].row);
-                kbc->wake_enable_cols |= (1 << pdata->wake_cfg[i].col);
-        }
-
         /*
          * The time delay between two consecutive reads of the FIFO is
          * the sum of the repeat time and the time taken for scanning