* [PATCH] input: rotary: Init wake according to platform pm_wakeup flag. @ 2012-05-16 8:36 sonic.zhang 2012-05-16 18:30 ` Dmitry Torokhov 0 siblings, 1 reply; 6+ messages in thread From: sonic.zhang @ 2012-05-16 8:36 UTC (permalink / raw) To: Dmitry Torokhov; +Cc: linux-input, LKML, uclinux-dist-devel, Sonic Zhang From: Sonic Zhang <sonic.zhang@analog.com> Rotary can't be used as a wakeup source in all Blackfin processors. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> --- drivers/input/misc/bfin_rotary.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c index 1c4146f..bb1971c 100644 --- a/drivers/input/misc/bfin_rotary.c +++ b/drivers/input/misc/bfin_rotary.c @@ -182,7 +182,7 @@ static int __devinit bfin_rotary_probe(struct platform_device *pdev) bfin_write_CNT_CONFIG(bfin_read_CNT_CONFIG() | CNTE); platform_set_drvdata(pdev, rotary); - device_init_wakeup(&pdev->dev, 1); + device_init_wakeup(&pdev->dev, pdata->pm_wakeup); return 0; -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] input: rotary: Init wake according to platform pm_wakeup flag. 2012-05-16 8:36 [PATCH] input: rotary: Init wake according to platform pm_wakeup flag sonic.zhang @ 2012-05-16 18:30 ` Dmitry Torokhov 2012-05-17 2:58 ` Zhang, Sonic 0 siblings, 1 reply; 6+ messages in thread From: Dmitry Torokhov @ 2012-05-16 18:30 UTC (permalink / raw) To: sonic.zhang; +Cc: linux-input, LKML, uclinux-dist-devel Hi Sonic, On Wed, May 16, 2012 at 04:36:23PM +0800, sonic.zhang@analog.com wrote: > From: Sonic Zhang <sonic.zhang@analog.com> > > Rotary can't be used as a wakeup source in all Blackfin processors. > > Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> > --- > drivers/input/misc/bfin_rotary.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c > index 1c4146f..bb1971c 100644 > --- a/drivers/input/misc/bfin_rotary.c > +++ b/drivers/input/misc/bfin_rotary.c > @@ -182,7 +182,7 @@ static int __devinit bfin_rotary_probe(struct platform_device *pdev) > bfin_write_CNT_CONFIG(bfin_read_CNT_CONFIG() | CNTE); > > platform_set_drvdata(pdev, rotary); > - device_init_wakeup(&pdev->dev, 1); > + device_init_wakeup(&pdev->dev, pdata->pm_wakeup); I do not see pm_wakeup in bfin_rotary_platform_data. Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] input: rotary: Init wake according to platform pm_wakeup flag. 2012-05-16 18:30 ` Dmitry Torokhov @ 2012-05-17 2:58 ` Zhang, Sonic 2012-05-17 6:08 ` Dmitry Torokhov 0 siblings, 1 reply; 6+ messages in thread From: Zhang, Sonic @ 2012-05-17 2:58 UTC (permalink / raw) To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, LKML, uclinux-dist-devel@blackfin.uclinux.org, Bob Liu Hi Dmitry, >-----Original Message----- >From: Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com] >Sent: Thursday, May 17, 2012 2:31 AM >To: Zhang, Sonic >Cc: linux-input@vger.kernel.org; LKML; uclinux-dist-devel@blackfin.uclinux.org >Subject: Re: [PATCH] input: rotary: Init wake according to platform pm_wakeup >flag. > >Hi Sonic, > >On Wed, May 16, 2012 at 04:36:23PM +0800, sonic.zhang@analog.com wrote: >> From: Sonic Zhang <sonic.zhang@analog.com> >> >> Rotary can't be used as a wakeup source in all Blackfin processors. >> >> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> >> --- >> drivers/input/misc/bfin_rotary.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c >> index 1c4146f..bb1971c 100644 >> --- a/drivers/input/misc/bfin_rotary.c >> +++ b/drivers/input/misc/bfin_rotary.c >> @@ -182,7 +182,7 @@ static int __devinit bfin_rotary_probe(struct >platform_device *pdev) >> bfin_write_CNT_CONFIG(bfin_read_CNT_CONFIG() | CNTE); >> >> platform_set_drvdata(pdev, rotary); >> - device_init_wakeup(&pdev->dev, 1); >> + device_init_wakeup(&pdev->dev, pdata->pm_wakeup); > >I do not see pm_wakeup in bfin_rotary_platform_data. The patch against the bfin_rotary.h under blackfin architecture folder will be sent out soon by Bob Liu. Regards, Sonic > >Thanks. > >-- >Dmitry ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] input: rotary: Init wake according to platform pm_wakeup flag. 2012-05-17 2:58 ` Zhang, Sonic @ 2012-05-17 6:08 ` Dmitry Torokhov 2012-05-17 6:32 ` Zhang, Sonic 0 siblings, 1 reply; 6+ messages in thread From: Dmitry Torokhov @ 2012-05-17 6:08 UTC (permalink / raw) To: Zhang, Sonic Cc: linux-input@vger.kernel.org, LKML, uclinux-dist-devel@blackfin.uclinux.org, Bob Liu On Wed, May 16, 2012 at 10:58:00PM -0400, Zhang, Sonic wrote: > Hi Dmitry, > > > >-----Original Message----- > >From: Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com] > >Sent: Thursday, May 17, 2012 2:31 AM > >To: Zhang, Sonic > >Cc: linux-input@vger.kernel.org; LKML; uclinux-dist-devel@blackfin.uclinux.org > >Subject: Re: [PATCH] input: rotary: Init wake according to platform pm_wakeup > >flag. > > > >Hi Sonic, > > > >On Wed, May 16, 2012 at 04:36:23PM +0800, sonic.zhang@analog.com wrote: > >> From: Sonic Zhang <sonic.zhang@analog.com> > >> > >> Rotary can't be used as a wakeup source in all Blackfin processors. > >> > >> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> > >> --- > >> drivers/input/misc/bfin_rotary.c | 2 +- > >> 1 files changed, 1 insertions(+), 1 deletions(-) > >> > >> diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c > >> index 1c4146f..bb1971c 100644 > >> --- a/drivers/input/misc/bfin_rotary.c > >> +++ b/drivers/input/misc/bfin_rotary.c > >> @@ -182,7 +182,7 @@ static int __devinit bfin_rotary_probe(struct > >platform_device *pdev) > >> bfin_write_CNT_CONFIG(bfin_read_CNT_CONFIG() | CNTE); > >> > >> platform_set_drvdata(pdev, rotary); > >> - device_init_wakeup(&pdev->dev, 1); > >> + device_init_wakeup(&pdev->dev, pdata->pm_wakeup); > > > >I do not see pm_wakeup in bfin_rotary_platform_data. > > The patch against the bfin_rotary.h under blackfin architecture folder will be sent out soon by Bob Liu. This split makes no sense - if I apply your patch to my tree it menas that my tree will be broken on blackfin architecture until blackfin arch gets pulled into mainline and I do next merge (around 3.5-rc3??). Please combine both patches and get both pieces applied at the same time. Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] input: rotary: Init wake according to platform pm_wakeup flag. 2012-05-17 6:08 ` Dmitry Torokhov @ 2012-05-17 6:32 ` Zhang, Sonic 2012-05-17 6:51 ` Dmitry Torokhov 0 siblings, 1 reply; 6+ messages in thread From: Zhang, Sonic @ 2012-05-17 6:32 UTC (permalink / raw) To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, LKML, uclinux-dist-devel@blackfin.uclinux.org, Bob Liu Hi Dmitry, >-----Original Message----- >From: Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com] >Sent: Thursday, May 17, 2012 2:08 PM >To: Zhang, Sonic >Cc: linux-input@vger.kernel.org; LKML; uclinux-dist-devel@blackfin.uclinux.org; >Bob Liu >Subject: Re: [PATCH] input: rotary: Init wake according to platform pm_wakeup >flag. > >On Wed, May 16, 2012 at 10:58:00PM -0400, Zhang, Sonic wrote: >> Hi Dmitry, >> >> >> >-----Original Message----- >> >From: Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com] >> >Sent: Thursday, May 17, 2012 2:31 AM >> >To: Zhang, Sonic >> >Cc: linux-input@vger.kernel.org; LKML; uclinux-dist- >devel@blackfin.uclinux.org >> >Subject: Re: [PATCH] input: rotary: Init wake according to platform pm_wakeup >> >flag. >> > >> >Hi Sonic, >> > >> >On Wed, May 16, 2012 at 04:36:23PM +0800, sonic.zhang@analog.com wrote: >> >> From: Sonic Zhang <sonic.zhang@analog.com> >> >> >> >> Rotary can't be used as a wakeup source in all Blackfin processors. >> >> >> >> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> >> >> --- >> >> drivers/input/misc/bfin_rotary.c | 2 +- >> >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> >> >> diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c >> >> index 1c4146f..bb1971c 100644 >> >> --- a/drivers/input/misc/bfin_rotary.c >> >> +++ b/drivers/input/misc/bfin_rotary.c >> >> @@ -182,7 +182,7 @@ static int __devinit bfin_rotary_probe(struct >> >platform_device *pdev) >> >> bfin_write_CNT_CONFIG(bfin_read_CNT_CONFIG() | CNTE); >> >> >> >> platform_set_drvdata(pdev, rotary); >> >> - device_init_wakeup(&pdev->dev, 1); >> >> + device_init_wakeup(&pdev->dev, pdata->pm_wakeup); >> > >> >I do not see pm_wakeup in bfin_rotary_platform_data. >> >> The patch against the bfin_rotary.h under blackfin architecture folder will be sent >out soon by Bob Liu. > >This split makes no sense - if I apply your patch to my tree it menas >that my tree will be broken on blackfin architecture until blackfin arch >gets pulled into mainline and I do next merge (around 3.5-rc3??). Please >combine both patches and get both pieces applied at the same time. > The rotary Blackfin architecture patch is on top of the new bf60x machine patch sets. You may fail to apply it before the bf60x patches are merged. Is it better to send you this patch later after you do next merge? Regards, Sonic >Thanks. > >-- >Dmitry ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] input: rotary: Init wake according to platform pm_wakeup flag. 2012-05-17 6:32 ` Zhang, Sonic @ 2012-05-17 6:51 ` Dmitry Torokhov 0 siblings, 0 replies; 6+ messages in thread From: Dmitry Torokhov @ 2012-05-17 6:51 UTC (permalink / raw) To: Zhang, Sonic Cc: linux-input@vger.kernel.org, LKML, uclinux-dist-devel@blackfin.uclinux.org, Bob Liu On Thu, May 17, 2012 at 02:32:37AM -0400, Zhang, Sonic wrote: > Hi Dmitry, > > >-----Original Message----- > >From: Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com] > >Sent: Thursday, May 17, 2012 2:08 PM > >To: Zhang, Sonic > >Cc: linux-input@vger.kernel.org; LKML; uclinux-dist-devel@blackfin.uclinux.org; > >Bob Liu > >Subject: Re: [PATCH] input: rotary: Init wake according to platform pm_wakeup > >flag. > > > >On Wed, May 16, 2012 at 10:58:00PM -0400, Zhang, Sonic wrote: > >> Hi Dmitry, > >> > >> > >> >-----Original Message----- > >> >From: Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com] > >> >Sent: Thursday, May 17, 2012 2:31 AM > >> >To: Zhang, Sonic > >> >Cc: linux-input@vger.kernel.org; LKML; uclinux-dist- > >devel@blackfin.uclinux.org > >> >Subject: Re: [PATCH] input: rotary: Init wake according to platform pm_wakeup > >> >flag. > >> > > >> >Hi Sonic, > >> > > >> >On Wed, May 16, 2012 at 04:36:23PM +0800, sonic.zhang@analog.com wrote: > >> >> From: Sonic Zhang <sonic.zhang@analog.com> > >> >> > >> >> Rotary can't be used as a wakeup source in all Blackfin processors. > >> >> > >> >> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> > >> >> --- > >> >> drivers/input/misc/bfin_rotary.c | 2 +- > >> >> 1 files changed, 1 insertions(+), 1 deletions(-) > >> >> > >> >> diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c > >> >> index 1c4146f..bb1971c 100644 > >> >> --- a/drivers/input/misc/bfin_rotary.c > >> >> +++ b/drivers/input/misc/bfin_rotary.c > >> >> @@ -182,7 +182,7 @@ static int __devinit bfin_rotary_probe(struct > >> >platform_device *pdev) > >> >> bfin_write_CNT_CONFIG(bfin_read_CNT_CONFIG() | CNTE); > >> >> > >> >> platform_set_drvdata(pdev, rotary); > >> >> - device_init_wakeup(&pdev->dev, 1); > >> >> + device_init_wakeup(&pdev->dev, pdata->pm_wakeup); > >> > > >> >I do not see pm_wakeup in bfin_rotary_platform_data. > >> > >> The patch against the bfin_rotary.h under blackfin architecture folder will be sent > >out soon by Bob Liu. > > > >This split makes no sense - if I apply your patch to my tree it menas > >that my tree will be broken on blackfin architecture until blackfin arch > >gets pulled into mainline and I do next merge (around 3.5-rc3??). Please > >combine both patches and get both pieces applied at the same time. > > > > The rotary Blackfin architecture patch is on top of the new bf60x > machine patch sets. You may fail to apply it before the bf60x patches > are merged. Is it better to send you this patch later after you do > next merge? You may also add Acked-by: Dmitry Torokhov <dtor@mail.ru> to this patch and merge it through blackfin tree. -- Dmitry ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-17 6:51 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-05-16 8:36 [PATCH] input: rotary: Init wake according to platform pm_wakeup flag sonic.zhang 2012-05-16 18:30 ` Dmitry Torokhov 2012-05-17 2:58 ` Zhang, Sonic 2012-05-17 6:08 ` Dmitry Torokhov 2012-05-17 6:32 ` Zhang, Sonic 2012-05-17 6:51 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).