* [GIT PULL 7/7] minimal omap board updates for upcoming merge window
[not found] <pull-1331240009-558004>
@ 2012-03-08 20:53 ` Tony Lindgren
2012-03-08 20:53 ` [GIT PULL 4/7] tiny uart clean-up " Tony Lindgren
` (4 subsequent siblings)
5 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-03-08 20:53 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
This one contains minimal updates to existing board
files so people can use the mainline kernel easier.
Note that the board-omap4panda.c changes have a minor merge
conflict in the ASoC tree in next/master.
The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d:
Linus Torvalds (1):
Linux 3.3-rc6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap board
Aaro Koskinen (1):
ARM: OMAP: add minimal support for Nokia RM-696
Alex (1):
ARM: OMAP: Add omap_reserve functionality
Grazvydas Ignotas (1):
ARM: OMAP: pandora: add support for backlight and poweroff
Igor Grinberg (1):
ARM: OMAP3: cm-t3517: add EMAC support
Ilya Yanok (1):
ARM: OMAP: move generic EMAC init to separate file
Mircea Gherzan (1):
ARM: OMAP: enable Bluetooth on the PandaBoard
Uwe Kleine-Knig (1):
ARM: OMAP4: board-4430sdp: don't initialize value that is never used
Vladimir Zapolskiy (1):
ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpios
arch/arm/mach-omap2/Kconfig | 3 +-
arch/arm/mach-omap2/Makefile | 3 +
arch/arm/mach-omap2/am35xx-emac.c | 117 ++++++++++++++++++++++++++
arch/arm/mach-omap2/am35xx-emac.h | 15 ++++
arch/arm/mach-omap2/board-4430sdp.c | 5 +-
arch/arm/mach-omap2/board-am3517evm.c | 117 +-------------------------
arch/arm/mach-omap2/board-cm-t3517.c | 2 +
arch/arm/mach-omap2/board-omap3logic.c | 2 +
arch/arm/mach-omap2/board-omap3pandora.c | 11 +++
arch/arm/mach-omap2/board-omap4panda.c | 6 ++
arch/arm/mach-omap2/board-rm680.c | 14 +++-
arch/arm/mach-omap2/board-rx51-peripherals.c | 25 +++---
arch/arm/plat-omap/include/plat/uncompress.h | 1 +
13 files changed, 192 insertions(+), 129 deletions(-)
create mode 100644 arch/arm/mach-omap2/am35xx-emac.c
create mode 100644 arch/arm/mach-omap2/am35xx-emac.h
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 4/7] tiny uart clean-up for upcoming merge window
[not found] <pull-1331240009-558004>
2012-03-08 20:53 ` [GIT PULL 7/7] minimal omap board updates for upcoming merge window Tony Lindgren
@ 2012-03-08 20:53 ` Tony Lindgren
2012-03-08 20:53 ` [GIT PULL 2/7] omap1 ams-delta clean-up Tony Lindgren
` (3 subsequent siblings)
5 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-03-08 20:53 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
This one contains removal of some now unneded code.
Also suggested to pull into cleanup branch.
The following changes since commit b01543dfe67bb1d191998e90d20534dc354de059:
Linus Torvalds (1):
Linux 3.3-rc4
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap uart
NeilBrown (2):
ARM: OMAP2+: UART: remove unused fields in omap_uart_state.
ARM: OMAP2+: remove some orphan function declarations.
Tony Lindgren (1):
Merge branch 'for_3.4/cleanup/uart' of git://git.kernel.org/.../khilman/linux-omap-pm into uart
arch/arm/mach-omap2/pm.h | 1 -
arch/arm/mach-omap2/serial.c | 4 ----
arch/arm/plat-omap/include/plat/serial.h | 1 -
3 files changed, 0 insertions(+), 6 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 2/7] omap1 ams-delta clean-up
[not found] <pull-1331240009-558004>
2012-03-08 20:53 ` [GIT PULL 7/7] minimal omap board updates for upcoming merge window Tony Lindgren
2012-03-08 20:53 ` [GIT PULL 4/7] tiny uart clean-up " Tony Lindgren
@ 2012-03-08 20:53 ` Tony Lindgren
2012-03-08 20:53 ` [GIT PULL 3/7] PM clean-up for the upcoming merge window Tony Lindgren
` (2 subsequent siblings)
5 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-03-08 20:53 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
This one contains the recently discussed omap1 ams-delta
clean-up to pull into the board branch. This removes the
last remaining section warnings for omap1, at least when
using omap1_defconfig.
As this depends on already merged omap1 branch 967809b
in arm-soc boards branch, and for a later than -rc1 to
compile on omap1, this one is based on a merge of omap1
and -rc5. So the suggested pull location is boards branch.
The following changes since commit 42392762149cba0a74c1c5b1b1bb868d86e62383:
Tony Lindgren (1):
Merge branch 'omap1' into ams-delta
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap ams-delta
Janusz Krzysztofik (5):
ARM: OMAP1: ams-delta: fix incorrect section tags
ARM: OMAP1: ams-delta: clean up init data section assignments
ARM: OMAP1: ams-delta: set up regulator over modem reset GPIO pin
ARM: OMAP1: ams-delta: update the modem to use regulator API
ASoC: OMAP: ams-delta: drop .set_bias_level callback
arch/arm/mach-omap1/Kconfig | 2 +
arch/arm/mach-omap1/board-ams-delta.c | 116 +++++++++++++++++----
arch/arm/plat-omap/include/plat/board-ams-delta.h | 1 -
drivers/input/serio/ams_delta_serio.c | 2 +-
drivers/mtd/nand/ams-delta.c | 2 +-
drivers/video/omap/lcd_ams_delta.c | 2 +-
sound/soc/omap/ams-delta.c | 32 ------
7 files changed, 101 insertions(+), 56 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 3/7] PM clean-up for the upcoming merge window
[not found] <pull-1331240009-558004>
` (2 preceding siblings ...)
2012-03-08 20:53 ` [GIT PULL 2/7] omap1 ams-delta clean-up Tony Lindgren
@ 2012-03-08 20:53 ` Tony Lindgren
2012-03-08 20:53 ` [GIT PULL 6/7] smartreflex fixes and clean-up for " Tony Lindgren
2012-03-08 20:53 ` [GIT PULL 5/7] more DT changes " Tony Lindgren
5 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-03-08 20:53 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
This contains PM clean-up for the upcoming merge window.
As this was conflicting with both already queued cleanup
and hsmmc in fixes-non-critical branches, Kevin based the
series on a merge of the two. Suggest pulling this into
cleanup, this makes cleanup depend on fixes-non-critical,
which I believe already the case.
The following changes since commit 015f1e4297ad32f83251f3f4cee2389ce5516e9e:
Kevin Hilman (1):
Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap cleanup-pm
Jean Pihet (1):
ARM: OMAP2+: PM debug: fix the use of debugfs_create_* API
Kevin Hilman (1):
ARM: OMAP: omap_device: remove omap_device_parent
Paul Walmsley (5):
ARM: OMAP3: PM: remove superfluous calls to pwrdm_clear_all_prev_pwrst()
ARM: OMAP2+: PM: clean up omap_set_pwrdm_state()
ARM: OMAP2+: PM: share clkdms_setup() across OMAP2, 3, 4
ARM: OMAP2+: omap_device: call all suspend, resume callbacks when OMAP_DEVICE_NO_IDLE_ON_SUSPEND is set
ARM: OMAP2+: PM: share some suspend-related functions across OMAP2, 3, 4
Tony Lindgren (1):
Merge branch 'for_3.4/cleanup/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into cleanup-pm
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 -
arch/arm/mach-omap2/pm-debug.c | 6 +-
arch/arm/mach-omap2/pm.c | 113 ++++++++++++++++++++-----
arch/arm/mach-omap2/pm.h | 2 +
arch/arm/mach-omap2/pm24xx.c | 75 ++---------------
arch/arm/mach-omap2/pm34xx.c | 74 +----------------
arch/arm/mach-omap2/pm44xx.c | 57 +------------
arch/arm/plat-omap/include/plat/omap_device.h | 2 +-
arch/arm/plat-omap/omap-pm-noop.c | 2 +-
arch/arm/plat-omap/omap_device.c | 24 ++----
10 files changed, 118 insertions(+), 239 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 6/7] smartreflex fixes and clean-up for upcoming merge window
[not found] <pull-1331240009-558004>
` (3 preceding siblings ...)
2012-03-08 20:53 ` [GIT PULL 3/7] PM clean-up for the upcoming merge window Tony Lindgren
@ 2012-03-08 20:53 ` Tony Lindgren
2012-03-08 20:53 ` [GIT PULL 5/7] more DT changes " Tony Lindgren
5 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-03-08 20:53 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
This one contains clean-up and fixes for the smartreflex
so it can be eventually moved to live under drivers.
After this series, the next series will move this to
drivers.
As this depends on earlier fixes-non-critical merged
into arm-soc, this one is based on commit 149f1d5c
there. This would be probably best merged into driver
branch that would then depend on fixes-non-critical.
The following changes since commit 149f1d5c8d2fd6879cdf93ca70f1cb745e698a1e:
Tony Lindgren (1):
ARM: OMAP2+: Fix devexit for smartreflex when CONFIG_HOTPLUG is not set
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap sr
Felipe Balbi (4):
ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()
ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument
ARM: OMAP3+: SmartReflex: misc cleanups
ARM: OMAP3+: SmartReflex: micro-optimization for sanity check
Jean Pihet (2):
ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API
ARM: OMAP3+: SmartReflex: fix error handling
Nishanth Menon (6):
ARM: OMAP3+: SmartReflex: fix err interrupt disable sequence
ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP
ARM: OMAP3+: SmartReflex: Add a shutdown hook
ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need
ARM: OMAP3+: hwmod: add SmartReflex IRQs
Shweta Gulati (1):
ARM: OMAP3+: SmartReflex: use voltage domain name in device attributes
Tony Lindgren (1):
Merge branch 'for_3.4/cleanup/sr' of git://git.kernel.org/.../khilman/linux-omap-pm into sr
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 31 +++-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 19 ++-
arch/arm/mach-omap2/smartreflex-class3.c | 1 +
arch/arm/mach-omap2/smartreflex.c | 227 +++++++++++++++++++-------
arch/arm/mach-omap2/smartreflex.h | 10 +
arch/arm/mach-omap2/sr_device.c | 11 +-
arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 -
7 files changed, 229 insertions(+), 72 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 5/7] more DT changes for upcoming merge window
[not found] <pull-1331240009-558004>
` (4 preceding siblings ...)
2012-03-08 20:53 ` [GIT PULL 6/7] smartreflex fixes and clean-up for " Tony Lindgren
@ 2012-03-08 20:53 ` Tony Lindgren
5 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-03-08 20:53 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
Here are some more changes to the DT branch.
As these depend both on the earlier omap dt patches pulled in, and
irqdomain patches queued by Grant, Benoit based on a merge
of the two. Looks like arm-soc/next/dt already has Grant's
commit 280ad7fd, so this should not add any new dependencies.
The following changes since commit 1f52299ec000e2161635b263d81ab92ea7f1f0a7:
Benoit Cousson (1):
Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6 into for_3.4/dt_irq_domain2
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap dt-part2
Benoit Cousson (3):
ARM: OMAP2/3: intc: Add DT support for TI interrupt controller
arm/dts: OMAP3: Add interrupt-controller bindings for INTC
ARM: OMAP2+: board-generic: Use of_irq_init API
Ilya Yanok (1):
arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board
Tony Lindgren (3):
Merge branch 'for_3.4/dt_irq_domain' of git://git.kernel.org/.../bcousson/linux-omap-dt into dt-part2
ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected
ARM: OMAP2+: Remove extra ifdefs for board-generic
.../devicetree/bindings/arm/omap/intc.txt | 27 ++++++
arch/arm/boot/dts/am3517_mt_ventoux.dts | 27 ++++++
arch/arm/boot/dts/omap3.dtsi | 6 +-
arch/arm/mach-omap2/board-generic.c | 99 ++++++++++----------
arch/arm/mach-omap2/common.h | 12 +++
arch/arm/mach-omap2/irq.c | 60 ++++++++++--
6 files changed, 168 insertions(+), 63 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/omap/intc.txt
create mode 100644 arch/arm/boot/dts/am3517_mt_ventoux.dts
^ permalink raw reply [flat|nested] 6+ messages in thread