[GIT PULL 2/5] omap pm clean-up for v3.10 merge window

[GIT PULL 2/5] omap pm clean-up for v3.10 merge window

[Arnd Bergmann]

On Tuesday 09 April 2013, Tony Lindgren wrote:
> The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:
> 
>   Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed
> 
> for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc:
> 
>   Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700)
> 
> ----------------------------------------------------------------
> 
> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>:
> 
> OMAP3/4 CPUidle cleanups for v3.10

Adding Daniel and Rafael to Cc.

Is this series coordinated with the other cpuidle changes? Please tell me if this
is good to go into arm-soc.

	Arnd

> ----------------------------------------------------------------
> Daniel Lezcano (1):
>       ARM: omap3: cpuidle: enable time keeping
> 
> Santosh Shilimkar (5):
>       ARM: OMAP4: CPUidle: Avoid double idle driver registration
>       ARM: OMAP: CPUidle: Unregister drivere on device registration failure
>       ARM: OMAP4: CPUidle: Make C-state description field more precise
>       ARM: OMAP4+: CPUidle: Deprecate use of omap4_mpuss_read_prev_context_state()
>       ARM: OMAP4+: CPUidle: Consolidate idle driver for OMAP5 support
> 
> Tony Lindgren (1):
>       Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.10/cleanup-pm
> 
>  arch/arm/mach-omap2/common.h              |  5 ----
>  arch/arm/mach-omap2/cpuidle34xx.c         | 11 +++++--
>  arch/arm/mach-omap2/cpuidle44xx.c         | 48 +++++++++++++++++--------------
>  arch/arm/mach-omap2/omap-mpuss-lowpower.c | 14 ---------
>  4 files changed, 35 insertions(+), 43 deletions(-)
> 

[GIT PULL 2/5] omap pm clean-up for v3.10 merge window

[Kevin Hilman]

Arnd Bergmann <arnd@arndb.de> writes:

> On Tuesday 09 April 2013, Tony Lindgren wrote:
>> The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:
>> 
>>   Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)
>> 
>> are available in the git repository at:
>> 
>>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed
>> 
>> for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc:
>> 
>>   Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of
>> git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm
>> into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700)
>> 
>> ----------------------------------------------------------------
>> 
>> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>:
>> 
>> OMAP3/4 CPUidle cleanups for v3.10
>
> Adding Daniel and Rafael to Cc.
>
> Is this series coordinated with the other cpuidle changes? Please tell me if this
> is good to go into arm-soc.

Hmm, looks like it's not ready.  There are some minor conflicts with
what Rafael has queued up from Daniel.

I will work this out with Daniel to figure out how we should proceed.

Kevin

[GIT PULL 2/5] omap pm clean-up for v3.10 merge window

[Tony Lindgren]

* Kevin Hilman <khilman@linaro.org> [130409 09:43]:
> Arnd Bergmann <arnd@arndb.de> writes:
> 
> > On Tuesday 09 April 2013, Tony Lindgren wrote:
> >> The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:
> >> 
> >>   Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)
> >> 
> >> are available in the git repository at:
> >> 
> >>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed
> >> 
> >> for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc:
> >> 
> >>   Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of
> >> git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm
> >> into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700)
> >> 
> >> ----------------------------------------------------------------
> >> 
> >> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>:
> >> 
> >> OMAP3/4 CPUidle cleanups for v3.10
> >
> > Adding Daniel and Rafael to Cc.
> >
> > Is this series coordinated with the other cpuidle changes? Please tell me if this
> > is good to go into arm-soc.
> 
> Hmm, looks like it's not ready.  There are some minor conflicts with
> what Rafael has queued up from Daniel.
> 
> I will work this out with Daniel to figure out how we should proceed.

OK it seems that this branch can also be queued by Rafael after
updating it if there's a dependency. So far it's not conflicting
with anything else we have queued up for arm soc tree.

Regards,

Tony

[GIT PULL 2/5] omap pm clean-up for v3.10 merge window

[Kevin Hilman]

Tony Lindgren <tony@atomide.com> writes:

