linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 5/5] omap dts changes for v3.18 merge window
Date: Thu, 18 Sep 2014 13:15:08 -0700	[thread overview]
Message-ID: <20140918201507.GO14505@atomide.com> (raw)
In-Reply-To: <pull-1410478051-378788-5>

* Tony Lindgren <tony@atomide.com> [140911 16:29]:
> The following changes since commit 69e273c0b0a3c337a521d083374c918dc52c666f:
> 
>   Linux 3.17-rc3 (2014-08-31 18:23:04 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/dt-for-v3.18
> 
> for you to fetch changes up to d27704d1ec2f9ba06247b402c58a6f2febecef78:
> 
>   ARM: dts: OMAP2+: Add sub mailboxes device node information (2014-09-11 11:46:30 -0700)
> 
> ----------------------------------------------------------------
> Changes for .dts files for omaps for v3.18 merge window:
> 
> - Updates for gta04 to add gta04a3 model
> - Add support for Tehnexion TAO3530 boards
> - Regulator names for beaglebone
> - Pinctrl related updates for omap5, dra7 and am437
> - Model name fix for sbc-t54
> - Enable mailbox for various omaps

This can cause a minor merge conflict, here's the
merge resolution for reference.

Regards,

Tony

--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -226,7 -240,9 +226,9 @@@ MACHINE_EN
  #endif
  
  #ifdef CONFIG_SOC_DRA7XX
 -static const char *dra74x_boards_compat[] __initconst = {
 +static const char *const dra74x_boards_compat[] __initconst = {
+ 	"ti,am5728",
+ 	"ti,am5726",
  	"ti,dra742",
  	"ti,dra7",
  	NULL,
@@@ -245,7 -261,9 +247,9 @@@ DT_MACHINE_START(DRA74X_DT, "Generic DR
  	.restart	= omap44xx_restart,
  MACHINE_END
  
 -static const char *dra72x_boards_compat[] __initconst = {
 +static const char *const dra72x_boards_compat[] __initconst = {
+ 	"ti,am5718",
+ 	"ti,am5716",
  	"ti,dra722",
  	NULL,
  };

  reply	other threads:[~2014-09-18 20:15 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-11 23:28 [GIT PULL 1/5] non-urgent omap fixes for v3.18 merge window Tony Lindgren
2014-09-11 23:28 ` [GIT PULL 2/5] omap soc changes " Tony Lindgren
2014-09-11 23:28 ` [GIT PULL 3/5] omap intc " Tony Lindgren
2014-09-11 23:28 ` [GIT PULL 4/5] omap mailbox " Tony Lindgren
2014-09-11 23:28 ` [GIT PULL 5/5] omap dts " Tony Lindgren
2014-09-18 20:15   ` Tony Lindgren [this message]
2014-09-24  5:13     ` Olof Johansson
     [not found] ` <5412304a.04a8440a.56eb.ffff9329SMTPIN_ADDED_BROKEN@mx.google.com>
2014-09-24  5:07   ` [GIT PULL 2/5] omap soc " Olof Johansson
2014-09-24 15:23     ` Nishanth Menon
2014-09-24 15:46       ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140918201507.GO14505@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).