* [GIT PULL 2/5] omap cleanup fix and soc detection improvment for v3.8 merge window
[not found] <pull-1352948204-277861>
@ 2012-11-15 2:56 ` Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 3/5] omap common clock changes " Tony Lindgren
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-11-15 2:56 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit e05cf58d50e3ce3601ebf753728eee0df759e38f:
ARM: OMAP2+: remove duplicated include from board-overo.c (2012-11-12 14:02:48 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-fixes-part2-v2-signed
for you to fetch changes up to 42a1cc9c0ec2a00b53b4f02849dc4377b09b3b05:
ARM: OMAP4: ID: Improve features detection and check (2012-11-14 12:10:37 -0800)
----------------------------------------------------------------
One build fix for recent clean up when CONFIG_PM is not set
and clean up related improvment to the SoC detection.
----------------------------------------------------------------
Ivan Khoronzhuk (1):
ARM: OMAP4: ID: Improve features detection and check
Tony Lindgren (1):
ARM: OMAP: Fix compile for OMAP_PM_NOOP if PM is not selected
arch/arm/mach-omap2/Makefile | 3 ++-
arch/arm/mach-omap2/id.c | 25 +++++++------------------
arch/arm/mach-omap2/soc.h | 8 ++------
3 files changed, 11 insertions(+), 25 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL 4/5] omap timer changes for v3.8 merge window
[not found] <pull-1352948204-277861>
` (2 preceding siblings ...)
2012-11-15 2:56 ` [GIT PULL 5/5] omap full-chip retention in suspend " Tony Lindgren
@ 2012-11-15 2:56 ` Tony Lindgren
2012-11-15 16:51 ` [GIT PULL 1/5] omap non critical fixes " Arnd Bergmann
4 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-11-15 2:56 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit d308ba50a1234b299a00e63a95e61fdeb2f1a2df:
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt (2012-11-09 14:58:34 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/timer-signed
for you to fetch changes up to 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
----------------------------------------------------------------
Timer fixes for omaps via Jon Hunter <jon-hunter@ti.com>:
Several fixes for the OMAP DMTIMER driver including ...
1. Adding workaround for OMAP3+ errata i103/i767
2. Fixing posted mode support
3. Spurious interrupts when using match interrupt
4. HWMOD fixes for timers
5. Unnecessary restoration of read-only registers
6. Adds function for disabling timer interrupts
7. Fixing timer1 reset for OMAP1
----------------------------------------------------------------
Jon Hunter (13):
ARM: OMAP: Add DMTIMER definitions for posted mode
ARM: OMAP3+: Implement timer workaround for errata i103 and i767
ARM: OMAP: Fix timer posted mode support
ARM: OMAP3: Correct HWMOD DMTIMER SYSC register declarations
ARM: OMAP2/3: Define HWMOD software reset status for DMTIMERs
ARM: OMAP2+: Don't use __omap_dm_timer_reset()
ARM: OMAP: Fix dmtimer reset for timer1
ARM: OMAP: Don't restore of DMTIMER TISTAT register
ARM: OMAP: Don't restore DMTIMER interrupt status register
ARM: OMAP: Fix spurious interrupts when using timer match feature
ARM: OMAP: Add dmtimer interrupt disable function
ARM: OMAP: Remove unnecessary call to clk_get()
ARM: OMAP: Remove __omap_dm_timer_set_source function
Tony Lindgren (1):
Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 15 ++++-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 41 ++++++------
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 ++
arch/arm/mach-omap2/timer.c | 70 +++++++++++++++-----
arch/arm/plat-omap/dmtimer.c | 77 +++++++++++++---------
arch/arm/plat-omap/include/plat/dmtimer.h | 72 ++++++++++++++------
6 files changed, 188 insertions(+), 91 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL 3/5] omap common clock changes for v3.8 merge window
[not found] <pull-1352948204-277861>
2012-11-15 2:56 ` [GIT PULL 2/5] omap cleanup fix and soc detection improvment for v3.8 merge window Tony Lindgren
@ 2012-11-15 2:56 ` Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 5/5] omap full-chip retention in suspend " Tony Lindgren
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-11-15 2:56 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 89ab216b33ba9405880fd3d89531305a931bc70f:
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock (2012-11-13 13:25:38 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/clock-signed
for you to fetch changes up to 558a0780b0a04862a678f7823215424b4e5501f9:
Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/clock (2012-11-13 13:32:24 -0800)
----------------------------------------------------------------
Common clock framework for omap2+ via Paul Walmsley <paul@pwsan.com>:
Convert the OMAP2+ clock code and data to rely on the common
clock framework for internal bookkeeping and the driver API.
Basic test logs for this branch on top of Tony's cleanup-prcm branch
at commit c9d501e5cb0238910337213e12a09127221c35d8 are here:
http://www.pwsan.com/omap/testlogs/common_clk_devel_3.8_rebase/20121112192516/
However, cleanup-prcm at c9d501e5 does not include some fixes
that are needed for a successful test. With several reverts,
fixes, and workarounds applied, the following test logs were
obtained:
http://www.pwsan.com/omap/testlogs/TEST_common_clk_devel_3.8_rebase/20121112192300/
which indicate that the series tests cleanly.
N.B. The common clock data addition patches result in many
checkpatch warnings of the form "WARNING: static const char *
array should probably be static const char * const". However, it
appears that resolving these would require changes to the CCF
itself. So the resolution of these warnings is being postponed
until that can be coordinated.
These patches result in a ~55KiB increase in runtime kernel memory
usage when booting omap2plus_defconfig kernels.
Conflicts:
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/clock44xx_data.c
Note that this is based on a merge of the omap-for-v3.8/cleanup-prcm
and omap-for-v3.8/pm as otherwise merged in with the pm changes it
would automatically resolve into a non-booting merge for omap3 as
the smartreflex clock names were changed in the pm branch.
----------------------------------------------------------------
Mike Turquette (3):
ARM: OMAP4: clock: Convert to common clk
ARM: OMAP2+: clockdomain: bypass clockdomain handling when disabling unused clks
ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts
Paul Walmsley (7):
ARM: OMAP2xxx: clock: add APLL rate recalculation functions
ARM: OMAP2+: clock: add OMAP CCF convenience macros to mach-omap2/clock.h
ARM: OMAP44xx: clock: drop obsolete clock data
ARM: OMAP3xxx: clk: drop obsolete clock data
ARM: AM33xx: clock: drop obsolete clock data
ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections
ARM: OMAP2xxx: clock: drop obsolete clock data
Rajendra Nayak (15):
ARM: OMAP: clock: Nuke plat/clock.c & reuse struct clk as clk_hw_omap
ARM: OMAP: hwmod: Fix up hwmod based clkdm accesses
ARM: OMAP3: clock: Convert to common clk
ARM: OMAP2: clock: Convert to common clk
ARM: OMAP: clock: list all clk_hw_omap clks to enable/disable autoidle
ARM: OMAP: clock: Define a function to enable clocks at init
ARM: OMAP: clock: Get rid of some clkdm assocations within clks
ARM: OMAP4: clock: Add 44xx data using common struct clk
ARM: OMAP3: clock: Add 3xxx data using common struct clk
ARM: OMAP2: clock: Add 24xx data using common struct clk
ARM: OMAP: clock: Switch to COMMON clk
ARM: OMAP: hwmod: Cleanup !CONFIG_COMMON_CLK parts
ARM: OMAP4: clock: Cleanup !CONFIG_COMMON_CLK parts
ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts
ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts
Tony Lindgren (1):
Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/clock
Vaibhav Hiremath (2):
ARM: OMAP2+: hwmod: Invoke init_clkdm before other init functions
ARM: AM33XX: clock: add clock data in common clock format
arch/arm/mach-omap2/Kconfig | 5 +
arch/arm/mach-omap2/Makefile | 10 +-
arch/arm/mach-omap2/cclock2420_data.c | 1950 ++++++++++++++
arch/arm/mach-omap2/cclock2430_data.c | 2065 +++++++++++++++
arch/arm/mach-omap2/cclock33xx_data.c | 961 +++++++
arch/arm/mach-omap2/cclock3xxx_data.c | 3595 +++++++++++++++++++++++++
arch/arm/mach-omap2/cclock44xx_data.c | 1987 ++++++++++++++
arch/arm/mach-omap2/clkt2xxx_apll.c | 62 +-
arch/arm/mach-omap2/clkt2xxx_dpll.c | 8 +-
arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 13 +-
arch/arm/mach-omap2/clkt2xxx_osc.c | 13 +-
arch/arm/mach-omap2/clkt2xxx_sys.c | 7 +-
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 9 +-
arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 8 +-
arch/arm/mach-omap2/clkt_clksel.c | 194 +-
arch/arm/mach-omap2/clkt_dpll.c | 28 +-
arch/arm/mach-omap2/clkt_iclk.c | 30 +-
arch/arm/mach-omap2/clock.c | 910 ++-----
arch/arm/mach-omap2/clock.h | 329 +--
arch/arm/mach-omap2/clock2420_data.c | 1972 --------------
arch/arm/mach-omap2/clock2430.c | 8 +-
arch/arm/mach-omap2/clock2430_data.c | 2071 ---------------
arch/arm/mach-omap2/clock2xxx.c | 1 +
arch/arm/mach-omap2/clock2xxx.h | 41 +-
arch/arm/mach-omap2/clock33xx_data.c | 1109 --------
arch/arm/mach-omap2/clock34xx.c | 51 +-
arch/arm/mach-omap2/clock3517.c | 24 +-
arch/arm/mach-omap2/clock36xx.c | 22 +-
arch/arm/mach-omap2/clock36xx.h | 2 +-
arch/arm/mach-omap2/clock3xxx.c | 6 +-
arch/arm/mach-omap2/clock3xxx.h | 6 +-
arch/arm/mach-omap2/clock3xxx_data.c | 3613 --------------------------
arch/arm/mach-omap2/clock44xx_data.c | 3398 ------------------------
arch/arm/mach-omap2/clock_common_data.c | 22 +-
arch/arm/mach-omap2/clockdomain.c | 89 +-
arch/arm/mach-omap2/cm-regbits-24xx.h | 5 +
arch/arm/mach-omap2/cm-regbits-34xx.h | 31 +
arch/arm/mach-omap2/cm2xxx_3xxx.h | 1 +
arch/arm/mach-omap2/dpll3xxx.c | 183 +-
arch/arm/mach-omap2/dpll44xx.c | 21 +-
arch/arm/mach-omap2/io.c | 9 +
arch/arm/mach-omap2/omap_hwmod.c | 63 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 +-
arch/arm/mach-omap2/pm24xx.c | 4 +-
arch/arm/mach-omap2/prm-regbits-24xx.h | 2 +
arch/arm/mach-omap2/prm-regbits-34xx.h | 1 +
arch/arm/mach-omap2/prm2xxx_3xxx.h | 1 +
arch/arm/mach-omap2/scrm44xx.h | 2 +
48 files changed, 11486 insertions(+), 13464 deletions(-)
create mode 100644 arch/arm/mach-omap2/cclock2420_data.c
create mode 100644 arch/arm/mach-omap2/cclock2430_data.c
create mode 100644 arch/arm/mach-omap2/cclock33xx_data.c
create mode 100644 arch/arm/mach-omap2/cclock3xxx_data.c
create mode 100644 arch/arm/mach-omap2/cclock44xx_data.c
delete mode 100644 arch/arm/mach-omap2/clock2420_data.c
delete mode 100644 arch/arm/mach-omap2/clock2430_data.c
delete mode 100644 arch/arm/mach-omap2/clock33xx_data.c
delete mode 100644 arch/arm/mach-omap2/clock3xxx_data.c
delete mode 100644 arch/arm/mach-omap2/clock44xx_data.c
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL 5/5] omap full-chip retention in suspend for v3.8 merge window
[not found] <pull-1352948204-277861>
2012-11-15 2:56 ` [GIT PULL 2/5] omap cleanup fix and soc detection improvment for v3.8 merge window Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 3/5] omap common clock changes " Tony Lindgren
@ 2012-11-15 2:56 ` Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 4/5] omap timer changes " Tony Lindgren
2012-11-15 16:51 ` [GIT PULL 1/5] omap non critical fixes " Arnd Bergmann
4 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-11-15 2:56 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91:
Merge tag 'for_3.8-pm-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.8/pm (2012-11-06 17:06:37 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/pm-part2-v3-signed
for you to fetch changes up to 74d29168e9af59c9db1885e27493fbed4d24ef18:
ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n (2012-11-14 17:21:15 -0800)
----------------------------------------------------------------
PM changes via Kevin Hilman <khilman@deeprootsystems.com>:
Add support for full-chip retention in suspend for OMAP4 SoCs
----------------------------------------------------------------
Kevin Hilman (1):
ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n
Rajendra Nayak (1):
ARM: OMAP4: suspend: Program all domains to retention
Tero Kristo (1):
ARM: OMAP4: USB: power down MUSB PHY during boot
Tony Lindgren (2):
Merge tag 'for_3.8-pm-omap4-core-ret' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.8/pm-part2
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/pm-part2
arch/arm/mach-omap2/omap_phy_internal.c | 32 ++++++++++++++++++++++++++++++++
arch/arm/mach-omap2/pm.c | 2 ++
arch/arm/mach-omap2/pm.h | 2 +-
arch/arm/mach-omap2/pm44xx.c | 7 -------
arch/arm/mach-omap2/vc.c | 2 ++
5 files changed, 37 insertions(+), 8 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL 1/5] omap non critical fixes for v3.8 merge window
[not found] <pull-1352948204-277861>
` (3 preceding siblings ...)
2012-11-15 2:56 ` [GIT PULL 4/5] omap timer changes " Tony Lindgren
@ 2012-11-15 16:51 ` Arnd Bergmann
2012-11-15 17:35 ` Tony Lindgren
4 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2012-11-15 16:51 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Olof Johansson, linux-arm-kernel, linux-omap
On Thursday 15 November 2012, Tony Lindgren wrote:
> The following changes since commit 3d70f8c617a436c7146ecb81df2265b4626dfe89:
>
> Linux 3.7-rc4 (2012-11-04 11:07:39 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-non-critical-v4-signed
Pulled all five. Please have a look to make sure everything you need is
there now and still works.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL 1/5] omap non critical fixes for v3.8 merge window
2012-11-15 16:51 ` [GIT PULL 1/5] omap non critical fixes " Arnd Bergmann
@ 2012-11-15 17:35 ` Tony Lindgren
0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-11-15 17:35 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Olof Johansson, linux-arm-kernel, linux-omap
* Arnd Bergmann <arnd@arndb.de> [121115 08:54]:
> On Thursday 15 November 2012, Tony Lindgren wrote:
> > The following changes since commit 3d70f8c617a436c7146ecb81df2265b4626dfe89:
> >
> > Linux 3.7-rc4 (2012-11-04 11:07:39 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-non-critical-v4-signed
>
> Pulled all five. Please have a look to make sure everything you need is
> there now and still works.
Thanks! Diffs fine against what I have in omap-for-v3.8/tmp-merge
except for the following bit that breaks compile for omap2plus_defconfig,
maybe apply it directly to one of your branches?
Regards,
Tony
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 15 Nov 2012 09:22:34 -0800
Subject: [PATCH] ARM: OMAP2+: Fix build for board-generic after a merge conflict
Commit 187e3e06 (ARM: OMAP2+: board files: use SoC-specific system
restart functions) changed to use SoC specific restart functions to
simplify the PRCM code. The changes done to board-generic.c in commit
7dd9d502 (ARM: OMAP3: Add generic machine descriptor for boards with
OMAP3 GP devices) need to be updated accordingly.
Signed-off-by: Tony Lindgren <tony@atomide.com>
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -122,7 +122,7 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)")
.init_machine = omap_generic_init,
.timer = &omap3_secure_timer,
.dt_compat = omap3_gp_boards_compat,
- .restart = omap_prcm_restart,
+ .restart = omap3xxx_restart,
MACHINE_END
#endif
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-11-15 17:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <pull-1352948204-277861>
2012-11-15 2:56 ` [GIT PULL 2/5] omap cleanup fix and soc detection improvment for v3.8 merge window Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 3/5] omap common clock changes " Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 5/5] omap full-chip retention in suspend " Tony Lindgren
2012-11-15 2:56 ` [GIT PULL 4/5] omap timer changes " Tony Lindgren
2012-11-15 16:51 ` [GIT PULL 1/5] omap non critical fixes " Arnd Bergmann
2012-11-15 17:35 ` Tony Lindgren
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).