The following changes since commit 3f96a2d90e6923e2dd1e35d2f149a70a4d0f678c:
Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2 (2012-07-04 00:29:31 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-part2-for-v3.6
for you to fetch changes up to fb584511c4664573097ece7df0de06ad00b713a2:
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700)
----------------------------------------------------------------
This branch contains more clean-up like changes and minor fixes for making
it easier to support new omap SoCs, such as omap5 and am33xx.
This branch has dependencies to earlier clean-up in omap-cleanup-for-v3.6
and omap-devel-dmtimer-for-v3.6 branches, and also depends on the
omap-devel-am33xx-for-v3.6 branch, and are based on a merge of these
branches.
----------------------------------------------------------------
Jon Hunter (2):
ARM: OMAP4: clockdomain/CM code: Update supported transition modes
ARM: OMAP2+: powerdomain code: Fix Wake-up power domain power status
Kishon Vijay Abraham I (1):
ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework
Paul Walmsley (1):
Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6
R Sricharan (1):
ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak
Sakari Ailus (1):
ARM: OMAP3: control: add definition for CONTROL_CAMERA_PHY_CTRL
Santosh Shilimkar (1):
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds
Tarun Kanti DebBarma (3):
ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API
ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe()
ARM: OMAP2+: dmtimer: cleanup fclk usage
Tony Lindgren (2):
Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-part2
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
Vaibhav Hiremath (7):
ARM: OMAP2+: hwmod: Add new sysc_type3 into omap_hwmod required for am33xx
ARM: OMAP3/4: omap_hwmod: Add rstst_offs field to struct omap_hwmod_omap4_prcm
ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry
ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c
ARM: OMAP2+: am33xx: Make am33xx as a separate class
ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals
Vikram Pandita (1):
ARM: OMAP3+: dpll: optimize noncore dpll locking logic
arch/arm/mach-omap2/Kconfig | 12 +++-
arch/arm/mach-omap2/Makefile | 8 ++-
arch/arm/mach-omap2/clock.c | 18 ------
arch/arm/mach-omap2/clock3xxx_data.c | 2 +-
arch/arm/mach-omap2/clock44xx_data.c | 22 ++++----
arch/arm/mach-omap2/clockdomain44xx.c | 10 +++-
arch/arm/mach-omap2/cminst44xx.c | 14 -----
arch/arm/mach-omap2/cminst44xx.h | 25 ---------
arch/arm/mach-omap2/common.c | 10 +---
arch/arm/mach-omap2/common.h | 5 ++
arch/arm/mach-omap2/control.h | 1 +
arch/arm/mach-omap2/dpll3xxx.c | 26 ++++++++-
arch/arm/mach-omap2/id.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 76 ++++++++++++++++++++++++--
arch/arm/mach-omap2/omap_hwmod_common_data.c | 10 ++++
arch/arm/mach-omap2/powerdomain.c | 6 +-
arch/arm/mach-omap2/prcm.c | 23 ++++++++
arch/arm/mach-omap2/prm2xxx_3xxx.h | 65 ----------------------
arch/arm/mach-omap2/prm_common.c | 62 +++++++++++++++++++++
arch/arm/mach-omap2/timer.c | 3 +-
arch/arm/plat-omap/Makefile | 4 +-
arch/arm/plat-omap/dmtimer.c | 53 ++++++------------
arch/arm/plat-omap/include/plat/cpu.h | 17 +++---
arch/arm/plat-omap/include/plat/omap_hwmod.h | 19 +++++++
arch/arm/plat-omap/include/plat/sdrc.h | 2 +-
arch/arm/plat-omap/sram.c | 6 +-
26 files changed, 296 insertions(+), 207 deletions(-)
The following changes since commit ecc46cfdad7499a21296f0757059c4965f1fbc98:
ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals (2012-07-05 08:05:15 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-am33xx-data-for-v3.6
for you to fetch changes up to 79ab2664336d73245023a236345bb31f2b0a2dfe:
Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx-data (2012-07-05 08:18:04 -0700)
----------------------------------------------------------------
This branch adds clock data for am33xx. Note that eventually these
will use the common clock framework, but those patches are not quite
ready yet for omaps. This branch depends on omap-cleanup-part2-for-v3.6
branch.
----------------------------------------------------------------
Paul Walmsley (1):
ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file
Tony Lindgren (1):
Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx-data
Vaibhav Hiremath (1):
ARM: OMAP3+: clock33xx: Add AM33XX clock tree data
arch/arm/mach-omap2/Makefile | 1 +
arch/arm/mach-omap2/clock.h | 14 +
arch/arm/mach-omap2/clock33xx_data.c | 1105 +++++++++++++++++++++++++
arch/arm/mach-omap2/clock3xxx_data.c | 20 +-
arch/arm/mach-omap2/clock44xx_data.c | 72 --
arch/arm/mach-omap2/clock_common_data.c | 77 ++
arch/arm/mach-omap2/io.c | 2 +
arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 +
8 files changed, 1204 insertions(+), 88 deletions(-)
create mode 100644 arch/arm/mach-omap2/clock33xx_data.c
Hi Tony,
On Tue, Jul 10, 2012 at 18:35:55, Tony Lindgren wrote:
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6
for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89:
arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700)
----------------------------------------------------------------
Device tree related patches for omaps
----------------------------------------------------------------
Afzal Mohammed (1):
arm/dts: am33xx wdt node
The above patch seems to be an empty one, actual changes in it as in
original patch [1] is missing, same changes are shown below for your
reference [2].
Can you please do the needful so that the intended change of this
patch makes to mainline this merge window.
Regards
Afzal
[1] http://www.mail-archive.com/linux-omap at vger.kernel.org/msg71644.html
[2]
Hi Tony,
On Tue, Jul 10, 2012 at 18:35:55, Tony Lindgren wrote:
quoted
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6
for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89:
arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700)
----------------------------------------------------------------
Device tree related patches for omaps
----------------------------------------------------------------
Afzal Mohammed (1):
arm/dts: am33xx wdt node
The above patch seems to be an empty one, actual changes in it as in
original patch [1] is missing, same changes are shown below for your
reference [2].
Can you please do the needful so that the intended change of this
patch makes to mainline this merge window.
Argh. Thanks for letting me know. I must have something wrong with
my scripts when applying patches. We'll have to apply this as a fix.
Regards,
Tony
Hi Tony,
On Tue, Jul 10, 2012 at 18:35:55, Tony Lindgren wrote:
quoted
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6
for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89:
arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700)
----------------------------------------------------------------
Device tree related patches for omaps
----------------------------------------------------------------
Afzal Mohammed (1):
arm/dts: am33xx wdt node
The above patch seems to be an empty one, actual changes in it as in
original patch [1] is missing, same changes are shown below for your
reference [2].
Can you please do the needful so that the intended change of this
patch makes to mainline this merge window.
Argh. Thanks for letting me know. I must have something wrong with
my scripts when applying patches. We'll have to apply this as a fix.
Arnd and Olof, let me know if you want me to resubmit a new branch instead
of the already pulled devel-dt branch. That branch should not have other
dependencies as it's based on -rc5. Of course is it's buried into other
DT patches it's too late.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
The above patch seems to be an empty one, actual changes in it as in
original patch [1] is missing, same changes are shown below for your
reference [2].
Can you please do the needful so that the intended change of this
patch makes to mainline this merge window.
Argh. Thanks for letting me know. I must have something wrong with
my scripts when applying patches. We'll have to apply this as a fix.
Arnd and Olof, let me know if you want me to resubmit a new branch instead
of the already pulled devel-dt branch. That branch should not have other
dependencies as it's based on -rc5. Of course is it's buried into other
DT patches it's too late.
Now with -rc1 out, I'll queue the following fix.
Regards,
Tony
From: Afzal Mohammed <redacted>
Date: Wed, 4 Jul 2012 18:00:37 +0530
Subject: [PATCH] arm/dts: Fix am33xx wdt node
Add am33xx wdt node.
Signed-off-by: Afzal Mohammed <redacted>
[tony at atomide.com: I messed up and produced an empty commit db27ac80 with stg apply]
Signed-off-by: Tony Lindgren <tony@atomide.com>
On Tue, Aug 07, 2012 at 12:43:51, Tony Lindgren wrote:
* Tony Lindgren [off-list ref] [120713 01:01]:
quoted
* Tony Lindgren [off-list ref] [120712 23:46]:
quoted
quoted
my scripts when applying patches. We'll have to apply this as a fix.
Arnd and Olof, let me know if you want me to resubmit a new branch instead
of the already pulled devel-dt branch. That branch should not have other
dependencies as it's based on -rc5. Of course is it's buried into other
DT patches it's too late.