[APPLIED] [PATCH 2/2] twl4030: move twl4030-pwrbutton to drivers/input/misc
This patch has been applied to the linux-omap by youw fwiendly patch wobot. Commit: 855fdeaa9f4012839627a5e83e21a4b5a5811cc9 PatchWorks http://patchwork.kernel.org/patch/7975/ Git http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=855fdeaa9f4012839627a5e83e21a4b5a5811cc9 -- 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 2/2] twl4030: move twl4030-pwrbutton to drivers/input/misc
* Felipe Balbi m...@felipebalbi.com [090225 13:07]: On Thu, Feb 19, 2009 at 10:30:30PM +0200, Felipe Balbi wrote: On Thu, Feb 19, 2009 at 12:08:45PM -0800, David Brownell wrote: On Thursday 19 February 2009, Felipe Balbi wrote: Take it out of drivers/i2c/chips as requested by Jean Delvare that all drivers move out of there. Cc: David Brownell dbrown...@users.sourceforge.net Cc: Samuel Ortiz sa...@openedhand.com Signed-off-by: Felipe Balbi m...@felipebalbi.com You're cc'ing Sam on these patches to the OMAP tree ... are you suggesting this code merge to mainline? Just so he knows I'm willing to add a few more changes to twl4030-core.c, If you're ok with these patches, I'll send the final version to Sam, mainline and linux-input. If so, you'll need to send the input driver to the input list as a patch against mainline, for review. The snippet from your patch 1/2 affecting the twl4030 MFD core might reasonably be merged with that, assuming Sam's OK with that going though the input tree. I could also make them separate. Send the final drivers/input/misc/twl4030-pwrbutton.c to linux-input and the twl4030-core.c to be merged via Sam. Does anyone have anything against this patch ? If not, I guess it should be applied and I'll generate the patch against mainline for input + mfd maintainers. OK, pushed. These are currently also scheduled for getting reset to mainline twl code after v2.6.29-omap1 is tagged. Regards, Tony -- 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 2/2] twl4030: move twl4030-pwrbutton to drivers/input/misc
On Fri, Feb 27, 2009 at 10:44:45AM -0800, Tony Lindgren wrote: OK, pushed. These are currently also scheduled for getting reset to mainline twl code after v2.6.29-omap1 is tagged. Just pushed to lkml, there will be one discrepancy with a debugging message easily fixable in a merge if you just use mainline's version, or I can send a fixup patch, if you wish. -- balbi -- 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 2/2] twl4030: move twl4030-pwrbutton to drivers/input/misc
* Felipe Balbi m...@felipebalbi.com [090227 11:31]: On Fri, Feb 27, 2009 at 10:44:45AM -0800, Tony Lindgren wrote: OK, pushed. These are currently also scheduled for getting reset to mainline twl code after v2.6.29-omap1 is tagged. Just pushed to lkml, there will be one discrepancy with a debugging message easily fixable in a merge if you just use mainline's version, or I can send a fixup patch, if you wish. Well if you can send the patch, then that would be easiest. Patching based on the description usually cause something to go wrong :) Tony -- 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 2/2] twl4030: move twl4030-pwrbutton to drivers/input/misc
On Fri, Feb 27, 2009 at 11:49:17AM -0800, Tony Lindgren wrote: * Felipe Balbi m...@felipebalbi.com [090227 11:31]: On Fri, Feb 27, 2009 at 10:44:45AM -0800, Tony Lindgren wrote: OK, pushed. These are currently also scheduled for getting reset to mainline twl code after v2.6.29-omap1 is tagged. Just pushed to lkml, there will be one discrepancy with a debugging message easily fixable in a merge if you just use mainline's version, or I can send a fixup patch, if you wish. Well if you can send the patch, then that would be easiest. Patching based on the description usually cause something to go wrong :) Let's then wait a bit longer and see if Sam or Dmitry will have anything to say about the driver, after that I can send one patch only. -- balbi -- 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 2/2] twl4030: move twl4030-pwrbutton to drivers/input/misc
* Felipe Balbi m...@felipebalbi.com [090227 12:00]: On Fri, Feb 27, 2009 at 11:49:17AM -0800, Tony Lindgren wrote: * Felipe Balbi m...@felipebalbi.com [090227 11:31]: On Fri, Feb 27, 2009 at 10:44:45AM -0800, Tony Lindgren wrote: OK, pushed. These are currently also scheduled for getting reset to mainline twl code after v2.6.29-omap1 is tagged. Just pushed to lkml, there will be one discrepancy with a debugging message easily fixable in a merge if you just use mainline's version, or I can send a fixup patch, if you wish. Well if you can send the patch, then that would be easiest. Patching based on the description usually cause something to go wrong :) Let's then wait a bit longer and see if Sam or Dmitry will have anything to say about the driver, after that I can send one patch only. OK Tony -- 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 2/2] twl4030: move twl4030-pwrbutton to drivers/input/misc
On Thu, Feb 19, 2009 at 10:30:30PM +0200, Felipe Balbi wrote: On Thu, Feb 19, 2009 at 12:08:45PM -0800, David Brownell wrote: On Thursday 19 February 2009, Felipe Balbi wrote: Take it out of drivers/i2c/chips as requested by Jean Delvare that all drivers move out of there. Cc: David Brownell dbrown...@users.sourceforge.net Cc: Samuel Ortiz sa...@openedhand.com Signed-off-by: Felipe Balbi m...@felipebalbi.com You're cc'ing Sam on these patches to the OMAP tree ... are you suggesting this code merge to mainline? Just so he knows I'm willing to add a few more changes to twl4030-core.c, If you're ok with these patches, I'll send the final version to Sam, mainline and linux-input. If so, you'll need to send the input driver to the input list as a patch against mainline, for review. The snippet from your patch 1/2 affecting the twl4030 MFD core might reasonably be merged with that, assuming Sam's OK with that going though the input tree. I could also make them separate. Send the final drivers/input/misc/twl4030-pwrbutton.c to linux-input and the twl4030-core.c to be merged via Sam. Does anyone have anything against this patch ? If not, I guess it should be applied and I'll generate the patch against mainline for input + mfd maintainers. -- balbi -- 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 2/2] twl4030: move twl4030-pwrbutton to drivers/input/misc
Take it out of drivers/i2c/chips as requested by Jean Delvare
that all drivers move out of there.
Cc: David Brownell dbrown...@users.sourceforge.net
Cc: Samuel Ortiz sa...@openedhand.com
Signed-off-by: Felipe Balbi m...@felipebalbi.com
---
drivers/i2c/chips/Kconfig |4
drivers/i2c/chips/Makefile |1 -
drivers/input/misc/Kconfig |4
drivers/input/misc/Makefile|1 +
.../{i2c/chips = input/misc}/twl4030-pwrbutton.c |0
drivers/mfd/twl4030-core.c |3 ++-
6 files changed, 7 insertions(+), 6 deletions(-)
rename drivers/{i2c/chips = input/misc}/twl4030-pwrbutton.c (100%)
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index e4831e1..bf7bd1b 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -98,10 +98,6 @@ config TWL4030_MADC
to build it as a dinamically loadable module. The module will be
called twl4030-madc.ko
-config TWL4030_PWRBUTTON
- tristate TWL4030 Power button Driver
- depends on TWL4030_CORE
-
config TWL4030_POWEROFF
tristate TWL4030 device poweroff
depends on TWL4030_CORE
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 1c94712..8da23ee 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_PCF8575) += pcf8575.o
obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o
obj-$(CONFIG_TWL4030_POWEROFF) += twl4030-poweroff.o
-obj-$(CONFIG_TWL4030_PWRBUTTON)+= twl4030-pwrbutton.o
obj-$(CONFIG_TWL4030_MADC) += twl4030-madc.o
obj-$(CONFIG_RTC_X1205_I2C)+= x1205.o
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 67e5553..9667b50 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -193,6 +193,10 @@ config INPUT_CM109
To compile this driver as a module, choose M here: the module will be
called cm109.
+config INPUT_TWL4030_PWRBUTTON
+ tristate TWL4030 Power button Driver
+ depends on TWL4030_CORE
+
config INPUT_UINPUT
tristate User level driver support
help
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index bb62e6e..2fabcdb 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_INPUT_YEALINK) += yealink.o
obj-$(CONFIG_INPUT_CM109) += cm109.o
obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
obj-$(CONFIG_INPUT_UINPUT) += uinput.o
+obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON) += twl4030-pwrbutton.o
obj-$(CONFIG_INPUT_APANEL) += apanel.o
obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o
obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o
diff --git a/drivers/i2c/chips/twl4030-pwrbutton.c
b/drivers/input/misc/twl4030-pwrbutton.c
similarity index 100%
rename from drivers/i2c/chips/twl4030-pwrbutton.c
rename to drivers/input/misc/twl4030-pwrbutton.c
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index 1552296..bb25a4f 100644
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -107,7 +107,8 @@
#define twl_has_usb() false
#endif
-#if defined(CONFIG_TWL4030_PWRBUTTON) ||
defined(CONFIG_TWL4030_PWBUTTON_MODULE)
+#if defined(CONFIG_INPUT_TWL4030_PWRBUTTON) \
+ || defined(CONFIG_INPUT_TWL4030_PWBUTTON_MODULE)
#define twl_has_pwrbutton()true
#else
#define twl_has_pwrbutton()false
--
1.6.1.3
--
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 2/2] twl4030: move twl4030-pwrbutton to drivers/input/misc
On Thursday 19 February 2009, Felipe Balbi wrote:
Take it out of drivers/i2c/chips as requested by Jean Delvare
that all drivers move out of there.
Cc: David Brownell dbrown...@users.sourceforge.net
Cc: Samuel Ortiz sa...@openedhand.com
Signed-off-by: Felipe Balbi m...@felipebalbi.com
You're cc'ing Sam on these patches to the OMAP tree ... are you
suggesting this code merge to mainline?
If so, you'll need to send the input driver to the input list
as a patch against mainline, for review. The snippet from
your patch 1/2 affecting the twl4030 MFD core might reasonably
be merged with that, assuming Sam's OK with that going though
the input tree.
- Dave
---
drivers/i2c/chips/Kconfig |4
drivers/i2c/chips/Makefile |1 -
drivers/input/misc/Kconfig |4
drivers/input/misc/Makefile|1 +
.../{i2c/chips = input/misc}/twl4030-pwrbutton.c |0
drivers/mfd/twl4030-core.c |3 ++-
6 files changed, 7 insertions(+), 6 deletions(-)
rename drivers/{i2c/chips = input/misc}/twl4030-pwrbutton.c (100%)
--
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 2/2] twl4030: move twl4030-pwrbutton to drivers/input/misc
On Thu, Feb 19, 2009 at 12:08:45PM -0800, David Brownell wrote: On Thursday 19 February 2009, Felipe Balbi wrote: Take it out of drivers/i2c/chips as requested by Jean Delvare that all drivers move out of there. Cc: David Brownell dbrown...@users.sourceforge.net Cc: Samuel Ortiz sa...@openedhand.com Signed-off-by: Felipe Balbi m...@felipebalbi.com You're cc'ing Sam on these patches to the OMAP tree ... are you suggesting this code merge to mainline? Just so he knows I'm willing to add a few more changes to twl4030-core.c, If you're ok with these patches, I'll send the final version to Sam, mainline and linux-input. If so, you'll need to send the input driver to the input list as a patch against mainline, for review. The snippet from your patch 1/2 affecting the twl4030 MFD core might reasonably be merged with that, assuming Sam's OK with that going though the input tree. I could also make them separate. Send the final drivers/input/misc/twl4030-pwrbutton.c to linux-input and the twl4030-core.c to be merged via Sam. -- balbi -- 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
