| Message ID | pull-1410478051-378788 |
|---|---|
| State | New |
| Headers | show |
On Thu, Sep 11, 2014 at 04:28:55PM -0700, Tony Lindgren wrote: > The following changes since commit d7eb67f7fef9c046f27a975118da2324de65a90c: > > Merge branch 'pull/v3.18/powerdomain-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/fixes-not-urgent (2014-09-08 15:04:24 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/soc-for-v3.18 > > for you to fetch changes up to 377fb3f5d9a34b2913939e0620c1c585b5913bab: > > ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7 (2014-09-09 19:13:41 -0700) > > ---------------------------------------------------------------- > SoC related changes for omaps for v3.18 merge window: > > - PM changes to make the code easier to use on newer SoCs > - PM changes for newer SoCs suspend and resume and wake-up events > - Minor clean-up to remove dead Kconfig options > > Note that these have a dependency to the fixes-v3.18-not-urgent > tag and is based on a commit in that series. Merged. Note that this also has a fresh conflict with the latest fixes, so please check that I resolved it correctly. -Olof
On 22:07-20140923, Olof Johansson wrote: > On Thu, Sep 11, 2014 at 04:28:55PM -0700, Tony Lindgren wrote: > > The following changes since commit d7eb67f7fef9c046f27a975118da2324de65a90c: > > > > Merge branch 'pull/v3.18/powerdomain-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/fixes-not-urgent (2014-09-08 15:04:24 -0700) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/soc-for-v3.18 > > > > for you to fetch changes up to 377fb3f5d9a34b2913939e0620c1c585b5913bab: > > > > ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7 (2014-09-09 19:13:41 -0700) > > > > ---------------------------------------------------------------- > > SoC related changes for omaps for v3.18 merge window: > > > > - PM changes to make the code easier to use on newer SoCs > > - PM changes for newer SoCs suspend and resume and wake-up events > > - Minor clean-up to remove dead Kconfig options > > > > Note that these have a dependency to the fixes-v3.18-not-urgent > > tag and is based on a commit in that series. > > Merged. Note that this also has a fresh conflict with the latest fixes, > so please check that I resolved it correctly. > Looks fine to me.. also, Used a couple of out of tree patches for testing and all looks good from test perspective: am335x-evm: Boot PASS: http://slexy.org/raw/s21ul7EaiK am335x-sk: Boot PASS: http://slexy.org/raw/s2xxG7b5t7 am3517-evm: Boot PASS: http://slexy.org/raw/s21we13Ebk am37x-evm: Boot PASS: http://slexy.org/raw/s209iOnepY am43xx-epos: Boot PASS: http://slexy.org/raw/s28GrriVvz am5728-evm: Boot PASS: http://slexy.org/raw/s2wRllyrn2 BeagleBoard-XM: Boot PASS: http://slexy.org/raw/s2JPCJPebZ beagleboard-vanilla: Boot PASS: http://slexy.org/raw/s2n4Pum58s beaglebone-black: Boot PASS: http://slexy.org/raw/s20yDlR4eu craneboard: Boot PASS: http://slexy.org/raw/s21DECJfEs dra72x-evm: Boot PASS: http://slexy.org/raw/s2WgDuVxXj dra7xx-evm: Boot PASS: http://slexy.org/raw/s2wOi9Okyk OMAP3430-Labrador(LDP): Boot PASS: http://slexy.org/raw/s20qOiwY38 n900: Boot PASS: http://slexy.org/raw/s2j6hBxA2b omap5-evm: Boot PASS: http://slexy.org/raw/s20Of1TCt4 pandaboard-es: Boot PASS: http://slexy.org/raw/s20P0IWXJX pandaboard-vanilla: Boot PASS: http://slexy.org/raw/s20QWs7BP9 sdp2430: Boot PASS: http://slexy.org/raw/s2fXgpekEa sdp3430: Boot PASS: http://slexy.org/raw/s21GW1utPn
* Nishanth Menon <nm@ti.com> [140924 08:24]: > On 22:07-20140923, Olof Johansson wrote: > > On Thu, Sep 11, 2014 at 04:28:55PM -0700, Tony Lindgren wrote: > > > The following changes since commit d7eb67f7fef9c046f27a975118da2324de65a90c: > > > > > > Merge branch 'pull/v3.18/powerdomain-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/fixes-not-urgent (2014-09-08 15:04:24 -0700) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/soc-for-v3.18 > > > > > > for you to fetch changes up to 377fb3f5d9a34b2913939e0620c1c585b5913bab: > > > > > > ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7 (2014-09-09 19:13:41 -0700) > > > > > > ---------------------------------------------------------------- > > > SoC related changes for omaps for v3.18 merge window: > > > > > > - PM changes to make the code easier to use on newer SoCs > > > - PM changes for newer SoCs suspend and resume and wake-up events > > > - Minor clean-up to remove dead Kconfig options > > > > > > Note that these have a dependency to the fixes-v3.18-not-urgent > > > tag and is based on a commit in that series. > > > > Merged. Note that this also has a fresh conflict with the latest fixes, > > so please check that I resolved it correctly. > > > > Looks fine to me.. also, Used a couple of out of tree patches for > testing and all looks good from test perspective: > > am335x-evm: Boot PASS: http://slexy.org/raw/s21ul7EaiK > am335x-sk: Boot PASS: http://slexy.org/raw/s2xxG7b5t7 > am3517-evm: Boot PASS: http://slexy.org/raw/s21we13Ebk > am37x-evm: Boot PASS: http://slexy.org/raw/s209iOnepY > am43xx-epos: Boot PASS: http://slexy.org/raw/s28GrriVvz > am5728-evm: Boot PASS: http://slexy.org/raw/s2wRllyrn2 > BeagleBoard-XM: Boot PASS: http://slexy.org/raw/s2JPCJPebZ > beagleboard-vanilla: Boot PASS: http://slexy.org/raw/s2n4Pum58s > beaglebone-black: Boot PASS: http://slexy.org/raw/s20yDlR4eu > craneboard: Boot PASS: http://slexy.org/raw/s21DECJfEs > dra72x-evm: Boot PASS: http://slexy.org/raw/s2WgDuVxXj > dra7xx-evm: Boot PASS: http://slexy.org/raw/s2wOi9Okyk > OMAP3430-Labrador(LDP): Boot PASS: http://slexy.org/raw/s20qOiwY38 > n900: Boot PASS: http://slexy.org/raw/s2j6hBxA2b > omap5-evm: Boot PASS: http://slexy.org/raw/s20Of1TCt4 > pandaboard-es: Boot PASS: http://slexy.org/raw/s20P0IWXJX > pandaboard-vanilla: Boot PASS: http://slexy.org/raw/s20QWs7BP9 > sdp2430: Boot PASS: http://slexy.org/raw/s2fXgpekEa > sdp3430: Boot PASS: http://slexy.org/raw/s21GW1utPn OK thanks looks good to me also. Regards, Tony
The following changes since commit 69e273c0b0a3c337a521d083374c918dc52c666f: Linux 3.17-rc3 (2014-08-31 18:23:04 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/fixes-v3.18-not-urgent for you to fetch changes up to 31957609db529d401658adc2e91ef7df7ea42699: ARM: OMAP2+: make of_device_ids const (2014-09-11 12:37:23 -0700) ---------------------------------------------------------------- Fixes for omaps that were not considered urgent enough for the -rc cycle: - Fixes for .dts files to differentiate panda and beaglebone versions - Powerdomain fixes from Nishant Menon mostly for newer omaps - Fixes for __initconst and of_device_ids const usage ---------------------------------------------------------------- Nishanth Menon (9): ARM: dts: omap4-panda: Fix model and SoC family details ARM: dts: am335x-bone*: Fix model name and update compatibility information ARM: OMAP: DRA7: powerdomain data: fix powerdomain powerstate ARM: OMAP5: powerdomain data: fix powerdomain powerstate ARM: OMAP2+: powerdomain: pwrdm_for_each_clkdm iterate only valid clkdms ARM: OMAP2+: powerdomain: introduce logic for finding valid power domain ARM: OMAP4+: PM: Make logic state programmable ARM: OMAP4+: PM: use only valid low power state for suspend ARM: OMAP4+: PM: Use only valid low power state for CPU hotplug Tony Lindgren (1): Merge branch 'pull/v3.18/powerdomain-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/fixes-not-urgent Uwe Kleine-König (2): ARM: omap2: make arrays containing machine compatible strings const ARM: OMAP2+: make of_device_ids const arch/arm/boot/dts/am335x-bone-common.dtsi | 3 -- arch/arm/boot/dts/am335x-bone.dts | 5 ++ arch/arm/boot/dts/am335x-boneblack.dts | 5 ++ arch/arm/boot/dts/omap4-panda-common.dtsi | 3 -- arch/arm/boot/dts/omap4-panda-es.dts | 5 ++ arch/arm/boot/dts/omap4-panda.dts | 5 ++ arch/arm/mach-omap2/board-generic.c | 26 +++++----- arch/arm/mach-omap2/common.h | 2 +- arch/arm/mach-omap2/gpmc.c | 2 +- arch/arm/mach-omap2/irq.c | 2 +- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 ++ arch/arm/mach-omap2/pdata-quirks.c | 2 +- arch/arm/mach-omap2/pm44xx.c | 9 +++- arch/arm/mach-omap2/powerdomain.c | 79 ++++++++++++++++++++++++++++- arch/arm/mach-omap2/powerdomain.h | 4 ++ arch/arm/mach-omap2/powerdomains54xx_data.c | 12 ++--- arch/arm/mach-omap2/powerdomains7xx_data.c | 14 ++--- arch/arm/mach-omap2/prm_common.c | 2 +- arch/arm/mach-omap2/timer.c | 6 +-- 19 files changed, 147 insertions(+), 43 deletions(-)