* [GIT PULL 2/5] First set of omap SoC related changes
[not found] <pull-1330546506-268554>
@ 2012-02-29 20:15 ` Tony Lindgren
2012-02-29 20:15 ` [GIT PULL 3/5] First set of omap1 " Tony Lindgren
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Tony Lindgren @ 2012-02-29 20:15 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
This contains two changes that were too late
for the previous merge window so let's get these
out of the way first.
Regards,
Tony
The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f:
Linus Torvalds (1):
Linux 3.3-rc1
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap soc
Tony Lindgren (1):
Merge branch 'soc-part2' into soc
Vaibhav Hiremath (2):
ARM: OMAP2+: Make cpu_rev static global variable
ARM: OMAP2+: split omap2/3/4_check_revision function
arch/arm/mach-omap2/id.c | 186 ++++++++++++++-------------------
arch/arm/mach-omap2/io.c | 9 ++-
arch/arm/plat-omap/include/plat/cpu.h | 7 +-
3 files changed, 92 insertions(+), 110 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL 3/5] First set of omap1 related changes
[not found] <pull-1330546506-268554>
2012-02-29 20:15 ` [GIT PULL 2/5] First set of omap SoC related changes Tony Lindgren
@ 2012-02-29 20:15 ` Tony Lindgren
2012-02-29 20:15 ` [GIT PULL 5/5] Clean-up for omap Tony Lindgren
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Tony Lindgren @ 2012-02-29 20:15 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
These too we considered too late for the last merge window,
there will be another set coming after this.
Regards,
Tony
The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f:
Linus Torvalds (1):
Linux 3.3-rc1
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap omap1
Janusz Krzysztofik (7):
ARM: OMAP1: ams-delta: register latch dependent devices later
ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio
LED: drop leds-ams-delta driver
MTD: NAND: ams-delta: use GPIO instead of custom I/O
omapfb: lcd_ams_delta: drive control lines over GPIO
input: serio: ams-delta: toggle keyboard power over GPIO
Tony Lindgren (1):
Merge branch 'omap1-part2' into omap1
arch/arm/mach-omap1/Kconfig | 2 +
arch/arm/mach-omap1/board-ams-delta.c | 226 +++++++++++++++++----
arch/arm/plat-omap/include/plat/board-ams-delta.h | 48 ++---
drivers/input/serio/ams_delta_serio.c | 54 +++--
drivers/leds/Kconfig | 7 -
drivers/leds/Makefile | 1 -
drivers/leds/leds-ams-delta.c | 126 ------------
drivers/mtd/nand/ams-delta.c | 74 +++++--
drivers/video/omap/lcd_ams_delta.c | 27 ++-
sound/soc/omap/ams-delta.c | 2 +-
10 files changed, 318 insertions(+), 249 deletions(-)
delete mode 100644 drivers/leds/leds-ams-delta.c
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL 5/5] Clean-up for omap
[not found] <pull-1330546506-268554>
2012-02-29 20:15 ` [GIT PULL 2/5] First set of omap SoC related changes Tony Lindgren
2012-02-29 20:15 ` [GIT PULL 3/5] First set of omap1 " Tony Lindgren
@ 2012-02-29 20:15 ` Tony Lindgren
2012-02-29 20:15 ` [GIT PULL 4/5] First round of DT related omap changes Tony Lindgren
2012-02-29 20:55 ` [GIT PULL 1/5] non-critical fixes for v3.4 merge window Arnd Bergmann
4 siblings, 0 replies; 10+ messages in thread
From: Tony Lindgren @ 2012-02-29 20:15 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
This is mostly changes needed for io.h removal, and one
patch to remove unused flag for McSPI. Note that these
are based on RMK's for-armsoc.
Also, these cause a minor merge conflict for mach-omap2/Kconfig
with the fixes-non-critical posted in this series of pull
requests.
Regards,
Tony
The following changes since commit 61b80086a525c8a6081257ae40da5dee2bcaee16:
Russell King (1):
Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap cleanup
Jarkko Nikula (1):
ARM: OMAP: McSPI: Remove unused flag from struct omap2_mcspi_device_config
Paul Walmsley (1):
ARM: OMAP2xxx: PM: remove obsolete timer disable code in the suspend path
Tony Lindgren (10):
ARM: OMAP2+: Drop DISPC L3 firewall code
ARM: OMAP2+: Move SDRC related functions from io.h into local common.h
ARM: OMAP: Move omap_init_consistent_dma_size() to local common.h
ARM: OMAP1: Move 16xx GPIO system clock to platform init code
ARM: OMAP1: Move most of plat/io.h into local iomap.h
ARM: OMAP2+: Move most of plat/io.h into local iomap.h
ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h
ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers
Merge branch 'iomap' into cleanup
ARM: OMAP2+: Fix L4_EMU_34XX_BASE error after iomap changes
arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +-
arch/arm/mach-omap1/ams-delta-fiq.c | 1 +
arch/arm/mach-omap1/board-ams-delta.c | 10 ++-
arch/arm/mach-omap1/board-fsample.c | 7 +-
arch/arm/mach-omap1/board-h2.c | 6 +-
arch/arm/mach-omap1/board-h3.c | 8 +-
arch/arm/mach-omap1/board-htcherald.c | 5 +-
arch/arm/mach-omap1/board-innovator.c | 7 +-
arch/arm/mach-omap1/board-nokia770.c | 6 +-
arch/arm/mach-omap1/board-osk.c | 7 +-
arch/arm/mach-omap1/board-palmte.c | 4 +-
arch/arm/mach-omap1/board-palmtt.c | 9 +-
arch/arm/mach-omap1/board-palmz71.c | 9 +-
arch/arm/mach-omap1/board-perseus2.c | 7 +-
arch/arm/mach-omap1/board-sx1.c | 6 +-
arch/arm/mach-omap1/board-voiceblue.c | 6 +-
arch/arm/mach-omap1/clock.c | 5 +-
arch/arm/mach-omap1/clock_data.c | 5 +-
arch/arm/mach-omap1/common.h | 1 +
arch/arm/mach-omap1/devices.c | 8 +-
arch/arm/mach-omap1/dma.c | 2 +-
arch/arm/mach-omap1/flash.c | 4 +-
arch/arm/mach-omap1/fpga.c | 5 +-
arch/arm/mach-omap1/gpio16xx.c | 7 ++
arch/arm/mach-omap1/id.c | 3 +
arch/arm/mach-omap1/include/mach/entry-macro.S | 4 +-
arch/arm/mach-omap1/include/mach/hardware.h | 36 +++++++++
arch/arm/mach-omap1/include/mach/io.h | 43 ++++++++++-
arch/arm/mach-omap1/include/mach/memory.h | 3 +-
arch/arm/mach-omap1/io.c | 3 +
arch/arm/mach-omap1/iomap.h | 42 ++++++++++
arch/arm/mach-omap1/irq.c | 4 +-
arch/arm/mach-omap1/lcd_dma.c | 3 +-
arch/arm/mach-omap1/mcbsp.c | 5 +-
arch/arm/mach-omap1/pm.c | 4 +-
arch/arm/mach-omap1/reset.c | 3 +-
arch/arm/mach-omap1/sleep.S | 4 +
arch/arm/mach-omap1/sram.S | 4 +
arch/arm/mach-omap1/time.c | 3 +-
arch/arm/mach-omap1/timer32k.c | 7 +-
arch/arm/mach-omap2/board-cm-t35.c | 1 -
arch/arm/mach-omap2/board-n8x0.c | 1 -
arch/arm/mach-omap2/board-rx51-peripherals.c | 3 -
arch/arm/mach-omap2/board-zoom-display.c | 1 -
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 1 +
arch/arm/mach-omap2/clkt_dpll.c | 1 +
arch/arm/mach-omap2/clock2420_data.c | 3 +
arch/arm/mach-omap2/clock2430.c | 2 +
arch/arm/mach-omap2/clock2430_data.c | 2 +
arch/arm/mach-omap2/clock2xxx.c | 1 +
arch/arm/mach-omap2/clock3xxx.c | 1 +
arch/arm/mach-omap2/clock3xxx_data.c | 3 +-
arch/arm/mach-omap2/clock44xx_data.c | 3 +
arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 +-
arch/arm/mach-omap2/cm44xx.c | 2 +-
arch/arm/mach-omap2/cminst44xx.c | 2 +-
arch/arm/mach-omap2/common-board-devices.c | 1 -
arch/arm/mach-omap2/common.c | 4 +-
arch/arm/mach-omap2/common.h | 7 ++
arch/arm/mach-omap2/control.c | 3 +-
arch/arm/mach-omap2/control.h | 1 -
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/display.c | 1 +
arch/arm/mach-omap2/emu.c | 4 +
arch/arm/mach-omap2/gpmc-nand.c | 1 +
arch/arm/mach-omap2/gpmc-onenand.c | 1 +
arch/arm/mach-omap2/include/mach/io.h | 46 +++++++++++-
arch/arm/mach-omap2/io.c | 57 ++------------
.../include/plat/io.h => mach-omap2/iomap.h} | 80 +-------------------
arch/arm/mach-omap2/irq.c | 5 +-
arch/arm/mach-omap2/omap-smp.c | 3 +-
arch/arm/mach-omap2/opp2420_data.c | 2 +
arch/arm/mach-omap2/opp2430_data.c | 2 +
arch/arm/mach-omap2/pm24xx.c | 27 +------
arch/arm/mach-omap2/prcm_mpu44xx.c | 2 +-
arch/arm/mach-omap2/prm44xx.c | 3 +-
arch/arm/mach-omap2/prminst44xx.c | 2 +-
arch/arm/mach-omap2/sdram-nokia.c | 1 -
arch/arm/mach-omap2/sdrc2xxx.c | 5 +-
arch/arm/mach-omap2/sleep24xx.S | 1 -
arch/arm/mach-omap2/sleep34xx.S | 5 +-
arch/arm/mach-omap2/sram242x.S | 4 +-
arch/arm/mach-omap2/sram243x.S | 4 +-
arch/arm/mach-omap2/sram34xx.S | 5 +-
arch/arm/plat-omap/counter_32k.c | 1 +
arch/arm/plat-omap/dma.c | 2 +
arch/arm/plat-omap/dmtimer.c | 2 +
arch/arm/plat-omap/include/plat/hardware.h | 6 ++
arch/arm/plat-omap/include/plat/keypad.h | 2 +
arch/arm/plat-omap/include/plat/mcspi.h | 3 -
arch/arm/plat-omap/include/plat/tc.h | 17 ----
arch/arm/plat-omap/include/plat/usb.h | 41 ++++++++++
arch/arm/plat-omap/mux.c | 5 +-
arch/arm/plat-omap/sram.c | 9 +-
arch/arm/plat-omap/usb.c | 4 +
drivers/char/hw_random/omap-rng.c | 2 +
drivers/gpio/gpio-omap.c | 7 --
drivers/video/omap2/dss/dispc.c | 5 -
drivers/video/omap2/dss/dss.c | 3 +
99 files changed, 446 insertions(+), 280 deletions(-)
create mode 100644 arch/arm/mach-omap1/iomap.h
rename arch/arm/{plat-omap/include/plat/io.h => mach-omap2/iomap.h} (77%)
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL 4/5] First round of DT related omap changes
[not found] <pull-1330546506-268554>
` (2 preceding siblings ...)
2012-02-29 20:15 ` [GIT PULL 5/5] Clean-up for omap Tony Lindgren
@ 2012-02-29 20:15 ` Tony Lindgren
2012-02-29 20:55 ` [GIT PULL 1/5] non-critical fixes for v3.4 merge window Arnd Bergmann
4 siblings, 0 replies; 10+ messages in thread
From: Tony Lindgren @ 2012-02-29 20:15 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
This contains first set of DT related changes.
Regards,
Tony
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 dt
Benoit Cousson (10):
arm/dts: OMAP: Remove bootargs node from board files
ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems
ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE
ARM: OMAP2+: omap_device: Replace dev_warn by dev_dbg in omap_device_build_from_dt
ARM: OMAP2+: pm: Do not init statically the SR and voltage layer with DT
ARM: OMAP1: kconfig: Enable IRQ_DOMAIN by default for OMAP1 platforms
arm/dts: OMAP3&4: Remove the '0x' prefix for serial nodes
arm/dts: OMAP4: Add i2c controller nodes
arm/dts: OMAP3: Add i2c controller nodes
arm/dts: OMAP4: Update DTS file with new GIC bindings
Tony Lindgren (3):
Merge branch 'for_3.4/dt_base' of git://git.kernel.org/.../bcousson/linux-omap-dt into dt
ARM: OMAP2+: Set Kconfig dependencies for PROC_DEVICETREE
Merge branch 'for_3.4/dts_updates' of git://git.kernel.org/.../bcousson/linux-omap-dt into dt
Vaibhav Hiremath (1):
arm/dts: Add support for TI OMAP3 EVM board
arch/arm/boot/dts/omap3-beagle.dts | 9 --------
arch/arm/boot/dts/omap3-evm.dts | 20 ++++++++++++++++++
arch/arm/boot/dts/omap3.dtsi | 29 +++++++++++++++++++++++---
arch/arm/boot/dts/omap4-panda.dts | 9 --------
arch/arm/boot/dts/omap4-sdp.dts | 9 --------
arch/arm/boot/dts/omap4.dtsi | 38 ++++++++++++++++++++++++++++++----
arch/arm/mach-omap2/Kconfig | 1 -
arch/arm/mach-omap2/board-generic.c | 12 +++-------
arch/arm/mach-omap2/pm.c | 8 +++++++
arch/arm/plat-omap/Kconfig | 3 ++
arch/arm/plat-omap/omap_device.c | 2 +-
11 files changed, 94 insertions(+), 46 deletions(-)
create mode 100644 arch/arm/boot/dts/omap3-evm.dts
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [GIT PULL 1/5] non-critical fixes for v3.4 merge window
[not found] <pull-1330546506-268554>
` (3 preceding siblings ...)
2012-02-29 20:15 ` [GIT PULL 4/5] First round of DT related omap changes Tony Lindgren
@ 2012-02-29 20:55 ` Arnd Bergmann
4 siblings, 0 replies; 10+ messages in thread
From: Arnd Bergmann @ 2012-02-29 20:55 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Olof Johansson, linux-omap, linux-arm-kernel
On Wednesday 29 February 2012, Tony Lindgren wrote:
> This contains fixes for MMC platform init to allow marking
> functions that should be __init as __init. Also included are
> some randconfig fixes.
>
> Regards,
>
> Tony
>
>
> The following changes since commit 6b21d18ed50c7d145220b0724ea7f2613abf0f95:
> Linus Torvalds (1):
> Linux 3.3-rc5
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes-non-critical
>
Applied to next/fixes-non-critical
Thanks,
Arnd
^ permalink raw reply [flat|nested] 10+ messages in thread