Remaining omap pull requests

Hi Arnd,

Below is a summary of the pending omap pull requests as there are still few branches pending.

Can you please take a look and see what you can take of these for v3.1 merge window?

There's still quite a bit more code shrinkage, and the new code for 4460 and PRCM related changes are badly needed.

Here's what's still pending:

1. Branches to pull into omap/cleanup

I will reply to this mail with a pull request for cleanup-part-3 that contains Russell's timer cleanup patch and Paul's PRCM cleanup series.

2. Branches to pull into omap/fixes

I will reply to this mail with a pull request for fixes-part-2 that contains Paul's PRCM fixes, and one McBSP fix also from Paul.

This branch depends on cleanup-part-3 in #1 above for the PRCM fixes.

3. Branches to pull into omap/board

This one needs one merge commit to clear the merge conflict that I posted on Sunday at:

http://marc.info/?l=linux-omap&m=131032743717583&w=2

4. New code for minimal omap4460 support

This I've posted here:

http://marc.info/?l=linux-omap&m=131032754417673&w=2

It has some a trivial merge conflict with the cleanup-part-3 in #1 above that you should be able to handle.

5. New code for ASoC and MFD changes

Because of the TWL cleanup, it was agreed that the TWL related MFD/ASoC changes should be merged by us also. I will reply to this mail with a pull request for this email.

Note that this could also be merged by the ASoC or MFD people if they pull in your omap/cleanup-part-2.

6. New code for PRCM changes

This you might as well pull from Paul directly as posted here:

http://marc.info/?l=linux-omap&m=131030152129307&w=2

It depends on the PRCM fixes in #2 above. I've already pulled this into linux-omap master branch for testing.

The following order should be kept for these branches:

omap/cleanup
omap/fixes
omap/board

And after that these can be merged in whatever order:

new code for minimal 4460 support
new code for ASoC/MFD
new code for PRCM changes

Then there are two new boards remaining, but they both are waiting on the machine_id patch.

Regards,

Tony

The following changes since commit ecba3287b4121dcf3ca7607fe71c205913edec06:
Arnd Bergmann (1):
Merge branch 'cleanup-part-2' of git+ssh://master.kernel.org/.../tmlind/linux-omap-2.6 into omap/cleanup

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git cleanup-part-3

Benoit Cousson (21):
OMAP2+: hwmod: Fix smart-standby + wakeup support
OMAP4: hwmod data: Add MSTANDBY_SMART_WKUP flag
OMAP2+: hwmod: Do not write the enawakeup bit if SYSC_HAS_ENAWAKEUP is not set OMAP2+: hwmod: Remove _populate_mpu_rt_base warning
OMAP2+: hwmod: Fix the HW reset management
OMAP: hwmod: Add warnings if enable failed
OMAP: hwmod: Move pr_debug to improve the readability
OMAP4: hwmod data: Fix L3 interconnect data order and alignement
OMAP4: hwmod data: Remove un-needed parens
OMAP4: hwmod data: Fix bad alignement
OMAP4: hwmod data: Align interconnect format with regular modules
OMAP4: clock data: Add sddiv to USB DPLL
OMAP4: clock data: Remove usb_host_fs clkdev with NULL dev
OMAP4: clock data: Re-order some clock nodes and structure fields
OMAP4: clock data: Fix max mult and div for USB DPLL
OMAP4: prcm: Fix errors in few defines name
OMAP4: prm: Remove wrong clockdomain offsets
OMAP4: powerdomain data: Fix indentation
OMAP4: cm: Remove RESTORE macros to avoid access from SW
OMAP4: prcm_mpu: Fix indent in few macros
OMAP4: clockdomain data: Fix data order and wrong name

Jean Pihet (1):
OMAP PM: remove OMAP_PM_NONE config option

Jon Hunter (2):
OMAP4: clock data: Remove McASP2, McASP3 and MMC6 clocks
OMAP4: clock data: Remove UNIPRO clock nodes

Kevin Hilman (1):
OMAP: omap_device: replace _find_by_pdev() with to_omap_device()

Miguel Vadillo (1):
OMAP2+: hwmod: Enable module in shutdown to access sysconfig

Paul Walmsley (9):
OMAP: dmtimer: add missing include
omap_hwmod: use a null structure record to terminate omap_hwmod_addr_space arrays
omap_hwmod: share identical omap_hwmod_addr_space arrays
omap_hwmod: use a terminator record with omap_hwmod_mpu_irqs arrays
omap_hwmod: share identical omap_hwmod_mpu_irqs arrays
omap_hwmod: use a terminator record with omap_hwmod_dma_info arrays
omap_hwmod: share identical omap_hwmod_dma_info arrays
omap_hwmod: share identical omap_hwmod_class, omap_hwmod_class_sysconfig arrays
Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine_common_hwmod_3.1', 'omap4_hwmod_data_cleanup_a_3.1', 'clock_cleanup_a_3.1', 'prcm_cleanup_a_3.1', 'omap_pm_cleanup_3.1' and 'omap_device_cleanup_3.1' into prcm-cleanup-3.1