> * Kevin Hilman <khilman@linaro.org> [130409 09:43]:
>> Arnd Bergmann <arnd@arndb.de> writes:
>> 
>> > On Tuesday 09 April 2013, Tony Lindgren wrote:
>> >> The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:
>> >> 
>> >>   Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)
>> >> 
>> >> are available in the git repository at:
>> >> 
>> >>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed
>> >> 
>> >> for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc:
>> >> 
>> >>   Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of
>> >> git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm
>> >> into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700)
>> >> 
>> >> ----------------------------------------------------------------
>> >> 
>> >> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>:
>> >> 
>> >> OMAP3/4 CPUidle cleanups for v3.10
>> >
>> > Adding Daniel and Rafael to Cc.
>> >
>> > Is this series coordinated with the other cpuidle changes? Please tell me if this
>> > is good to go into arm-soc.
>> 
>> Hmm, looks like it's not ready.  There are some minor conflicts with
>> what Rafael has queued up from Daniel.
>> 
>> I will work this out with Daniel to figure out how we should proceed.
>
> OK it seems that this branch can also be queued by Rafael after
> updating it if there's a dependency. So far it's not conflicting
> with anything else we have queued up for arm soc tree.

Right, I just did a test rebase onto the relevant commit in Rafael
linux-next branch, and fixed up all the conflicts[1].

If Rafael agrees, it's fine with me if it goes via him.

Rafael, the signed tag for the updated branch is below[1], based on the
commit in your linux-next branch where you merged the rest of the
CPUidle changes.  Let me know if you want a different base commit, or an
official pull request.

Kevin

[1] git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git tags/omap-pm-v3.10/cleanup/cpuidle-v2

[GIT PULL 2/5] omap pm clean-up for v3.10 merge window

[Daniel Lezcano]

On 04/09/2013 07:36 PM, Kevin Hilman wrote:
> Tony Lindgren <tony@atomide.com> writes:
> 
>> * Kevin Hilman <khilman@linaro.org> [130409 09:43]:
>>> Arnd Bergmann <arnd@arndb.de> writes:
>>>
>>>> On Tuesday 09 April 2013, Tony Lindgren wrote:
>>>>> The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:
>>>>>
>>>>>   Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)
>>>>>
>>>>> are available in the git repository at:
>>>>>
>>>>>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed
>>>>>
>>>>> for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc:
>>>>>
>>>>>   Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of
>>>>> git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm
>>>>> into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>>
>>>>> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>:
>>>>>
>>>>> OMAP3/4 CPUidle cleanups for v3.10
>>>>
>>>> Adding Daniel and Rafael to Cc.

Kevin,

I just want to point you this patch:

https://git.linaro.org/gitweb?p=people/dlezcano/cpuidle-next.git;a=commit;h=e03a37fdf942a25154ccb5539524afd336f130bb

I did not yet send it to Rafael.


>>>> Is this series coordinated with the other cpuidle changes? Please tell me if this
>>>> is good to go into arm-soc.
>>>
>>> Hmm, looks like it's not ready.  There are some minor conflicts with
>>> what Rafael has queued up from Daniel.
>>>
>>> I will work this out with Daniel to figure out how we should proceed.
>>
>> OK it seems that this branch can also be queued by Rafael after
>> updating it if there's a dependency. So far it's not conflicting
>> with anything else we have queued up for arm soc tree.
> 
> Right, I just did a test rebase onto the relevant commit in Rafael
> linux-next branch, and fixed up all the conflicts[1].
> 
> If Rafael agrees, it's fine with me if it goes via him.
> 
> Rafael, the signed tag for the updated branch is below[1], based on the
> commit in your linux-next branch where you merged the rest of the
> CPUidle changes.  Let me know if you want a different base commit, or an
> official pull request.
> 
> Kevin
> 
> [1] git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git tags/omap-pm-v3.10/cleanup/cpuidle-v2



-- 
 <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[GIT PULL 2/5] omap pm clean-up for v3.10 merge window

[Kevin Hilman]

Daniel Lezcano <daniel.lezcano@linaro.org> writes:

[...]

