Re: [PATCH 1/2] ARM: OMAP2+: remove unused omap4-keypad file and code

2014-05-29 Thread Dmitry Torokhov 
On Mon, May 19, 2014 at 09:18:15AM -0700, Tony Lindgren wrote:
 * Dmitry Torokhov dmitry.torok...@gmail.com [140518 22:38]:
  On Sat, May 17, 2014 at 11:24:10PM +0200, Joachim Eastwood wrote:
   This has been unused since omap4 board files went away.
   
   Signed-off-by: Joachim Eastwood manab...@gmail.com
  
  Tony, can I merge both through my tree?
 
 Yes I don't have anything touching the omap4_keyboard_init
 areas that I can think of:
 
 Acked-by: Tony Lindgren t...@atomide.com
  

Applied both, thank you.

-- 
Dmitry
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] ARM: OMAP2+: remove unused omap4-keypad file and code

2014-05-19 Thread Tony Lindgren 
* Dmitry Torokhov dmitry.torok...@gmail.com [140518 22:38]:
 On Sat, May 17, 2014 at 11:24:10PM +0200, Joachim Eastwood wrote:
  This has been unused since omap4 board files went away.
  
  Signed-off-by: Joachim Eastwood manab...@gmail.com
 
 Tony, can I merge both through my tree?

Yes I don't have anything touching the omap4_keyboard_init
areas that I can think of:

Acked-by: Tony Lindgren t...@atomide.com
 
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] ARM: OMAP2+: remove unused omap4-keypad file and code

2014-05-18 Thread Dmitry Torokhov 
On Sat, May 17, 2014 at 11:24:10PM +0200, Joachim Eastwood wrote:
 This has been unused since omap4 board files went away.
 
 Signed-off-by: Joachim Eastwood manab...@gmail.com

Tony, can I merge both through my tree?

 ---
  arch/arm/mach-omap2/devices.c  | 33 -
  arch/arm/mach-omap2/omap4-keypad.h |  8 
  2 files changed, 41 deletions(-)
  delete mode 100644 arch/arm/mach-omap2/omap4-keypad.h
 
 diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
 index e58609b312c7..592ba0a0ecf3 100644
 --- a/arch/arm/mach-omap2/devices.c
 +++ b/arch/arm/mach-omap2/devices.c
 @@ -18,7 +18,6 @@
  #include linux/slab.h
  #include linux/of.h
  #include linux/pinctrl/machine.h
 -#include linux/platform_data/omap4-keypad.h
  #include linux/platform_data/mailbox-omap.h
  
  #include asm/mach-types.h
 @@ -29,7 +28,6 @@
  #include iomap.h
  #include omap_hwmod.h
  #include omap_device.h
 -#include omap4-keypad.h
  
  #include soc.h
  #include common.h
 @@ -255,37 +253,6 @@ static inline void omap_init_camera(void)
  #endif
  }
  
 -int __init omap4_keyboard_init(struct omap4_keypad_platform_data
 - *sdp4430_keypad_data, struct omap_board_data *bdata)
 -{
 - struct platform_device *pdev;
 - struct omap_hwmod *oh;
 - struct omap4_keypad_platform_data *keypad_data;
 - unsigned int id = -1;
 - char *oh_name = kbd;
 - char *name = omap4-keypad;
 -
 - oh = omap_hwmod_lookup(oh_name);
 - if (!oh) {
 - pr_err(Could not look up %s\n, oh_name);
 - return -ENODEV;
 - }
 -
 - keypad_data = sdp4430_keypad_data;
 -
 - pdev = omap_device_build(name, id, oh, keypad_data,
 -  sizeof(struct omap4_keypad_platform_data));
 -
 - if (IS_ERR(pdev)) {
 - WARN(1, Can't build omap_device for %s:%s.\n,
 - name, oh-name);
 - return PTR_ERR(pdev);
 - }
 - oh-mux = omap_hwmod_mux_init(bdata-pads, bdata-pads_cnt);
 -
 - return 0;
 -}
 -
  #if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE)
  static inline void __init omap_init_mbox(void)
  {
 diff --git a/arch/arm/mach-omap2/omap4-keypad.h 
 b/arch/arm/mach-omap2/omap4-keypad.h
 deleted file mode 100644
 index 20de0d5a7e77..
 --- a/arch/arm/mach-omap2/omap4-keypad.h
 +++ /dev/null
 @@ -1,8 +0,0 @@
 -#ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H
 -#define ARCH_ARM_PLAT_OMAP4_KEYPAD_H
 -
 -struct omap_board_data;
 -
 -extern int omap4_keyboard_init(struct omap4_keypad_platform_data *,
 - struct omap_board_data *);
 -#endif
 -- 
 1.8.0
 

-- 
Dmitry
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] ARM: OMAP2+: remove unused omap4-keypad file and code

2014-05-17 Thread Joachim Eastwood 
This has been unused since omap4 board files went away.

Signed-off-by: Joachim Eastwood manab...@gmail.com
---
 arch/arm/mach-omap2/devices.c  | 33 -
 arch/arm/mach-omap2/omap4-keypad.h |  8 
 2 files changed, 41 deletions(-)
 delete mode 100644 arch/arm/mach-omap2/omap4-keypad.h

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index e58609b312c7..592ba0a0ecf3 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -18,7 +18,6 @@
 #include linux/slab.h
 #include linux/of.h
 #include linux/pinctrl/machine.h
-#include linux/platform_data/omap4-keypad.h
 #include linux/platform_data/mailbox-omap.h
 
 #include asm/mach-types.h
@@ -29,7 +28,6 @@
 #include iomap.h
 #include omap_hwmod.h
 #include omap_device.h
-#include omap4-keypad.h
 
 #include soc.h
 #include common.h
@@ -255,37 +253,6 @@ static inline void omap_init_camera(void)
 #endif
 }
 
-int __init omap4_keyboard_init(struct omap4_keypad_platform_data
-   *sdp4430_keypad_data, struct omap_board_data *bdata)
-{
-   struct platform_device *pdev;
-   struct omap_hwmod *oh;
-   struct omap4_keypad_platform_data *keypad_data;
-   unsigned int id = -1;
-   char *oh_name = kbd;
-   char *name = omap4-keypad;
-
-   oh = omap_hwmod_lookup(oh_name);
-   if (!oh) {
-   pr_err(Could not look up %s\n, oh_name);
-   return -ENODEV;
-   }
-
-   keypad_data = sdp4430_keypad_data;
-
-   pdev = omap_device_build(name, id, oh, keypad_data,
-sizeof(struct omap4_keypad_platform_data));
-
-   if (IS_ERR(pdev)) {
-   WARN(1, Can't build omap_device for %s:%s.\n,
-   name, oh-name);
-   return PTR_ERR(pdev);
-   }
-   oh-mux = omap_hwmod_mux_init(bdata-pads, bdata-pads_cnt);
-
-   return 0;
-}
-
 #if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE)
 static inline void __init omap_init_mbox(void)
 {
diff --git a/arch/arm/mach-omap2/omap4-keypad.h 
b/arch/arm/mach-omap2/omap4-keypad.h
deleted file mode 100644
index 20de0d5a7e77..
--- a/arch/arm/mach-omap2/omap4-keypad.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H
-#define ARCH_ARM_PLAT_OMAP4_KEYPAD_H
-
-struct omap_board_data;
-
-extern int omap4_keyboard_init(struct omap4_keypad_platform_data *,
-   struct omap_board_data *);
-#endif
-- 
1.8.0

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html