Russell King - ARM Linux (1):
Convert OMAPs 32kHz clocksource implementation to use the generic MMIO clocksource support. This achieves several things:

Tony Lindgren (1):
Merge branch 'prcm-cleanup-3.1' of git://git.pwsan.com/linux-2.6 into cleanup-part-3

 arch/arm/Kconfig                                   |    1 +
 arch/arm/mach-omap2/Makefile                       |   16 +-
 arch/arm/mach-omap2/clock44xx.h                    |    7 -
 arch/arm/mach-omap2/clock44xx_data.c               |  237 ++----
 arch/arm/mach-omap2/clockdomains44xx_data.c        |  124 ++--
 arch/arm/mach-omap2/cm-regbits-44xx.h              |  623 ++++++--------
 arch/arm/mach-omap2/cm1_44xx.h                     |   64 +--
 arch/arm/mach-omap2/cm2_44xx.h                     |   73 +--
 arch/arm/mach-omap2/omap_hwmod.c                   |  223 ++++--
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |  832 +++----------------
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |  910 +++-----------------
 .../omap_hwmod_2xxx_3xxx_interconnect_data.c       |  173 ++++
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |  322 +++++++
 .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c |  130 +++
 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c |  150 ++++
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |  654 +++-----------
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |  472 +++++-----
 arch/arm/mach-omap2/omap_hwmod_common_data.c       |   20 -
 arch/arm/mach-omap2/omap_hwmod_common_data.h       |   93 ++-
 arch/arm/mach-omap2/powerdomains44xx_data.c        |   18 +-
 arch/arm/mach-omap2/prcm_mpu44xx.h                 |   69 +-
 arch/arm/mach-omap2/prm44xx.h                      |   34 +-
 arch/arm/plat-omap/Kconfig                         |    3 -
 arch/arm/plat-omap/counter_32k.c                   |  121 +--
 arch/arm/plat-omap/include/plat/clock.h            |    2 +-
 arch/arm/plat-omap/include/plat/dmtimer.h          |    1 +
 arch/arm/plat-omap/include/plat/omap-pm.h          |    8 -
 arch/arm/plat-omap/include/plat/omap_hwmod.h       |   20 +-
 arch/arm/plat-omap/omap_device.c                   |   15 +-
 29 files changed, 2152 insertions(+), 3263 deletions(-)
 create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
 create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
 create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
 create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

The following changes since commit e1d62c9bd8779a8e4a335803f0fced9e614d0a9f:
Tony Lindgren (1):
Merge branch 'prcm-cleanup-3.1' of git://git.pwsan.com/linux-2.6 into cleanup-part-3

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git fixes-part-2

Andy Green (6):
I2C: OMAP2+: Set hwmod flags to only allow 16-bit accesses to i2c
I2C: OMAP2+: increase omap_i2c_dev_attr flags from u8 to u32
I2C: OMAP2+: Introduce I2C IP versioning constants
I2C: OMAP1/OMAP2+: create omap I2C functionality flags for each cpu_... test
I2C: OMAP2+: Tag all OMAP2+ hwmod defintions with I2C IP revision
I2C: OMAP2+: add correct functionality flags to all omap2plus i2c dev_attr

Avinash.H.M (1):
OMAP: hwmod: fix the i2c-reset timeout during bootup

Benoit Cousson (1):
OMAP4: powerdomain data: Fix core mem states and missing cefuse flag

Paul Walmsley (2):
Merge branches 'powerdomain_fixes_3.1', 'hardware_workarounds_3.1', 'hwmod_dss_fix_3.1' and 'i2c_fixes_3.1' into prcm-fixes-3.1
ASoC: omap: McBSP: fix build breakage on OMAP1

Rajendra Nayak (1):
OMAP2+: PM: Initialise sleep_switch to a non-valid value

Santosh Shilimkar (2):
OMAP4: clock data: Keep GPMC clocks always enabled and hardware managed
OMAP4: powerdomain data: Remove unsupported MPU powerdomain state

Tomi Valkeinen (2):
OMAP4: hwmod data: Modify DSS opt clocks
OMAP4: hwmod data: Change DSS main_clk scheme

