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>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Simon Horman <horms+renesas@verge.net.au>
Subject: linux-next: manual merge of the arm-soc tree with the v4l-dvb tree
Date: Thu, 29 Aug 2013 17:35:07 +1000 [thread overview]
Message-ID: <20130829173507.d46106011201747a12a70eaf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/board-bockw.c between commit 9c43952d0f1e
("[media] ARM: shmobile: BOCK-W: add VIN and ML86V7667 support") from the
v4l-dvb tree and commit bockw_init ("ARM: shmobile: r8a7778: cleanup
registration of mmcif") 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-bockw.c
index 35dd7f2,255e97e..0000000
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@@ -217,21 -205,7 +235,17 @@@ static void __init bockw_init(void
r8a7778_clock_init();
r8a7778_init_irq_extpin(1);
r8a7778_add_standard_devices();
- r8a7778_add_usb_phy_device(&usb_phy_platform_data);
r8a7778_add_ether_device(ðer_platform_data);
- r8a7778_add_i2c_device(0);
- r8a7778_add_hspi_device(0);
- r8a7778_add_mmc_device(&sh_mmcif_plat);
+ r8a7778_add_vin_device(0, &vin_platform_data);
+ /* VIN1 has a pin conflict with Ether */
+ if (!IS_ENABLED(CONFIG_SH_ETH))
+ r8a7778_add_vin_device(1, &vin_platform_data);
+ platform_device_register_data(&platform_bus, "soc-camera-pdrv", 0,
+ &iclink0_ml86v7667,
+ sizeof(iclink0_ml86v7667));
+ platform_device_register_data(&platform_bus, "soc-camera-pdrv", 1,
+ &iclink1_ml86v7667,
+ sizeof(iclink1_ml86v7667));
i2c_register_board_info(0, i2c0_devices,
ARRAY_SIZE(i2c0_devices));
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-08-29 7:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-29 7:35 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:40 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=20130829173507.d46106011201747a12a70eaf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=horms+renesas@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).