From: Sonic Zhang <[email protected]>
Rotary can't be used as a wakeup source in all Blackfin processors.
Signed-off-by: Sonic Zhang <[email protected]>
---
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
Hi Sonic,
On Wed, May 16, 2012 at 04:36:23PM +0800, [email protected] wrote:
> From: Sonic Zhang <[email protected]>
>
> Rotary can't be used as a wakeup source in all Blackfin processors.
>
> Signed-off-by: Sonic Zhang <[email protected]>
> ---
> 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
Hi Dmitry,
>-----Original Message-----
>From: Dmitry Torokhov [mailto:[email protected]]
>Sent: Thursday, May 17, 2012 2:31 AM
>To: Zhang, Sonic
>Cc: [email protected]; LKML; [email protected]
>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, [email protected] wrote:
>> From: Sonic Zhang <[email protected]>
>>
>> Rotary can't be used as a wakeup source in all Blackfin processors.
>>
>> Signed-off-by: Sonic Zhang <[email protected]>
>> ---
>> 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
On Wed, May 16, 2012 at 10:58:00PM -0400, Zhang, Sonic wrote:
> Hi Dmitry,
>
>
> >-----Original Message-----
> >From: Dmitry Torokhov [mailto:[email protected]]
> >Sent: Thursday, May 17, 2012 2:31 AM
> >To: Zhang, Sonic
> >Cc: [email protected]; LKML; [email protected]
> >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, [email protected] wrote:
> >> From: Sonic Zhang <[email protected]>
> >>
> >> Rotary can't be used as a wakeup source in all Blackfin processors.
> >>
> >> Signed-off-by: Sonic Zhang <[email protected]>
> >> ---
> >> 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
Hi Dmitry,
>-----Original Message-----
>From: Dmitry Torokhov [mailto:[email protected]]
>Sent: Thursday, May 17, 2012 2:08 PM
>To: Zhang, Sonic
>Cc: [email protected]; LKML; [email protected];
>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:[email protected]]
>> >Sent: Thursday, May 17, 2012 2:31 AM
>> >To: Zhang, Sonic
>> >Cc: [email protected]; LKML; uclinux-dist-
>[email protected]
>> >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, [email protected] wrote:
>> >> From: Sonic Zhang <[email protected]>
>> >>
>> >> Rotary can't be used as a wakeup source in all Blackfin processors.
>> >>
>> >> Signed-off-by: Sonic Zhang <[email protected]>
>> >> ---
>> >> 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
On Thu, May 17, 2012 at 02:32:37AM -0400, Zhang, Sonic wrote:
> Hi Dmitry,
>
> >-----Original Message-----
> >From: Dmitry Torokhov [mailto:[email protected]]
> >Sent: Thursday, May 17, 2012 2:08 PM
> >To: Zhang, Sonic
> >Cc: [email protected]; LKML; [email protected];
> >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:[email protected]]
> >> >Sent: Thursday, May 17, 2012 2:31 AM
> >> >To: Zhang, Sonic
> >> >Cc: [email protected]; LKML; uclinux-dist-
> >[email protected]
> >> >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, [email protected] wrote:
> >> >> From: Sonic Zhang <[email protected]>
> >> >>
> >> >> Rotary can't be used as a wakeup source in all Blackfin processors.
> >> >>
> >> >> Signed-off-by: Sonic Zhang <[email protected]>
> >> >> ---
> >> >> 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 <[email protected]>
to this patch and merge it through blackfin tree.
--
Dmitry