Tony Lindgren (1):
Merge branch 'prcm-fixes-3.1' of git://git.pwsan.com/linux-2.6 into fixes-part-2

 arch/arm/mach-omap2/clock44xx_data.c         |    9 ++-
 arch/arm/mach-omap2/i2c.c                    |   68 +++++++++++++++++++++
 arch/arm/mach-omap2/omap_hwmod.c             |   27 +++++++++
 arch/arm/mach-omap2/omap_hwmod_2420_data.c   |    9 +++-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c   |    7 ++
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c   |   18 +++++-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c   |   81 ++++++++++++++++++++------
 arch/arm/mach-omap2/pm.c                     |    2 +-
 arch/arm/mach-omap2/powerdomains44xx_data.c  |    9 ++-
 arch/arm/plat-omap/include/plat/i2c.h        |    6 ++-
 arch/arm/plat-omap/include/plat/omap_hwmod.h |    1 +
 arch/arm/plat-omap/mcbsp.c                   |   27 +++++++++
 include/linux/i2c-omap.h                     |   27 +++++++++
 13 files changed, 260 insertions(+), 31 deletions(-)

The following changes since commit 727e18b429e3badda12d1de74f492bfa363a2e94:
Tony Lindgren (1):
Merge branch 'peter/topic/for-tony_mach-cleanup' of git://gitorious.org/omap-audio/linux-audio into cleanup-part-2

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git twl-asoc

These depend on the cleanup-part-2 branch, so it was agreed with the MFD and ASoC maintainers that they should get merged along with the other omap patches.

Axel Castaneda Gonzalez (1):
ASoC: twl6040: Configure ramp step based on platform

Liam Girdwood (3):
ASoC: twl6040: add all ABE DAIs
ASoC: twl6040: Support other sample rates in constraints.
ASoC: twl6040: set default constraints.

Misael Lopez Cruz (5):
mfd: twl6040: Add initial support
ASoC: twl6040: Convert into TWL6040 MFD child
input: Add initial support for TWL6040 vibrator
ASoC: twl6040: Remove pll and headset mode dependency
OMAP4: SDP4430: Add twl6040 codec platform support

Peter Ujfalusi (17):
MFD: twl4030-codec: Rename internals from codec to audio
MFD: twl4030-codec -> twl4030-audio: Rename the driver
MFD: twl4030-audio: Rename platform data
MFD: twl6040: Change platform data for soc codec driver
OMAP4: SDP4430: Add twl6040 vibrator platform support
MFD: twl6040: Use resource to provide irq number for slaves
input: twl6040-vibra: Do not use wrapper for irq request
ASoC: twl6040: Do not use wrapper for irq request
MFD: twl6040: Demand valid interrupt configuration
MFD: twl6040: Remove wrapper for threaded irq request
ASoC: twl6040: Use neutral name for power mode text/enum
ASoC: twl6040: Move PLL selection to codec driver
ASoC: twl6040: Simplify sample rate constraint handling
ASoC: twl6040: Configure PLL only once
MFD: twl6040: Remove enum for PLL tracking
ASoC: twl6040: No need to convert the PLL ID
ASoC: twl6040: Add back support for legacy mode

Tony Lindgren (1):
Merge branch 'peter/topic/for-tony' of git://gitorious.org/omap-audio/linux-audio into twl-asoc

 arch/arm/mach-omap2/board-4430sdp.c                |   56 ++
 arch/arm/mach-omap2/board-rx51-peripherals.c       |    6 +-
 arch/arm/mach-omap2/board-zoom-peripherals.c       |   10 +-
 arch/arm/mach-omap2/twl-common.c                   |   10 +-
 arch/arm/plat-omap/include/plat/irqs.h             |   12 +-
 drivers/input/misc/Kconfig                         |   13 +-
 drivers/input/misc/Makefile                        |    1 +
 drivers/input/misc/twl4030-vibra.c                 |   12 +-
 drivers/input/misc/twl6040-vibra.c                 |  423 +++++++++++
 drivers/mfd/Kconfig                                |    8 +-
 drivers/mfd/Makefile                               |    3 +-
 drivers/mfd/twl-core.c                             |   13 +-
 drivers/mfd/twl4030-audio.c                        |  277 ++++++++
 drivers/mfd/twl4030-codec.c                        |  277 --------
 drivers/mfd/twl6040-core.c                         |  620 +++++++++++++++++
 drivers/mfd/twl6040-irq.c                          |  191 +++++
 include/linux/i2c/twl.h                            |   25 +-
 .../linux/mfd/{twl4030-codec.h => twl4030-audio.h} |   16 +-
 include/linux/mfd/twl6040.h                        |  228 ++++++
 sound/soc/codecs/Kconfig                           |    3 +-
 sound/soc/codecs/twl4030.c                         |   22 +-
 sound/soc/codecs/twl6040.c                         |  733 +++++++++-----------
 sound/soc/codecs/twl6040.h                         |  119 +----
 sound/soc/omap/sdp3430.c                           |    2 +-
 sound/soc/omap/sdp4430.c                           |   52 +--
 sound/soc/omap/zoom2.c                             |    2 +-
 26 files changed, 2230 insertions(+), 904 deletions(-)
 create mode 100644 drivers/input/misc/twl6040-vibra.c
 create mode 100644 drivers/mfd/twl4030-audio.c
 delete mode 100644 drivers/mfd/twl4030-codec.c
 create mode 100644 drivers/mfd/twl6040-core.c
 create mode 100644 drivers/mfd/twl6040-irq.c
 rename include/linux/mfd/{twl4030-codec.h => twl4030-audio.h} (96%)
 create mode 100644 include/linux/mfd/twl6040.h

