* [GIT PULL 2/6] omap cleanup for v3.11 merge window
[not found] <pull-1371061475-206272>
@ 2013-06-12 18:24 ` Tony Lindgren
2013-06-12 18:24 ` [GIT PULL 3/6] omap pm changes " Tony Lindgren
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2013-06-12 18:24 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit d683b96b072dc4680fc74964eca77e6a23d1fa6e:
Linux 3.10-rc4 (2013-06-02 17:11:17 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
for you to fetch changes up to 09182ab11b49b67d04598b19eb89cf0bbd672a60:
ARM: OMAP4: hwmod data: Remove irq entries from mcspi, mmc hwmods (2013-06-12 09:41:46 -0700)
----------------------------------------------------------------
Move omap4 over to device tree based booting. This allows us to get rid
a big pile of platform init code for things that are already handled by
device tree related code. As am33xx is already device tree based, we
can also remove the same data for am33xx.
----------------------------------------------------------------
Sricharan R (2):
ARM: OMAP4: hwmod data: Clean up the data file
ARM: OMAP4: hwmod data: Remove irq entries from mcspi, mmc hwmods
Tomi Valkeinen (1):
ARM: OMAP4: hwmod data: add DSS data back
Tony Lindgren (8):
ARM: OMAP2+: Legacy support for wl12xx when booted with devicetree
ARM: OMAP2+: Remove board-4430sdp.c
ARM: OMAP2+: Remove board-omap4panda.c
ARM: OMAP2+: Remove legacy mux data for omap4
ARM: OMAP2+: Remove omap4 pdata from hsmmc.c
ARM: OMAP2+: Remove omap4 pdata for USB
ARM: OMAP2+: Remove omap4 ocp2scp pdata
Merge branch 'am33xx' into omap-for-v3.11/cleanup
Vaibhav Hiremath (1):
ARM: AM33XX: hwmod data: irq, dma and addr info clean up
arch/arm/mach-omap2/Kconfig | 22 -
arch/arm/mach-omap2/Makefile | 3 -
arch/arm/mach-omap2/board-4430sdp.c | 765 --------------
arch/arm/mach-omap2/board-omap4panda.c | 455 --------
arch/arm/mach-omap2/devices.c | 132 +--
arch/arm/mach-omap2/hsmmc.c | 103 +-
arch/arm/mach-omap2/mux.h | 3 -
arch/arm/mach-omap2/mux44xx.c | 1356 ------------------------
arch/arm/mach-omap2/mux44xx.h | 298 ------
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 1067 -------------------
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1544 +---------------------------
arch/arm/mach-omap2/usb-host.c | 194 ----
arch/arm/mach-omap2/usb-musb.c | 3 -
drivers/bus/omap-ocp2scp.c | 60 --
include/linux/platform_data/omap_ocp2scp.h | 31 -
15 files changed, 54 insertions(+), 5982 deletions(-)
delete mode 100644 arch/arm/mach-omap2/board-4430sdp.c
delete mode 100644 arch/arm/mach-omap2/board-omap4panda.c
delete mode 100644 arch/arm/mach-omap2/mux44xx.c
delete mode 100644 arch/arm/mach-omap2/mux44xx.h
delete mode 100644 include/linux/platform_data/omap_ocp2scp.h
^ permalink raw reply [flat|nested] 12+ messages in thread* [GIT PULL 3/6] omap pm changes for v3.11 merge window
[not found] <pull-1371061475-206272>
2013-06-12 18:24 ` [GIT PULL 2/6] omap cleanup for v3.11 merge window Tony Lindgren
@ 2013-06-12 18:24 ` Tony Lindgren
2013-06-12 18:24 ` [GIT PULL 4/6] omap gpmc " Tony Lindgren
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2013-06-12 18:24 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-signed
for you to fetch changes up to 49a34fd5380d249ae8a2173399c62fc5a1fddd70:
Merge tag 'omap-pm-v3.10/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm (2013-05-16 08:27:49 -0700)
----------------------------------------------------------------
Omap PM changes via Kevin Hilman <khilman@linaro.org>:
OMAP PM cleanups for v3.10
----------------------------------------------------------------
Santosh Shilimkar (4):
ARM: OMAP4: PM: Avoid expensive cpu_suspend() path for all CPU power states except off
ARM: OMAP4+: PM: Consolidate MPU subsystem PM code for re-use
ARM: OMAP4+: Make secondary_startup function name more consistent
ARM: OMAP4+: PM: Consolidate OMAP4 PM code to re-use it for OMAP5
Tony Lindgren (1):
Merge tag 'omap-pm-v3.10/cleanup/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.11/pm
arch/arm/mach-omap2/common.h | 4 +-
arch/arm/mach-omap2/omap-headsmp.S | 8 ++--
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 69 +++++++++++++++++++++++++------
arch/arm/mach-omap2/omap-smp.c | 6 +--
arch/arm/mach-omap2/pm44xx.c | 58 +++++++++++++++++++++-----
5 files changed, 113 insertions(+), 32 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread* [GIT PULL 4/6] omap gpmc changes for v3.11 merge window
[not found] <pull-1371061475-206272>
2013-06-12 18:24 ` [GIT PULL 2/6] omap cleanup for v3.11 merge window Tony Lindgren
2013-06-12 18:24 ` [GIT PULL 3/6] omap pm changes " Tony Lindgren
@ 2013-06-12 18:24 ` Tony Lindgren
2013-06-12 18:24 ` [GIT PULL 5/6] omap soc " Tony Lindgren
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2013-06-12 18:24 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
for you to fetch changes up to b3f5525c55ce5cb67af06f04dbbf28358da23a2c:
ARM: OMAP2+: gpmc: Converts GPMC driver to pm_runtime capable (2013-06-12 09:56:30 -0700)
----------------------------------------------------------------
Omap GPMC (General Purpose Memory Controller) changes.
----------------------------------------------------------------
Christoph Fritz (1):
ARM: OMAP2+: nand: reorganize gpmc timing values
Gupta Pekon (1):
ARM: OMAP2+: gpmc: get number of useable GPMC chip-selects via DT
Jon Hunter (1):
ARM: dts: OMAP2+: Simplify NAND support
Mark Jackson (1):
ARM: OMAP2+: Allow NAND transfer mode to be specified in DT
avinash philip (1):
ARM: OMAP2+: gpmc: Converts GPMC driver to pm_runtime capable
Documentation/devicetree/bindings/bus/ti-gpmc.txt | 1 -
.../devicetree/bindings/mtd/gpmc-nand.txt | 8 +++
arch/arm/boot/dts/omap3430-sdp.dts | 1 -
arch/arm/mach-omap2/board-flash.c | 3 ++
arch/arm/mach-omap2/gpmc-nand.c | 44 ++--------------
arch/arm/mach-omap2/gpmc.c | 61 +++++++++++++++++-----
6 files changed, 63 insertions(+), 55 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread* [GIT PULL 5/6] omap soc changes for v3.11 merge window
[not found] <pull-1371061475-206272>
` (2 preceding siblings ...)
2013-06-12 18:24 ` [GIT PULL 4/6] omap gpmc " Tony Lindgren
@ 2013-06-12 18:24 ` Tony Lindgren
2013-06-12 18:24 ` [GIT PULL 6/6] omap5 data " Tony Lindgren
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2013-06-12 18:24 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:
Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-signed
for you to fetch changes up to 4f288f081bb67813d35c10d1b2fa68e863c4b188:
ARM: OMAP2+: AM43x: SRAM base and size (2013-06-12 08:07:23 -0700)
----------------------------------------------------------------
Omap SoC changes. Mostly improves am33xx support, and adds
minimal support for am43x SoCs.
----------------------------------------------------------------
Afzal Mohammed (8):
ARM: OMAP2+: separate out OMAP4 restart
ARM: OMAP2+: AM43x: Kconfig
ARM: OMAP2+: AM43x: kbuild
ARM: OMAP2+: AM43x: soc_is support
ARM: OMAP2+: AM437x: SoC revision detection
ARM: OMAP2+: AM43x: static mapping
ARM: OMAP2+: AM43x: early init
ARM: OMAP2+: AM43x: GP or HS ?
Philip Avinash (1):
ARM: AM33XX: clk: Add clock node for EHRPWM TBCLK
Roger Quadros (1):
ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies
Sanjeev Premi (1):
ARM: OMAP2+: AM43x: SRAM base and size
Tony Lindgren (1):
Merge tag 'omap-devel-b-for-3.11' of http://git.kernel.org/cgit/linux/kernel/git/pjw/omap-pending into omap-for-v3.11/soc
Vaibhav Hiremath (1):
ARM: OMAP2+: AM33xx: Add missing reset status info to GFX hwmod
arch/arm/mach-omap2/Kconfig | 8 ++++++++
arch/arm/mach-omap2/Makefile | 8 ++++++++
arch/arm/mach-omap2/am33xx.h | 1 +
arch/arm/mach-omap2/cclock33xx_data.c | 30 ++++++++++++++++++++++++++++++
arch/arm/mach-omap2/cclock3xxx_data.c | 11 -----------
arch/arm/mach-omap2/cm33xx.h | 2 +-
arch/arm/mach-omap2/common.h | 1 +
arch/arm/mach-omap2/control.h | 8 ++++++++
arch/arm/mach-omap2/id.c | 8 +++++++-
arch/arm/mach-omap2/io.c | 17 +++++++++++++++--
arch/arm/mach-omap2/omap4-common.c | 16 ----------------
arch/arm/mach-omap2/omap4-restart.c | 27 +++++++++++++++++++++++++++
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 3 ++-
arch/arm/mach-omap2/soc.h | 23 +++++++++++++++++++++++
arch/arm/mach-omap2/sram.c | 3 +++
15 files changed, 134 insertions(+), 32 deletions(-)
create mode 100644 arch/arm/mach-omap2/omap4-restart.c
^ permalink raw reply [flat|nested] 12+ messages in thread* [GIT PULL 6/6] omap5 data for v3.11 merge window
[not found] <pull-1371061475-206272>
` (3 preceding siblings ...)
2013-06-12 18:24 ` [GIT PULL 5/6] omap soc " Tony Lindgren
@ 2013-06-12 18:24 ` Tony Lindgren
2013-06-14 21:36 ` Olof Johansson
[not found] ` <51b8bce9.1265310a.49c1.ffff940eSMTPIN_ADDED_MISSING@mx.google.com>
` (3 subsequent siblings)
8 siblings, 1 reply; 12+ messages in thread
From: Tony Lindgren @ 2013-06-12 18:24 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:
Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/omap5-signed
for you to fetch changes up to 6503a8e109a639760408f874c1251060d563942e:
ARM: OMAP5: Remove unused include for ocp2scp (2013-06-09 21:17:15 -0700)
----------------------------------------------------------------
Omap5 SoC data via Paul Walmsley <paul@pwsan.com:
Add support for the OMAP5 SoC family.
As part of the transition to DT, no board files will be used
for OMAP5. The hwmod data is gradually being transitioned
away from arch/arm/mach-omap2: IRQ, DMA, and memory map data
has been moved to DT. Hopefully the dev_attr and clock role
data will be the next step.
Basic test logs are available here, although not for OMAP5,
since I don't have an OMAP5 board:
http://www.pwsan.com/omap/testlogs/omap5_v3.10/20130608130949/
----------------------------------------------------------------
Benoit Cousson (7):
ARM: OMAP5: PRM: Add OMAP54XX register and bitfield files
ARM: OMAP5: CM: Add OMAP54XX register and bitfield files
ARM: OMAP5: PRCM: Add OMAP54XX local MPU PRCM registers
ARM: OMAP5: SCRM: Add OMAP54XX header file.
ARM: OMAP5: clockdomain data: Add OMAP54XX data and update the header
ARM: OMAP5: powerdomain data: Add OMAP54XX data and update the header
ARM: OMAP5: hwmod data: Create initial OMAP5 SOC hwmod data
Santosh Shilimkar (5):
ARM: OMAP4+: PRM: Move function prototypes to common header for re-use
ARM: OMAP4+: CM: Move function prototypes to common header for re-use
ARM: OMAP4+: PRCM MPU: Move function prototypes to common header for re-use
ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data
ARM: OMAP5: Enable build and frameowrk initialisations
Tony Lindgren (2):
Merge tag 'omap-devel-a-for-3.11' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.11/omap5
ARM: OMAP5: Remove unused include for ocp2scp
arch/arm/mach-omap2/Makefile | 4 +
arch/arm/mach-omap2/clockdomain.h | 1 +
arch/arm/mach-omap2/clockdomains54xx_data.c | 464 +++++
arch/arm/mach-omap2/cm-regbits-54xx.h | 1737 ++++++++++++++++
arch/arm/mach-omap2/cm1_44xx.h | 7 +-
arch/arm/mach-omap2/cm1_54xx.h | 213 ++
arch/arm/mach-omap2/cm2_44xx.h | 7 +-
arch/arm/mach-omap2/cm2_54xx.h | 389 ++++
arch/arm/mach-omap2/cm_44xx_54xx.h | 36 +
arch/arm/mach-omap2/io.c | 6 +
arch/arm/mach-omap2/omap_hwmod.h | 1 +
arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2150 ++++++++++++++++++++
arch/arm/mach-omap2/powerdomain.h | 1 +
arch/arm/mach-omap2/powerdomains54xx_data.c | 331 +++
arch/arm/mach-omap2/prcm44xx.h | 6 +
arch/arm/mach-omap2/prcm_mpu44xx.h | 14 +-
arch/arm/mach-omap2/prcm_mpu54xx.h | 87 +
arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h | 36 +
arch/arm/mach-omap2/prm-regbits-54xx.h | 2701 +++++++++++++++++++++++++
arch/arm/mach-omap2/prm44xx.h | 33 +-
arch/arm/mach-omap2/prm44xx_54xx.h | 58 +
arch/arm/mach-omap2/prm54xx.h | 421 ++++
arch/arm/mach-omap2/scrm54xx.h | 231 +++
arch/arm/mach-omap2/voltage.h | 1 +
arch/arm/mach-omap2/voltagedomains54xx_data.c | 102 +
25 files changed, 8982 insertions(+), 55 deletions(-)
create mode 100644 arch/arm/mach-omap2/clockdomains54xx_data.c
create mode 100644 arch/arm/mach-omap2/cm-regbits-54xx.h
create mode 100644 arch/arm/mach-omap2/cm1_54xx.h
create mode 100644 arch/arm/mach-omap2/cm2_54xx.h
create mode 100644 arch/arm/mach-omap2/cm_44xx_54xx.h
create mode 100644 arch/arm/mach-omap2/omap_hwmod_54xx_data.c
create mode 100644 arch/arm/mach-omap2/powerdomains54xx_data.c
create mode 100644 arch/arm/mach-omap2/prcm_mpu54xx.h
create mode 100644 arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h
create mode 100644 arch/arm/mach-omap2/prm-regbits-54xx.h
create mode 100644 arch/arm/mach-omap2/prm44xx_54xx.h
create mode 100644 arch/arm/mach-omap2/prm54xx.h
create mode 100644 arch/arm/mach-omap2/scrm54xx.h
create mode 100644 arch/arm/mach-omap2/voltagedomains54xx_data.c
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [GIT PULL 6/6] omap5 data for v3.11 merge window
2013-06-12 18:24 ` [GIT PULL 6/6] omap5 data " Tony Lindgren
@ 2013-06-14 21:36 ` Olof Johansson
2013-06-17 10:37 ` Tony Lindgren
0 siblings, 1 reply; 12+ messages in thread
From: Olof Johansson @ 2013-06-14 21:36 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-omap, linux-arm-kernel
On Wed, Jun 12, 2013 at 11:24:35AM -0700, Tony Lindgren wrote:
> The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:
>
> Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/omap5-signed
>
> for you to fetch changes up to 6503a8e109a639760408f874c1251060d563942e:
>
> ARM: OMAP5: Remove unused include for ocp2scp (2013-06-09 21:17:15 -0700)
Pulled.
> 25 files changed, 8982 insertions(+), 55 deletions(-)
Owwie.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL 6/6] omap5 data for v3.11 merge window
2013-06-14 21:36 ` Olof Johansson
@ 2013-06-17 10:37 ` Tony Lindgren
0 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2013-06-17 10:37 UTC (permalink / raw)
To: Olof Johansson; +Cc: Arnd Bergmann, linux-omap, linux-arm-kernel
* Olof Johansson <olof@lixom.net> [130614 14:42]:
> On Wed, Jun 12, 2013 at 11:24:35AM -0700, Tony Lindgren wrote:
> > The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:
> >
> > Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/omap5-signed
> >
> > for you to fetch changes up to 6503a8e109a639760408f874c1251060d563942e:
> >
> > ARM: OMAP5: Remove unused include for ocp2scp (2013-06-09 21:17:15 -0700)
>
> Pulled.
Thanks.
> > 25 files changed, 8982 insertions(+), 55 deletions(-)
>
> Owwie.
This is already the squeezed down version with irq and dma data left
out like we also did for am33xx and omap4. Unfortunately getting things
moved to DT and to live under drivers will take a while, and we
decided to deal with moving clocks to drivers first so hwmod will
have to wait a bit.
Regards,
Tony
^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <51b8bce9.1265310a.49c1.ffff940eSMTPIN_ADDED_MISSING@mx.google.com>]
* Re: [GIT PULL 2/6] omap cleanup for v3.11 merge window
[not found] ` <51b8bce9.1265310a.49c1.ffff940eSMTPIN_ADDED_MISSING@mx.google.com>
@ 2013-06-14 21:28 ` Olof Johansson
2013-06-17 10:33 ` Tony Lindgren
0 siblings, 1 reply; 12+ messages in thread
From: Olof Johansson @ 2013-06-14 21:28 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
On Wed, Jun 12, 2013 at 11:24:33AM -0700, Tony Lindgren wrote:
> The following changes since commit d683b96b072dc4680fc74964eca77e6a23d1fa6e:
>
> Linux 3.10-rc4 (2013-06-02 17:11:17 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
>
> for you to fetch changes up to 09182ab11b49b67d04598b19eb89cf0bbd672a60:
>
> ARM: OMAP4: hwmod data: Remove irq entries from mcspi, mmc hwmods (2013-06-12 09:41:46 -0700)
>
> ----------------------------------------------------------------
> Move omap4 over to device tree based booting. This allows us to get rid
> a big pile of platform init code for things that are already handled by
> device tree related code. As am33xx is already device tree based, we
> can also remove the same data for am33xx.
Hm. This one has a somewhat silly conflict with the am33xx hwmod fix for uart2.
I.e. the fix is reverted since the code is no longer needed -- data comes from
device tree. Please double-check my merge resolution on it though.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [GIT PULL 2/6] omap cleanup for v3.11 merge window
2013-06-14 21:28 ` [GIT PULL 2/6] omap cleanup " Olof Johansson
@ 2013-06-17 10:33 ` Tony Lindgren
0 siblings, 0 replies; 12+ messages in thread
From: Tony Lindgren @ 2013-06-17 10:33 UTC (permalink / raw)
To: Olof Johansson; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
* Olof Johansson <olof@lixom.net> [130614 14:34]:
> On Wed, Jun 12, 2013 at 11:24:33AM -0700, Tony Lindgren wrote:
> > The following changes since commit d683b96b072dc4680fc74964eca77e6a23d1fa6e:
> >
> > Linux 3.10-rc4 (2013-06-02 17:11:17 +0900)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
> >
> > for you to fetch changes up to 09182ab11b49b67d04598b19eb89cf0bbd672a60:
> >
> > ARM: OMAP4: hwmod data: Remove irq entries from mcspi, mmc hwmods (2013-06-12 09:41:46 -0700)
> >
> > ----------------------------------------------------------------
> > Move omap4 over to device tree based booting. This allows us to get rid
> > a big pile of platform init code for things that are already handled by
> > device tree related code. As am33xx is already device tree based, we
> > can also remove the same data for am33xx.
>
> Hm. This one has a somewhat silly conflict with the am33xx hwmod fix for uart2.
> I.e. the fix is reverted since the code is no longer needed -- data comes from
> device tree. Please double-check my merge resolution on it though.
Thanks yes that should not be needed any longer in the hwmod data.
Regards,
Tony
^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <51b8bcea.46dbe00a.6f0b.fffffdf1SMTPIN_ADDED_MISSING@mx.google.com>]
* Re: [GIT PULL 3/6] omap pm changes for v3.11 merge window
[not found] ` <51b8bcea.46dbe00a.6f0b.fffffdf1SMTPIN_ADDED_MISSING@mx.google.com>
@ 2013-06-14 21:35 ` Olof Johansson
0 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2013-06-14 21:35 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
On Wed, Jun 12, 2013 at 11:24:34AM -0700, Tony Lindgren wrote:
> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
>
> Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-signed
>
> for you to fetch changes up to 49a34fd5380d249ae8a2173399c62fc5a1fddd70:
>
> Merge tag 'omap-pm-v3.10/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm (2013-05-16 08:27:49 -0700)
Pulled, thanks.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <51b8bcec.41ace00a.4b4c.0772SMTPIN_ADDED_MISSING@mx.google.com>]
* Re: [GIT PULL 5/6] omap soc changes for v3.11 merge window
[not found] ` <51b8bcec.41ace00a.4b4c.0772SMTPIN_ADDED_MISSING@mx.google.com>
@ 2013-06-14 21:35 ` Olof Johansson
0 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2013-06-14 21:35 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
On Wed, Jun 12, 2013 at 11:24:35AM -0700, Tony Lindgren wrote:
> The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:
>
> Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-signed
>
> for you to fetch changes up to 4f288f081bb67813d35c10d1b2fa68e863c4b188:
>
> ARM: OMAP2+: AM43x: SRAM base and size (2013-06-12 08:07:23 -0700)
Pulled, thanks.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <51b8bceb.d447310a.2e65.ffff937fSMTPIN_ADDED_MISSING@mx.google.com>]
* Re: [GIT PULL 4/6] omap gpmc changes for v3.11 merge window
[not found] ` <51b8bceb.d447310a.2e65.ffff937fSMTPIN_ADDED_MISSING@mx.google.com>
@ 2013-06-14 21:37 ` Olof Johansson
0 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2013-06-14 21:37 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
On Wed, Jun 12, 2013 at 11:24:35AM -0700, Tony Lindgren wrote:
> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
>
> Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
>
> for you to fetch changes up to b3f5525c55ce5cb67af06f04dbbf28358da23a2c:
>
> ARM: OMAP2+: gpmc: Converts GPMC driver to pm_runtime capable (2013-06-12 09:56:30 -0700)
>
Pulled.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread