Skip to contentSkip to conversation

non-critical fixes for v3.4 merge window

GIT PULL Applied Tony Lindgren 2 participants 10 messages Feb 29, 2012

lore
Share & tools
lore
#0 lore raw

Hi Arnd & Olof,

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

Kevin Hilman (1):
ARM: OMAP: convert omap_device_build() and callers to __init

Ohad Ben-Cohen (1):

      ARM: OMAP: omap_device: Expose omap_device_{alloc, delete, register}

Paul Walmsley (1):
ARM: OMAP2+: I2C: always compile I2C reset code, even if I2C driver is not built

Peter Ujfalusi (1):
OMAP4: dma: Correct CPU version check for dma_common_ch_end

Santosh Shilimkar (2):
ARM: OMAP: fix section mismatch warning for omap4_hotplug_cpu()
ARM: OMAP: Fix section mismatch warning for platform_cpu_die()

Tony Lindgren (13):
ARM: OMAP: Fix kernel panic with HSMMC when twl4030_gpio is a module
ARM: OMAP: Fix build error when mmc_omap is built as module
ARM: OMAP2+: Split omap2_hsmmc_init() to properly support I2C GPIO pins
ARM: OMAP2+: Fix Kconfig dependencies for USB_ARCH_HAS_EHCI
ARM: OMAP2+: Fix OMAP_HDQ_BASE build error
ARM: OMAP2+: Fix board_mux section type conflict when OMAP_MUX is not set
ARM: OMAP2+: Fix zoom LCD backlight if TWL_CORE is not selected
ARM: OMAP2+: Fix devexit for smartreflex when CONFIG_HOTPLUG is not set
ARM: OMAP: Fix devexit for dma when CONFIG_HOTPLUG is not set
ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP
ARM: OMAP2+: Mark omap_hsmmc_init and omap_mux related functions as __init Merge branch 'randconfig' into fixes-non-critical
Merge branch 'hsmmc' into fixes-non-critical

 arch/arm/Makefile                             |    4 +-
 arch/arm/mach-omap2/Kconfig                   |   55 +++++++----
 arch/arm/mach-omap2/Makefile                  |    5 +-
 arch/arm/mach-omap2/board-2430sdp.c           |    2 +-
 arch/arm/mach-omap2/board-3430sdp.c           |    5 +-
 arch/arm/mach-omap2/board-4430sdp.c           |    4 +-
 arch/arm/mach-omap2/board-am3517evm.c         |    2 +-
 arch/arm/mach-omap2/board-cm-t35.c            |    5 +-
 arch/arm/mach-omap2/board-devkit8000.c        |    4 +-
 arch/arm/mach-omap2/board-flash.c             |    2 +-
 arch/arm/mach-omap2/board-igep0020.c          |    6 +-
 arch/arm/mach-omap2/board-ldp.c               |    2 +-
 arch/arm/mach-omap2/board-n8x0.c              |    4 +
 arch/arm/mach-omap2/board-omap3beagle.c       |   10 ++-
 arch/arm/mach-omap2/board-omap3evm.c          |    7 +-
 arch/arm/mach-omap2/board-omap3logic.c        |    2 +-
 arch/arm/mach-omap2/board-omap3pandora.c      |    5 +-
 arch/arm/mach-omap2/board-omap3stalker.c      |   15 ++-
 arch/arm/mach-omap2/board-omap3touchbook.c    |   17 ++--
 arch/arm/mach-omap2/board-omap4panda.c        |    6 +-
 arch/arm/mach-omap2/board-overo.c             |    3 +-
 arch/arm/mach-omap2/board-rm680.c             |    2 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c  |    2 +-
 arch/arm/mach-omap2/board-zoom-display.c      |    4 +
 arch/arm/mach-omap2/board-zoom-peripherals.c  |    4 +-
 arch/arm/mach-omap2/devices.c                 |   15 ++--
 arch/arm/mach-omap2/display.c                 |    8 +-
 arch/arm/mach-omap2/dma.c                     |    2 +-
 arch/arm/mach-omap2/gpio.c                    |    2 +-
 arch/arm/mach-omap2/hsmmc.c                   |  129 +++++++++++++++++++------
 arch/arm/mach-omap2/hsmmc.h                   |   12 ++-
 arch/arm/mach-omap2/mcbsp.c                   |    2 +-
 arch/arm/mach-omap2/mux.c                     |   14 ++--
 arch/arm/mach-omap2/mux.h                     |    2 +-
 arch/arm/mach-omap2/omap-hotplug.c            |    2 +-
 arch/arm/mach-omap2/omap-mpuss-lowpower.c     |    2 +-
 arch/arm/mach-omap2/pm.c                      |    2 +-
 arch/arm/mach-omap2/smartreflex.c             |    2 +-
 arch/arm/mach-omap2/sr_device.c               |    2 +-
 arch/arm/plat-omap/dma.c                      |    2 +-
 arch/arm/plat-omap/include/plat/omap_device.h |    7 ++
 arch/arm/plat-omap/omap_device.c              |   20 ++---
 42 files changed, 264 insertions(+), 138 deletions(-)
#1 lore raw

[GIT PULL 2/5] First set of omap SoC related changes

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(-)
#2 lore raw

[GIT PULL 3/5] First set of omap1 related changes

In reply to Tony Lindgren

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
#3 lore raw

[GIT PULL 4/5] First round of DT related omap changes

In reply to Tony Lindgren

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
#4 lore raw

[GIT PULL 5/5] Clean-up for omap

In reply to Tony Lindgren

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%)
#5 lore raw

[GIT PULL 2/5] First set of omap SoC related changes

In reply to Tony Lindgren

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(-)
#6 lore raw

[GIT PULL 3/5] First set of omap1 related changes

In reply to Tony Lindgren

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
#7 lore raw

[GIT PULL 4/5] First round of DT related omap changes

In reply to Tony Lindgren

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
#8 lore raw

[GIT PULL 5/5] Clean-up for omap

In reply to Tony Lindgren

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%)
#9 lore raw
In reply to Tony Lindgren
Quoted 9 lines · Tony Lindgren

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

Quoted 8 lines

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