From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Herbert Xu <herbert@gondor•apana.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Will Deacon <will.deacon@arm•com>,
Russell King <rmk@arm•linux.org.uk>,
Dmitry Kasatkin <dmitry.kasatkin@nokia•com>
Subject: linux-next: manual merge of the crypto tree with the arm tree
Date: Tue, 4 May 2010 12:53:55 +1000 [thread overview]
Message-ID: <20100504125355.810e6f54.sfr@canb.auug.org.au> (raw)
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
arch/arm/mach-omap2/devices.c between commit
883413341e479d4e9f9c69def4884b4c6e1cef4e ("ARM: 6046/1: ARM: OMAP:
register PMU IRQs during board initialisation") from the arm tree and
commit ee5500c45c4860a84bba502c6d9ef5af6395dad6 ("crypto: omap - Updates
omap sham device related platform code") from the crypto tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mach-omap2/devices.c
index 12154d1,beac46c..0000000
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -455,39 -454,10 +456,41 @@@ static void omap_init_mcspi(void
static inline void omap_init_mcspi(void) {}
#endif
+static struct resource omap2_pmu_resource = {
+ .start = 3,
+ .end = 3,
+ .flags = IORESOURCE_IRQ,
+};
+
+static struct resource omap3_pmu_resource = {
+ .start = INT_34XX_BENCH_MPU_EMUL,
+ .end = INT_34XX_BENCH_MPU_EMUL,
+ .flags = IORESOURCE_IRQ,
+};
+
+static struct platform_device omap_pmu_device = {
+ .name = "arm-pmu",
+ .id = ARM_PMU_DEVICE_CPU,
+ .num_resources = 1,
+};
+
+static void omap_init_pmu(void)
+{
+ if (cpu_is_omap24xx())
+ omap_pmu_device.resource = &omap2_pmu_resource;
+ else if (cpu_is_omap34xx())
+ omap_pmu_device.resource = &omap3_pmu_resource;
+ else
+ return;
+
+ platform_device_register(&omap_pmu_device);
+}
+
+
- #ifdef CONFIG_OMAP_SHA1_MD5
- static struct resource sha1_md5_resources[] = {
+ #if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE)
+
+ #ifdef CONFIG_ARCH_OMAP24XX
+ static struct resource omap2_sham_resources[] = {
{
.start = OMAP24XX_SEC_SHA1MD5_BASE,
.end = OMAP24XX_SEC_SHA1MD5_BASE + 0x64,
@@@ -830,10 -835,9 +868,10 @@@ static int __init omap2_init_devices(vo
omap_init_camera();
omap_init_mbox();
omap_init_mcspi();
+ omap_init_pmu();
omap_hdq_init();
omap_init_sti();
- omap_init_sha1_md5();
+ omap_init_sham();
return 0;
}
next reply other threads:[~2010-05-04 2:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-04 2:53 Stephen Rothwell [this message]
2010-05-04 7:24 ` linux-next: manual merge of the crypto tree with the arm tree Dmitry Kasatkin
2010-05-04 13:03 ` Herbert Xu
2010-05-04 21:24 ` Stephen Rothwell
2010-05-04 9:13 ` Will Deacon
-- strict thread matches above, loose matches on Subject: below --
2012-05-16 5:14 Stephen Rothwell
2012-05-16 7:26 ` Linus Walleij
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=20100504125355.810e6f54.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmitry.kasatkin@nokia$(echo .)com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=will.deacon@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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