Patchwork [GIT,PULL,1/6] non-critical omap fixes for v3.11 merge window

login
register
mail settings
Submitter Tony Lindgren
Date June 12, 2013, 6:24 p.m.
Message ID <pull-1371061475-206272>
Download mbox
Permalink /patch/250856/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-non-critical-signed

Comments

Tony Lindgren - June 12, 2013, 6:24 p.m.
The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:

  Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-non-critical-signed

for you to fetch changes up to e41a5f88b374f7b1d87a72740d186be20cae4aa8:

  ARM: OMAP2+: omap-usb-host: Fix memory leaks (2013-06-12 10:04:10 -0700)

----------------------------------------------------------------
Non-critical fixes for omaps for v3.11 merge window.

----------------------------------------------------------------
Peter Ujfalusi (3):
      ARM: OMAP2+: devices: Do not print error when McPDM hwmod lookup fails
      ARM: OMAP2+: devices: Do not print error when DMIC hwmod lookup fails
      ARM: OMAP2+: devices: Do not print error when dss_hdmi hwmod lookup fails

Roger Quadros (1):
      ARM: OMAP2+: omap-usb-host: Fix memory leaks

Sebastian Andrzej Siewior (1):
      arm/omap: use const char properly

Suman Anna (1):
      ARM: OMAP2+: control: add OMAP5 support for dsp boot programming

Tomi Valkeinen (3):
      ARM: OMAP: fix dsi regulator names
      ARM: OMAP: add vdds_dsi supply for omapdss_dpi.0
      ARM: OMAP: add vdds_sdi supply for omapdss_sdi.0

Tony Lindgren (2):
      Merge branch 'dss-regulator' into omap-for-v3.11/fixes-non-critical
      ARM: OMAP2+: Fix serial init for device tree based booting

 arch/arm/mach-omap2/board-cm-t35.c           |   3 +-
 arch/arm/mach-omap2/board-devkit8000.c       |   1 +
 arch/arm/mach-omap2/board-ldp.c              |   3 +-
 arch/arm/mach-omap2/board-omap3pandora.c     |   1 +
 arch/arm/mach-omap2/board-rx51-peripherals.c |   1 +
 arch/arm/mach-omap2/control.c                |   1 +
 arch/arm/mach-omap2/devices.c                |  12 +--
 arch/arm/mach-omap2/id.c                     |   2 +-
 arch/arm/mach-omap2/serial.c                 |   3 +
 arch/arm/mach-omap2/twl-common.c             |   1 +
 arch/arm/mach-omap2/usb-host.c               | 106 ++++++++++++++-------------
 11 files changed, 72 insertions(+), 62 deletions(-)
Olof Johansson - June 14, 2013, 9:28 p.m.
On Wed, Jun 12, 2013 at 11:24:33AM -0700, Tony Lindgren wrote:
> The following changes since commit d683b96b072dc4680fc74964eca77e6a23d1fa6e:
> 
>   Linux 3.10-rc4 (2013-06-02 17:11:17 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
> 
> for you to fetch changes up to 09182ab11b49b67d04598b19eb89cf0bbd672a60:
> 
>   ARM: OMAP4: hwmod data: Remove irq entries from mcspi, mmc hwmods (2013-06-12 09:41:46 -0700)
> 
> ----------------------------------------------------------------
> Move omap4 over to device tree based booting. This allows us to get rid
> a big pile of platform init code for things that are already handled by
> device tree related code. As am33xx is already device tree based, we
> can also remove the same data for am33xx.

Hm. This one has a somewhat silly conflict with the am33xx hwmod fix for uart2.
I.e. the fix is reverted since the code is no longer needed -- data comes from
device tree. Please double-check my merge resolution on it though.


-Olof
Olof Johansson - June 14, 2013, 9:35 p.m.
On Wed, Jun 12, 2013 at 11:24:34AM -0700, Tony Lindgren wrote:
> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
> 
>   Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-signed
> 
> for you to fetch changes up to 49a34fd5380d249ae8a2173399c62fc5a1fddd70:
> 
>   Merge tag 'omap-pm-v3.10/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm (2013-05-16 08:27:49 -0700)

Pulled, thanks.

-Olof
Olof Johansson - June 14, 2013, 9:35 p.m.
On Wed, Jun 12, 2013 at 11:24:35AM -0700, Tony Lindgren wrote:
> The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:
> 
>   Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-signed
> 
> for you to fetch changes up to 4f288f081bb67813d35c10d1b2fa68e863c4b188:
> 
>   ARM: OMAP2+: AM43x: SRAM base and size (2013-06-12 08:07:23 -0700)


Pulled, thanks.


-Olof
Olof Johansson - June 14, 2013, 9:37 p.m.
On Wed, Jun 12, 2013 at 11:24:35AM -0700, Tony Lindgren wrote:
> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
> 
>   Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
> 
> for you to fetch changes up to b3f5525c55ce5cb67af06f04dbbf28358da23a2c:
> 
>   ARM: OMAP2+: gpmc: Converts GPMC driver to pm_runtime capable (2013-06-12 09:56:30 -0700)
> 

Pulled.


-Olof
Tony Lindgren - June 17, 2013, 10:33 a.m.
* Olof Johansson <olof@lixom.net> [130614 14:34]:
> On Wed, Jun 12, 2013 at 11:24:33AM -0700, Tony Lindgren wrote:
> > The following changes since commit d683b96b072dc4680fc74964eca77e6a23d1fa6e:
> > 
> >   Linux 3.10-rc4 (2013-06-02 17:11:17 +0900)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
> > 
> > for you to fetch changes up to 09182ab11b49b67d04598b19eb89cf0bbd672a60:
> > 
> >   ARM: OMAP4: hwmod data: Remove irq entries from mcspi, mmc hwmods (2013-06-12 09:41:46 -0700)
> > 
> > ----------------------------------------------------------------
> > Move omap4 over to device tree based booting. This allows us to get rid
> > a big pile of platform init code for things that are already handled by
> > device tree related code. As am33xx is already device tree based, we
> > can also remove the same data for am33xx.
> 
> Hm. This one has a somewhat silly conflict with the am33xx hwmod fix for uart2.
> I.e. the fix is reverted since the code is no longer needed -- data comes from
> device tree. Please double-check my merge resolution on it though.

Thanks yes that should not be needed any longer in the hwmod data.

Regards,

Tony