ARM: ux500: Rip out keypad initialisation which is no longer used
authorLee Jones <lee.jones@linaro.org>
Thu, 22 Aug 2013 11:10:48 +0000 (12:10 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 26 Sep 2013 09:07:50 +0000 (11:07 +0200)
This is part of the ux500 conversion over to Device Tree only
booting, but this stuff haven't been used for years.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-ux500/devices-db8500.c
arch/arm/mach-ux500/devices-db8500.h
arch/arm/mach-ux500/devices.h

index bc316062e0c23661c118429036207e50911ffebb..b612751ea75c807d2b0a84e47a946122cc90e544 100644 (file)
@@ -57,26 +57,6 @@ struct platform_device u8500_dma40_device = {
        .resource = dma40_resources
 };
 
-struct resource keypad_resources[] = {
-       [0] = {
-               .start = U8500_SKE_BASE,
-               .end = U8500_SKE_BASE + SZ_4K - 1,
-               .flags = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start = IRQ_DB8500_KB,
-               .end = IRQ_DB8500_KB,
-               .flags = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device u8500_ske_keypad_device = {
-       .name = "nmk-ske-keypad",
-       .id = -1,
-       .num_resources = ARRAY_SIZE(keypad_resources),
-       .resource = keypad_resources,
-};
-
 struct prcmu_pdata db8500_prcmu_pdata = {
        .ab_platdata    = &ab8500_platdata,
        .ab_irq         = IRQ_DB8500_AB8500,
index e47039b9748f5d19f2f8e16b41f2ca3f0bed8375..be1d538e8109c0df13b48f861d5350dffe1c25c6 100644 (file)
@@ -13,7 +13,6 @@
 #include "db8500-regs.h"
 #include "devices-common.h"
 
-struct ske_keypad_platform_data;
 struct pl022_ssp_controller;
 struct platform_device;
 
@@ -21,20 +20,6 @@ extern struct ab8500_platform_data ab8500_platdata;
 extern struct prcmu_pdata db8500_prcmu_pdata;
 extern struct platform_device db8500_prcmu_device;
 
-static inline struct platform_device *
-db8500_add_ske_keypad(struct device *parent,
-                     struct ske_keypad_platform_data *pdata,
-                     size_t size)
-{
-       struct resource resources[] = {
-               DEFINE_RES_MEM(U8500_SKE_BASE, SZ_4K),
-               DEFINE_RES_IRQ(IRQ_DB8500_KB),
-       };
-
-       return platform_device_register_resndata(parent, "nmk-ske-keypad", -1,
-                                                resources, 2, pdata, size);
-}
-
 static inline struct amba_device *
 db8500_add_ssp(struct device *parent, const char *name, resource_size_t base,
               int irq, struct pl022_ssp_controller *pdata)
index 9b5eb69a0154a664828a6744f44d7300b4895eef..eafb07a5597a2b743fb0c8179f4577bd881d51a0 100644 (file)
@@ -15,6 +15,5 @@ extern struct platform_device u8500_gpio_devs[];
 extern struct amba_device ux500_pl031_device;
 
 extern struct platform_device u8500_dma40_device;
-extern struct platform_device ux500_ske_keypad_device;
 
 #endif