From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Vladimir Barinov <vladimir.barinov@cogentembedded.com>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
Magnus Damm <damm@opensource.se>,
Simon Horman <horms@verge.net.au>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Subject: linux-next: manual merge of the arm-soc tree with the v4l-dvb tree
Date: Thu, 29 Aug 2013 17:40:34 +1000 [thread overview]
Message-ID: <20130829174034.9594cef414d41a2943160ba3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1690 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/board-marzen.c between commit 7cef5e7fd1ab
("[media] ARM: shmobile: Marzen: add VIN and ADV7180 support") from the
v4l-dvb tree and commits 85469abe4930 ("ARM: shmobile: Remove Marzen use
of <mach/hardware.h>") and fee529df76ff ("ARM: shmobile: r8a7779: cleanup
registration of usb phy") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-shmobile/board-marzen.c
index ca7fb2e,3551b54..0000000
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@@ -38,8 -38,6 +39,7 @@@
#include <linux/mmc/host.h>
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/mfd/tmio.h>
+#include <media/soc_camera.h>
- #include <mach/hardware.h>
#include <mach/r8a7779.h>
#include <mach/common.h>
#include <mach/irqs.h>
@@@ -212,8 -203,7 +231,9 @@@ static struct platform_device *marzen_d
&thermal_device,
&hspi_device,
&leds_device,
+ &camera0_device,
+ &camera1_device,
+ &usb_phy,
};
static const struct pinctrl_map marzen_pinctrl_map[] = {
@@@ -274,9 -254,6 +294,8 @@@ static void __init marzen_init(void
r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */
r8a7779_add_standard_devices();
- r8a7779_add_usb_phy_device(&usb_phy_platform_data);
+ r8a7779_add_vin_device(1, &vin_platform_data);
+ r8a7779_add_vin_device(3, &vin_platform_data);
platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-08-29 7:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-29 7:40 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-08-29 7:59 linux-next: manual merge of the arm-soc tree with the v4l-dvb tree Stephen Rothwell
2013-08-29 7:56 Stephen Rothwell
2013-08-29 7:50 Stephen Rothwell
2013-08-29 7:47 Stephen Rothwell
2013-08-29 7:35 Stephen Rothwell
2012-09-24 9:10 Stephen Rothwell
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=20130829174034.9594cef414d41a2943160ba3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=damm@opensource.se \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=olof@lixom.net \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=vladimir.barinov@cogentembedded.com \
/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).