I've pulled everything now, please check if it looks ok to you.

I haven't really looked at the patches much, I hope that I have time to at least do some test builds and take a very rough look at the contents tomorrow.

Thanks for the detailed descriptions, and for splitting it into good-sized series.

Arnd

Am Montag, den 11.07.2011, 04:47 -0700 schrieb Tony Lindgren:

If one of them is our pcm049 OMAP4 board, the machine_id is already in.
pcm049 MACH_PCM049 PCM049 3364

Kind Regards,
Jan

Thanks looks good to me.

OK thanks.

Looks like I forgot the i2c driver changes that also should be merged by us. Those are acked by Ben Dooks, Kevin's pull request for that is at:

http://marc.info/?l=linux-omap&m=131014213007667&w=2

Regards,

Tony

Yes, thanks for pointing that out. And now we also have an ack from Russell for the Nook mach-types changes. I'll take one more look at the machine patches and if no issues will apply them.

Regards,

Tony

Hi Arnd,

I thought this was already pulled, but looking now I see that this was never pulled into the arm-soc tree.

Can you pull this for v3.1 please?

Kevin

On 08/02/2011 04:14 PM, Kevin Hilman wrote:
[...]

Oops, I had to rebase this branch as Paul had picked up a few of these patches for his fixes (which are now part of arm-soc/next/fixes2.) Updated pull request below.

Also, I noticed there's a minor conflict with something coming from the trivial tree[1].

Kevin

The following changes since commit 6d3c55fd4f0f94a9455d30df9414ddb0f755f402:

OMAP: hwmod: fix the i2c-reset timeout during bootup (2011-07-10
05:27:16 -0600)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git
for_3.1/i2c-andy-2

Andy Green (12):
I2C: OMAP2+: Name registers in I2C IP V2 only accordingly
I2C: OMAP: add rev to omap i2c platform data
I2C: OMAP1: set IP revision in platform data
I2C: OMAP2+: Pass hwmod rev knowledge via platform_data when i2c
bus added
I2C: OMAP2+: use platform_data ip revision to select register map
I2C: OMAP2+: Solve array bounds overflow error on i2c idle
I2C: OMAP2+: address confused probed version naming
I2C: OMAP1/OMAP2+: add flags field to omap i2c platform data
I2C: OMAP2+: Pass flags up to omap i2c platform_data as well
I2C: OMAP1: set i2c unit feature implementation flags in platform
data
I2C: OMAP2+: Convert omap I2C driver to use feature
implementation flags from platform data
I2C: OMAP1/OMAP2+: prepend I2C IP version to probed version shown
in dev_info

  arch/arm/plat-omap/i2c.c      |   27 +++++++++++
  drivers/i2c/busses/i2c-omap.c |  100 
++++++++++++++++++++++------------------
  include/linux/i2c-omap.h      |    2 +
  3 files changed, 84 insertions(+), 45 deletions(-)

[1]
commit 32575a9183c82a5ea0f9ed1bcf13c17189ea1118

Author: Jesper Juhl <[email protected]>
Date:   Sat Jul 9 23:20:42 2011 +0200

drivers/i2c: static should be at beginning of declaration

Make sure that the 'static' keywork is at the beginning of declaration for drivers/i2c/busses/i2c-omap.c

This gets rid of warnings like
warning: ?static? is not at beginning of declaration
when building with -Wold-style-declaration (and/or -Wextra which also enables it).

I'll send a pull request for Ben Dooks for this as now the conflicting parts have been merged.

Looks like i2c-andy-2 still fails to merge cleanly on top of v3.1-rc1. Will resolve for Ben and proxy the pull request while you're on vacation.

Regards,

Tony

Sorry for missing this one during the merge window. I'm now starting to collect branches for 3.2, so please tell me if you want me to pull it now, if there is anything left that is not yet in Ben's tree.

Arnd