>>>>>>
>>>>>> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>:
>>>>>>
>>>>>> OMAP3/4 CPUidle cleanups for v3.10
>>>>>
>>>>> Adding Daniel and Rafael to Cc.
>
> Kevin,
>
> I just want to point you this patch:
>
> https://git.linaro.org/gitweb?p=people/dlezcano/cpuidle-next.git;a=commit;h=e03a37fdf942a25154ccb5539524afd336f130bb
>
> I did not yet send it to Rafael.

I haven't seen that one posted anywhere so it's not in my queue, and
probably too late for v3.10.

Once it's posted, I'll queue it up, and we can maybe get it in for
v3.10-rc.

Kevin

[GIT PULL 2/5] omap pm clean-up for v3.10 merge window

[Daniel Lezcano]

On 04/09/2013 11:47 PM, Kevin Hilman wrote:
> Daniel Lezcano <daniel.lezcano@linaro.org> writes:
> 
> [...]
> 
>>>>>>>
>>>>>>> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>:
>>>>>>>
>>>>>>> OMAP3/4 CPUidle cleanups for v3.10
>>>>>>
>>>>>> Adding Daniel and Rafael to Cc.
>>
>> Kevin,
>>
>> I just want to point you this patch:
>>
>> https://git.linaro.org/gitweb?p=people/dlezcano/cpuidle-next.git;a=commit;h=e03a37fdf942a25154ccb5539524afd336f130bb
>>
>> I did not yet send it to Rafael.
> 
> I haven't seen that one posted anywhere so it's not in my queue, and
> probably too late for v3.10.
> 
> Once it's posted, I'll queue it up, and we can maybe get it in for
> v3.10-rc.

Yes, I just did the fix very recently. It was just a head up. I will
send it to Rafael as soon as the 'bleeding edge' branch is merged with
'linux-next'.


-- 
 <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[GIT PULL 1/5] omap pm fixes for v3.10 merge window

[Tony Lindgren]

The following changes since commit c309f7f46167e85d1aae2fd31f23e7d2b5cdfbe0:

  Merge branch 'for_3.10/omap_generic_cleanup_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/cleanup-v2 (2013-03-28 14:45:31 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/fixes-pm-signed

for you to fetch changes up to 5e7deed71290136cf70944e158f40401d0eed784:

  Merge tag 'omap-pm-v3.10/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.10/fixes-pm (2013-04-08 09:58:00 -0700)

----------------------------------------------------------------

Non-critical PM fix via Kevin Hilman <khilman@linaro.org>:

OMAP PM fixes for v3.10

Note that this has a dependency to omap-for-v3.10/cleanup-v2-signed.

----------------------------------------------------------------
Santosh Shilimkar (1):
      ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method

Tony Lindgren (1):
      Merge tag 'omap-pm-v3.10/fixes/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.10/fixes-pm

 arch/arm/mach-omap2/cpuidle44xx.c |  1 +
 arch/arm/mach-omap2/omap-smp.c    | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

[GIT PULL 2/5] omap pm clean-up for v3.10 merge window

[Tony Lindgren]

The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9:

  Linux 3.9-rc5 (2013-03-31 15:12:43 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed

for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc:

  Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700)

----------------------------------------------------------------

PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>:

OMAP3/4 CPUidle cleanups for v3.10

----------------------------------------------------------------
Daniel Lezcano (1):
      ARM: omap3: cpuidle: enable time keeping

Santosh Shilimkar (5):
      ARM: OMAP4: CPUidle: Avoid double idle driver registration
      ARM: OMAP: CPUidle: Unregister drivere on device registration failure
      ARM: OMAP4: CPUidle: Make C-state description field more precise
      ARM: OMAP4+: CPUidle: Deprecate use of omap4_mpuss_read_prev_context_state()
      ARM: OMAP4+: CPUidle: Consolidate idle driver for OMAP5 support

Tony Lindgren (1):
      Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.10/cleanup-pm

 arch/arm/mach-omap2/common.h              |  5 ----
 arch/arm/mach-omap2/cpuidle34xx.c         | 11 +++++--
 arch/arm/mach-omap2/cpuidle44xx.c         | 48 +++++++++++++++++--------------
 arch/arm/mach-omap2/omap-mpuss-lowpower.c | 14 ---------
 4 files changed, 35 insertions(+), 43 deletions(-)