* [GIT PULL 1/2] omap fixes for v3.8 merge window
@ 2012-12-17 19:10 Tony Lindgren
2012-12-17 19:10 ` [GIT PULL 2/2] omap cleanup " Tony Lindgren
2012-12-18 0:39 ` [GIT PULL 1/2] omap fixes " Tony Lindgren
0 siblings, 2 replies; 3+ messages in thread
From: Tony Lindgren @ 2012-12-17 19:10 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 2b8318881ddbcb67c5e8d2178b42284749442222:
Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux (2012-12-15 13:03: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/fixes-for-merge-window-v4-signed
for you to fetch changes up to 2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4:
Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2 (2012-12-16 11:28:10 -0800)
----------------------------------------------------------------
These patches fixes a build error caused by a merge
conflict with the fb code, few timer warnings, and longer
term regressions for tfp410 and omap h4 ethernet. Also
included is a GPIO mode fix for the legacy mux code.
----------------------------------------------------------------
Javier Martinez Canillas (1):
ARM: OMAP2+: common: remove use of vram
Jon Hunter (6):
ARM: OMAP2+: Fix realtime_counter_init warning in timer.c
ARM: AM335x: Fix warning in timer.c
ARM: OMAP2420: Fix ethernet support for OMAP2420 H4
ARM: OMAP: Remove debug-devices.c
ARM: dts: OMAP2420: Correct H4 board memory size
ARM: dts: Add build target for omap4-panda-a4
Oleg Matcovschi (1):
OMAP2+: mux: Fixed gpio mux mode analysis
Roger Quadros (1):
mfd: omap-usb-host: get rid of cpu_is_omap..() macros
Tomi Valkeinen (1):
OMAP: board-files: fix i2c_bus for tfp410
Tony Lindgren (3):
Merge branch 'fixes-timer-build' of git://github.com/jonhunter/linux into omap-for-v3.8/fixes-for-merge-window
ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h
Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2
Vaibhav Hiremath (1):
ARM: OMAP2+: Fix sparse warnings in timer.c
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/omap2420-h4.dts | 2 +-
arch/arm/mach-omap2/Kconfig | 3 +-
arch/arm/mach-omap2/board-3430sdp.c | 1 +
arch/arm/mach-omap2/board-am3517evm.c | 1 +
arch/arm/mach-omap2/board-cm-t35.c | 1 +
arch/arm/mach-omap2/board-devkit8000.c | 1 +
arch/arm/mach-omap2/board-h4.c | 83 +++++--------------
arch/arm/mach-omap2/board-omap3evm.c | 1 +
arch/arm/mach-omap2/board-omap3stalker.c | 1 +
arch/arm/mach-omap2/common.c | 3 -
arch/arm/mach-omap2/mux.c | 10 +--
arch/arm/mach-omap2/mux.h | 20 +++--
arch/arm/mach-omap2/mux34xx.c | 2 +-
arch/arm/mach-omap2/serial.c | 3 +-
arch/arm/mach-omap2/timer.c | 6 +-
arch/arm/mach-omap2/usb-host.c | 4 +
arch/arm/plat-omap/Makefile | 1 -
arch/arm/plat-omap/debug-devices.c | 92 ----------------------
arch/arm/plat-omap/include/plat/debug-devices.h | 2 -
drivers/mfd/omap-usb-host.c | 3 +-
drivers/tty/serial/omap-serial.c | 3 +-
.../linux/platform_data/serial-omap.h | 0
include/linux/platform_data/usb-omap.h | 3 +
include/video/omap-panel-tfp410.h | 2 +-
25 files changed, 64 insertions(+), 185 deletions(-)
delete mode 100644 arch/arm/plat-omap/debug-devices.c
delete mode 100644 arch/arm/plat-omap/include/plat/debug-devices.h
rename arch/arm/plat-omap/include/plat/omap-serial.h => include/linux/platform_data/serial-omap.h (100%)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL 2/2] omap cleanup for v3.8 merge window
2012-12-17 19:10 [GIT PULL 1/2] omap fixes for v3.8 merge window Tony Lindgren
@ 2012-12-17 19:10 ` Tony Lindgren
2012-12-18 0:39 ` [GIT PULL 1/2] omap fixes " Tony Lindgren
1 sibling, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2012-12-17 19:10 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 2b8318881ddbcb67c5e8d2178b42284749442222:
Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux (2012-12-15 13:03: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-for-merge-window-signed
for you to fetch changes up to f64d204b5cf21b282445ba2fa357d970028c9f52:
arch/arm/mach-omap2/dpll3xxx.c: drop if around WARN_ON (2012-12-17 10:50:41 -0800)
----------------------------------------------------------------
Here are few more patches to finish the omap changes for
multiplatform conversion that are not strictly fixes, but
were too complex to do with the dependencies during the
merge window. Those are to move of serial-omap.h to
platform_data, and the removal of remaining cpu_is_omap
macro usage outside mach-omap2.
Then there are several trivial fixes for typos and few
minimal omap2plus_defconfig updates.
----------------------------------------------------------------
AnilKumar Chimata (1):
ARM: OMAP2+: omap2plus_defconfig: Add tps65217 support
Javier Martinez Canillas (2):
ARM: OMAP2+: enable devtmpfs and devtmpfs automount
ARM: OMAP2+: omap2plus_defconfig: enable twl4030 SoC audio
Jon Hunter (1):
ARM: OMAP2+: PMU: Remove unused header
Julia Lawall (1):
arch/arm/mach-omap2/dpll3xxx.c: drop if around WARN_ON
Peter Ujfalusi (1):
ARM: OMAP2+: omap_twl: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER
Srinivas Kandagatla (1):
ARM/omap: use module_platform_driver macro
Tony Lindgren (3):
MAINTAINERS: Add an entry for omap related .dts files
ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage
ARM: OMAP2+: Drop plat/cpu.h for omap2plus
Wei Yongjun (1):
ARM: OMAP4: remove duplicated include from omap_hwmod_44xx_data.c
YOSHIFUJI Hideaki (1):
OMAP2: Fix a typo - replace regist with register.
MAINTAINERS | 9 ++++
arch/arm/configs/omap2plus_defconfig | 5 ++
arch/arm/mach-omap1/Makefile | 2 +-
arch/arm/mach-omap1/fb.c | 80 ++++++++++++++++++++++++++++++
arch/arm/mach-omap2/Makefile | 2 +-
arch/arm/mach-omap2/control.h | 2 +-
arch/arm/mach-omap2/dpll3xxx.c | 3 +-
arch/arm/mach-omap2/drm.c | 1 -
arch/arm/mach-omap2/dss-common.c | 3 +-
arch/arm/{plat-omap => mach-omap2}/fb.c | 50 +------------------
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1 -
arch/arm/mach-omap2/omap_twl.c | 8 +--
arch/arm/mach-omap2/pmu.c | 2 -
arch/arm/mach-omap2/prm2xxx.c | 3 +-
arch/arm/mach-omap2/prm3xxx.c | 3 +-
arch/arm/plat-omap/Makefile | 2 +-
arch/arm/plat-omap/dmtimer.c | 13 +----
arch/arm/plat-omap/include/plat/cpu.h | 4 --
drivers/media/platform/omap3isp/isp.c | 2 -
drivers/power/avs/smartreflex.c | 2 -
20 files changed, 109 insertions(+), 88 deletions(-)
create mode 100644 arch/arm/mach-omap1/fb.c
rename arch/arm/{plat-omap => mach-omap2}/fb.c (76%)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL 1/2] omap fixes for v3.8 merge window
2012-12-17 19:10 [GIT PULL 1/2] omap fixes for v3.8 merge window Tony Lindgren
2012-12-17 19:10 ` [GIT PULL 2/2] omap cleanup " Tony Lindgren
@ 2012-12-18 0:39 ` Tony Lindgren
1 sibling, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2012-12-18 0:39 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [121217 11:13]:
> The following changes since commit 2b8318881ddbcb67c5e8d2178b42284749442222:
>
> Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux (2012-12-15 13:03: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/fixes-for-merge-window-v4-signed
>
> for you to fetch changes up to 2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4:
>
> Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2 (2012-12-16 11:28:10 -0800)
>
> ----------------------------------------------------------------
>
> These patches fixes a build error caused by a merge
> conflict with the fb code, few timer warnings, and longer
> term regressions for tfp410 and omap h4 ethernet. Also
> included is a GPIO mode fix for the legacy mux code.
Also please pick up Paul Walmsley's series "[GIT PULL] ARM: OMAP:
clock/cpuidle: fixes for the v3.8 merge window" if you have
a chance.
Thanks,
Tony
> ----------------------------------------------------------------
> Javier Martinez Canillas (1):
> ARM: OMAP2+: common: remove use of vram
>
> Jon Hunter (6):
> ARM: OMAP2+: Fix realtime_counter_init warning in timer.c
> ARM: AM335x: Fix warning in timer.c
> ARM: OMAP2420: Fix ethernet support for OMAP2420 H4
> ARM: OMAP: Remove debug-devices.c
> ARM: dts: OMAP2420: Correct H4 board memory size
> ARM: dts: Add build target for omap4-panda-a4
>
> Oleg Matcovschi (1):
> OMAP2+: mux: Fixed gpio mux mode analysis
>
> Roger Quadros (1):
> mfd: omap-usb-host: get rid of cpu_is_omap..() macros
>
> Tomi Valkeinen (1):
> OMAP: board-files: fix i2c_bus for tfp410
>
> Tony Lindgren (3):
> Merge branch 'fixes-timer-build' of git://github.com/jonhunter/linux into omap-for-v3.8/fixes-for-merge-window
> ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h
> Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2
>
> Vaibhav Hiremath (1):
> ARM: OMAP2+: Fix sparse warnings in timer.c
>
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/omap2420-h4.dts | 2 +-
> arch/arm/mach-omap2/Kconfig | 3 +-
> arch/arm/mach-omap2/board-3430sdp.c | 1 +
> arch/arm/mach-omap2/board-am3517evm.c | 1 +
> arch/arm/mach-omap2/board-cm-t35.c | 1 +
> arch/arm/mach-omap2/board-devkit8000.c | 1 +
> arch/arm/mach-omap2/board-h4.c | 83 +++++--------------
> arch/arm/mach-omap2/board-omap3evm.c | 1 +
> arch/arm/mach-omap2/board-omap3stalker.c | 1 +
> arch/arm/mach-omap2/common.c | 3 -
> arch/arm/mach-omap2/mux.c | 10 +--
> arch/arm/mach-omap2/mux.h | 20 +++--
> arch/arm/mach-omap2/mux34xx.c | 2 +-
> arch/arm/mach-omap2/serial.c | 3 +-
> arch/arm/mach-omap2/timer.c | 6 +-
> arch/arm/mach-omap2/usb-host.c | 4 +
> arch/arm/plat-omap/Makefile | 1 -
> arch/arm/plat-omap/debug-devices.c | 92 ----------------------
> arch/arm/plat-omap/include/plat/debug-devices.h | 2 -
> drivers/mfd/omap-usb-host.c | 3 +-
> drivers/tty/serial/omap-serial.c | 3 +-
> .../linux/platform_data/serial-omap.h | 0
> include/linux/platform_data/usb-omap.h | 3 +
> include/video/omap-panel-tfp410.h | 2 +-
> 25 files changed, 64 insertions(+), 185 deletions(-)
> delete mode 100644 arch/arm/plat-omap/debug-devices.c
> delete mode 100644 arch/arm/plat-omap/include/plat/debug-devices.h
> rename arch/arm/plat-omap/include/plat/omap-serial.h => include/linux/platform_data/serial-omap.h (100%)
> --
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-18 0:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-17 19:10 [GIT PULL 1/2] omap fixes for v3.8 merge window Tony Lindgren
2012-12-17 19:10 ` [GIT PULL 2/2] omap cleanup " Tony Lindgren
2012-12-18 0:39 ` [GIT PULL 1/2] omap fixes " 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).