* [GIT PULL 6/6] am33xx changes for v3.6 merge window
[not found] <E1SlGLI-0004Vt-0L@merlin.infradead.org>
@ 2012-07-03 11:32 ` Vaibhav Hiremath
2012-07-03 11:48 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Vaibhav Hiremath @ 2012-07-03 11:32 UTC (permalink / raw)
To: linux-arm-kernel
On 7/1/2012 2:31 PM, Tony Lindgren wrote:
> The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f:
>
> Linux 3.5-rc1 (2012-06-02 18:29:26 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-am33xx-for-v3.6
>
> for you to fetch changes up to 6fd8246b1c1167c983b089f9eaafa13ef9ca7adf:
>
> Merge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx (2012-06-22 01:50:22 -0700)
>
> ----------------------------------------------------------------
>
> Here are changes to add support for am33xx processors for the
> clock, power, and voltagedomains.
>
> ----------------------------------------------------------------
> Afzal Mohammed (2):
> ARM: OMAP2+: am33xx: Add low level debugging support
> ARM: OMAP2+: am33xx: Add AM335XEVM machine support
>
> Tony Lindgren (1):
> Merge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx
>
> Vaibhav Hiremath (6):
> ARM: OMAP2+: control: Add AM33XX control reg & sec clkctrl offset
> ARM: OMAP AM33xx: voltagedomain: Add voltage domain data
> ARM: OMAP AM33xx: PRM: add PRM support
> ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details
> ARM: OMAP AM33xx: powerdomains: add AM335x support
> ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations
>
Hi Tony,
Few patches got missed in this pull request,
ARM: OMAP2+: am33xx: Make am33xx as a separate class
ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
Thanks,
Vaibhav
> arch/arm/mach-omap2/Makefile | 6 +
> arch/arm/mach-omap2/board-generic.c | 18 +
> arch/arm/mach-omap2/clockdomain.h | 2 +
> arch/arm/mach-omap2/clockdomain33xx.c | 74 +++
> arch/arm/mach-omap2/clockdomains33xx_data.c | 196 +++++++
> arch/arm/mach-omap2/cm-regbits-33xx.h | 687 ++++++++++++++++++++++++
> arch/arm/mach-omap2/cm33xx.c | 313 +++++++++++
> arch/arm/mach-omap2/cm33xx.h | 420 +++++++++++++++
> arch/arm/mach-omap2/common.h | 3 +
> arch/arm/mach-omap2/control.h | 39 +-
> arch/arm/mach-omap2/include/mach/debug-macro.S | 17 +-
> arch/arm/mach-omap2/io.c | 13 +
> arch/arm/mach-omap2/irq.c | 2 +-
> arch/arm/mach-omap2/powerdomain.h | 23 +-
> arch/arm/mach-omap2/powerdomain33xx.c | 229 ++++++++
> arch/arm/mach-omap2/powerdomains33xx_data.c | 185 +++++++
> arch/arm/mach-omap2/prm-regbits-33xx.h | 357 ++++++++++++
> arch/arm/mach-omap2/prm33xx.c | 135 +++++
> arch/arm/mach-omap2/prm33xx.h | 129 +++++
> arch/arm/mach-omap2/timer.c | 5 +
> arch/arm/mach-omap2/voltage.h | 1 +
> arch/arm/mach-omap2/voltagedomains33xx_data.c | 43 ++
> arch/arm/plat-omap/include/plat/serial.h | 4 +
> arch/arm/plat-omap/include/plat/uncompress.h | 6 +
> 24 files changed, 2887 insertions(+), 20 deletions(-)
> create mode 100644 arch/arm/mach-omap2/clockdomain33xx.c
> create mode 100644 arch/arm/mach-omap2/clockdomains33xx_data.c
> create mode 100644 arch/arm/mach-omap2/cm-regbits-33xx.h
> create mode 100644 arch/arm/mach-omap2/cm33xx.c
> create mode 100644 arch/arm/mach-omap2/cm33xx.h
> create mode 100644 arch/arm/mach-omap2/powerdomain33xx.c
> create mode 100644 arch/arm/mach-omap2/powerdomains33xx_data.c
> create mode 100644 arch/arm/mach-omap2/prm-regbits-33xx.h
> create mode 100644 arch/arm/mach-omap2/prm33xx.c
> create mode 100644 arch/arm/mach-omap2/prm33xx.h
> create mode 100644 arch/arm/mach-omap2/voltagedomains33xx_data.c
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [GIT PULL 6/6] am33xx changes for v3.6 merge window
2012-07-03 11:32 ` [GIT PULL 6/6] am33xx changes for v3.6 merge window Vaibhav Hiremath
@ 2012-07-03 11:48 ` Tony Lindgren
2012-07-03 11:55 ` Hiremath, Vaibhav
0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2012-07-03 11:48 UTC (permalink / raw)
To: linux-arm-kernel
* Vaibhav Hiremath <hvaibhav@ti.com> [120703 04:37]:
>
> Few patches got missed in this pull request,
>
> ARM: OMAP2+: am33xx: Make am33xx as a separate class
> ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
OK, at least the first needs to be rebased to apply.
Can you please refresh those against current devel-am33xx
branch at commit 6fd8246b1c1167c983b089f9eaafa13ef9ca7adf and
repost?
I'll do a separate pull request for those once they are
ready.
Regards,
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL 6/6] am33xx changes for v3.6 merge window
2012-07-03 11:48 ` Tony Lindgren
@ 2012-07-03 11:55 ` Hiremath, Vaibhav
2012-07-04 6:41 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Hiremath, Vaibhav @ 2012-07-03 11:55 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 03, 2012 at 17:18:56, Tony Lindgren wrote:
> * Vaibhav Hiremath <hvaibhav@ti.com> [120703 04:37]:
> >
> > Few patches got missed in this pull request,
> >
> > ARM: OMAP2+: am33xx: Make am33xx as a separate class
> > ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
>
> OK, at least the first needs to be rebased to apply.
>
> Can you please refresh those against current devel-am33xx
> branch at commit 6fd8246b1c1167c983b089f9eaafa13ef9ca7adf and
> repost?
>
> I'll do a separate pull request for those once they are
> ready.
>
Thanks Tony, I will resubmit them again today.
Also, request you to review and merge Cleanup patch-series I had posted
few days back.
Thanks,
Vaibhav
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL 6/6] am33xx changes for v3.6 merge window
2012-07-03 11:55 ` Hiremath, Vaibhav
@ 2012-07-04 6:41 ` Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2012-07-04 6:41 UTC (permalink / raw)
To: linux-arm-kernel
* Hiremath, Vaibhav <hvaibhav@ti.com> [120703 05:00]:
> On Tue, Jul 03, 2012 at 17:18:56, Tony Lindgren wrote:
> > * Vaibhav Hiremath <hvaibhav@ti.com> [120703 04:37]:
> > >
> > > Few patches got missed in this pull request,
> > >
> > > ARM: OMAP2+: am33xx: Make am33xx as a separate class
> > > ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
> >
> > OK, at least the first needs to be rebased to apply.
> >
> > Can you please refresh those against current devel-am33xx
> > branch at commit 6fd8246b1c1167c983b089f9eaafa13ef9ca7adf and
> > repost?
> >
> > I'll do a separate pull request for those once they are
> > ready.
> >
>
> Thanks Tony, I will resubmit them again today.
> Also, request you to review and merge Cleanup patch-series I had posted
> few days back.
Yes thanks will look.
Regards,
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL 1/6] omap non-critical fixes for v3.6 merge window
@ 2012-07-01 9:01 Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 6/6] am33xx changes " Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2012-07-01 9:01 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
Linux 3.5-rc4 (2012-06-24 12:53:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-fixes-non-critical-for-v3.6
for you to fetch changes up to f6f1f12f6d4e9e4a44587e58ec96db25673083ec:
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes-non-critical (2012-06-29 06:07:08 -0700)
----------------------------------------------------------------
This branch contains fixes that were too intrusive or not
critical enough for the 3.5 -rc cycle. The biggest changes are
fixes for the am35xx clock and hwmod data, and the removal of dead
code for the 730 and 850 headers.
----------------------------------------------------------------
Arnd Bergmann (1):
ARM: OMAP depends on MMU
Brian Austin (1):
ARM: OMAP: beagle: Set USB Host Port 1 to OMAP_USBHS_PORT_MODE_UNUSED
Daniel Lezcano (1):
ARM: OMAP3/4: consolidate cpuidle Makefile
Igor Grinberg (1):
ARM: OMAP: fix the ads7846 init code
Javier Martinez Canillas (1):
ARM: OMAP: omap2plus_defconfig: Enable EXT4 support
Juan Gutierrez (2):
ARM: OMAP: enable mailbox irq per instance
ARM: OMAP4: fix irq and clock name for dsp-iommu
Kevin Hilman (3):
ARM: OMAP2+: TWL: remove usage of pdata->irq_base/_end
mfd: twl: remove pdata->irq_base/_end, no more users
ARM: OMAP2+: fix CONFIG_CPU_IDLE dependency on CONFIG_PM
Mark A. Greer (4):
ARM: OMAP3: PM: Only access IVA if one exists
ARM: OMAP AM35x: EMAC/MDIO integration: Add Davinci EMAC/MDIO hwmod support
ARM: OMAP AM35x: clockdomain data: Fix clockdomain dependencies
arm: omap3: am35x: Set proper powerdomain states
Nishanth Menon (1):
ARM: OMAP2+: OPP: Fix to ensure check of right oppdef after bad one
Ohad Ben-Cohen (1):
ARM: OMAP4: hwspinlocks_init() should be static
Paul Bolle (3):
ARM: OMAP7XX: Remove omap730.h and omap850.h
ARM: OMAP: fix typos related to OMAP330
ARM: OMAP: remove unused cpu detection macros
Paul Walmsley (4):
ARM: OMAP AM35xx: clock and hwmod data: fix AM35xx HSOTGUSB hwmod
ARM: OMAP AM35xx: clock and hwmod data: fix UART4 data
ARM: OMAP: AM35xx: fix UART4 softreset
Merge branches 'am35xx_hwmod_data_fixes_a_3.6', 'am35xx_emac_mdio_devel_3.6' and 'am35xx_prcm_data_devel_3.6' into am35xx_devel_3.6
Peter Ujfalusi (1):
ARM: OMAP2: twl-common: Fix compiler warning
Roland Stigge (1):
ARM: OMAP: Fix dts files w/ status property: "disable" -> "disabled"
Tony Lindgren (5):
Merge branch 'for-tony' of git://git.kernel.org/.../ohad/linux into fixes-omap4-dsp
Merge branch 'fixes-omap4-dsp' into fixes-non-critical
Merge branch 'for_3.6/cleanup/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes-non-critical
Merge branch 'for_3.6/cleanup/twl-irq' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes-non-critical
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into fixes-non-critical
Venkatraman S (1):
ARM: OMAP2+: fix naming collision of variable nr_irqs
arch/arm/Kconfig | 1 +
arch/arm/boot/dts/omap3-beagle.dts | 4 +-
arch/arm/boot/dts/omap4-panda.dts | 6 +-
arch/arm/boot/dts/omap4-sdp.dts | 4 +-
arch/arm/configs/omap2plus_defconfig | 1 +
arch/arm/mach-omap2/Kconfig | 2 +
arch/arm/mach-omap2/Makefile | 7 +-
arch/arm/mach-omap2/am35xx-emac.c | 90 +++++++--------
arch/arm/mach-omap2/board-2430sdp.c | 3 -
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/board-omap3logic.c | 3 -
arch/arm/mach-omap2/clock3xxx_data.c | 28 +++--
arch/arm/mach-omap2/clockdomains3xxx_data.c | 157 ++++++++++++++++++++++++---
arch/arm/mach-omap2/cm-regbits-34xx.h | 4 +-
arch/arm/mach-omap2/common-board-devices.c | 22 ++--
arch/arm/mach-omap2/cpuidle34xx.c | 8 --
arch/arm/mach-omap2/cpuidle44xx.c | 8 --
arch/arm/mach-omap2/include/mach/am35xx.h | 2 +
arch/arm/mach-omap2/irq.c | 8 +-
arch/arm/mach-omap2/mailbox.c | 2 -
arch/arm/mach-omap2/omap-iommu.c | 6 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 143 ++++++++++++++++++++++--
arch/arm/mach-omap2/opp.c | 3 +-
arch/arm/mach-omap2/pm.h | 17 ++-
arch/arm/mach-omap2/pm34xx.c | 15 ++-
arch/arm/mach-omap2/powerdomains3xxx_data.c | 139 ++++++++++++++++++++++--
arch/arm/mach-omap2/prcm-common.h | 4 +-
arch/arm/mach-omap2/prm_common.c | 8 +-
arch/arm/mach-omap2/twl-common.c | 11 +-
arch/arm/plat-omap/include/plat/cpu.h | 20 +---
arch/arm/plat-omap/include/plat/mux.h | 2 +-
arch/arm/plat-omap/include/plat/omap730.h | 102 -----------------
arch/arm/plat-omap/include/plat/omap850.h | 102 -----------------
arch/arm/plat-omap/mailbox.c | 13 ++-
include/linux/i2c/twl.h | 1 -
35 files changed, 550 insertions(+), 398 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat/omap730.h
delete mode 100644 arch/arm/plat-omap/include/plat/omap850.h
^ permalink raw reply [flat|nested] 5+ messages in thread* [GIT PULL 6/6] am33xx changes for v3.6 merge window
2012-07-01 9:01 [GIT PULL 1/6] omap non-critical fixes " Tony Lindgren
@ 2012-07-01 9:01 ` Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2012-07-01 9:01 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f:
Linux 3.5-rc1 (2012-06-02 18:29:26 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-am33xx-for-v3.6
for you to fetch changes up to 6fd8246b1c1167c983b089f9eaafa13ef9ca7adf:
Merge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx (2012-06-22 01:50:22 -0700)
----------------------------------------------------------------
Here are changes to add support for am33xx processors for the
clock, power, and voltagedomains.
----------------------------------------------------------------
Afzal Mohammed (2):
ARM: OMAP2+: am33xx: Add low level debugging support
ARM: OMAP2+: am33xx: Add AM335XEVM machine support
Tony Lindgren (1):
Merge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx
Vaibhav Hiremath (6):
ARM: OMAP2+: control: Add AM33XX control reg & sec clkctrl offset
ARM: OMAP AM33xx: voltagedomain: Add voltage domain data
ARM: OMAP AM33xx: PRM: add PRM support
ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details
ARM: OMAP AM33xx: powerdomains: add AM335x support
ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations
arch/arm/mach-omap2/Makefile | 6 +
arch/arm/mach-omap2/board-generic.c | 18 +
arch/arm/mach-omap2/clockdomain.h | 2 +
arch/arm/mach-omap2/clockdomain33xx.c | 74 +++
arch/arm/mach-omap2/clockdomains33xx_data.c | 196 +++++++
arch/arm/mach-omap2/cm-regbits-33xx.h | 687 ++++++++++++++++++++++++
arch/arm/mach-omap2/cm33xx.c | 313 +++++++++++
arch/arm/mach-omap2/cm33xx.h | 420 +++++++++++++++
arch/arm/mach-omap2/common.h | 3 +
arch/arm/mach-omap2/control.h | 39 +-
arch/arm/mach-omap2/include/mach/debug-macro.S | 17 +-
arch/arm/mach-omap2/io.c | 13 +
arch/arm/mach-omap2/irq.c | 2 +-
arch/arm/mach-omap2/powerdomain.h | 23 +-
arch/arm/mach-omap2/powerdomain33xx.c | 229 ++++++++
arch/arm/mach-omap2/powerdomains33xx_data.c | 185 +++++++
arch/arm/mach-omap2/prm-regbits-33xx.h | 357 ++++++++++++
arch/arm/mach-omap2/prm33xx.c | 135 +++++
arch/arm/mach-omap2/prm33xx.h | 129 +++++
arch/arm/mach-omap2/timer.c | 5 +
arch/arm/mach-omap2/voltage.h | 1 +
arch/arm/mach-omap2/voltagedomains33xx_data.c | 43 ++
arch/arm/plat-omap/include/plat/serial.h | 4 +
arch/arm/plat-omap/include/plat/uncompress.h | 6 +
24 files changed, 2887 insertions(+), 20 deletions(-)
create mode 100644 arch/arm/mach-omap2/clockdomain33xx.c
create mode 100644 arch/arm/mach-omap2/clockdomains33xx_data.c
create mode 100644 arch/arm/mach-omap2/cm-regbits-33xx.h
create mode 100644 arch/arm/mach-omap2/cm33xx.c
create mode 100644 arch/arm/mach-omap2/cm33xx.h
create mode 100644 arch/arm/mach-omap2/powerdomain33xx.c
create mode 100644 arch/arm/mach-omap2/powerdomains33xx_data.c
create mode 100644 arch/arm/mach-omap2/prm-regbits-33xx.h
create mode 100644 arch/arm/mach-omap2/prm33xx.c
create mode 100644 arch/arm/mach-omap2/prm33xx.h
create mode 100644 arch/arm/mach-omap2/voltagedomains33xx_data.c
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-07-04 6:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1SlGLI-0004Vt-0L@merlin.infradead.org>
2012-07-03 11:32 ` [GIT PULL 6/6] am33xx changes for v3.6 merge window Vaibhav Hiremath
2012-07-03 11:48 ` Tony Lindgren
2012-07-03 11:55 ` Hiremath, Vaibhav
2012-07-04 6:41 ` Tony Lindgren
2012-07-01 9:01 [GIT PULL 1/6] omap non-critical fixes " Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 6/6] am33xx changes " 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).