* linux-next: manual merge of the crypto tree with the arm tree
@ 2010-05-04 2:53 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2010-05-04 2:53 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-next, linux-kernel, Will Deacon, Russell King, Dmitry Kasatkin
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;
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the crypto tree with the arm tree
@ 2010-05-04 2:53 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2010-05-04 2:53 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-next, linux-kernel, Will Deacon, Russell King, Dmitry Kasatkin
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;
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the arm tree
2010-05-04 2:53 ` Stephen Rothwell
(?)
@ 2010-05-04 7:24 ` Dmitry Kasatkin
2010-05-04 13:03 ` Herbert Xu
-1 siblings, 1 reply; 12+ messages in thread
From: Dmitry Kasatkin @ 2010-05-04 7:24 UTC (permalink / raw)
To: ext Stephen Rothwell
Cc: Herbert Xu, linux-next, linux-kernel, Will Deacon, Russell King
Hi,
This patch looks OK.
Thanks,
Dmitry
On 04/05/10 05:53, ext Stephen Rothwell wrote:
> 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; }
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the arm tree
2010-05-04 2:53 ` Stephen Rothwell
(?)
(?)
@ 2010-05-04 9:13 ` Will Deacon
-1 siblings, 0 replies; 12+ messages in thread
From: Will Deacon @ 2010-05-04 9:13 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Herbert Xu, linux-next, linux-kernel, Russell King, Dmitry Kasatkin
Hi Stephen,
On Tue, 2010-05-04 at 03:53 +0100, Stephen Rothwell wrote:
> 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.
Thanks for fixing this. Looks fine to me.
Will
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the arm tree
2010-05-04 7:24 ` Dmitry Kasatkin
@ 2010-05-04 13:03 ` Herbert Xu
0 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2010-05-04 13:03 UTC (permalink / raw)
To: Dmitry Kasatkin
Cc: ext Stephen Rothwell, linux-next, linux-kernel, Will Deacon,
Russell King
On Tue, May 04, 2010 at 10:24:08AM +0300, Dmitry Kasatkin wrote:
>
> This patch looks OK.
It looks good to me too.
Thanks!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the arm tree
@ 2010-05-04 13:03 ` Herbert Xu
0 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2010-05-04 13:03 UTC (permalink / raw)
To: Dmitry Kasatkin
Cc: ext Stephen Rothwell, linux-next, linux-kernel, Will Deacon,
Russell King
On Tue, May 04, 2010 at 10:24:08AM +0300, Dmitry Kasatkin wrote:
>
> This patch looks OK.
It looks good to me too.
Thanks!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the arm tree
2010-05-04 13:03 ` Herbert Xu
@ 2010-05-04 21:24 ` Stephen Rothwell
-1 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2010-05-04 21:24 UTC (permalink / raw)
To: Herbert Xu
Cc: Dmitry Kasatkin, linux-next, linux-kernel, Will Deacon, Russell King
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
Hi all,
On Tue, 4 May 2010 21:03:05 +0800 Herbert Xu <herbert@gondor.apana.org.au> wrote:
>
> On Tue, May 04, 2010 at 10:24:08AM +0300, Dmitry Kasatkin wrote:
> >
> > This patch looks OK.
>
> It looks good to me too.
Thanks for the confirmation.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the arm tree
@ 2010-05-04 21:24 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2010-05-04 21:24 UTC (permalink / raw)
To: Herbert Xu
Cc: Dmitry Kasatkin, linux-next, linux-kernel, Will Deacon, Russell King
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
Hi all,
On Tue, 4 May 2010 21:03:05 +0800 Herbert Xu <herbert@gondor.apana.org.au> wrote:
>
> On Tue, May 04, 2010 at 10:24:08AM +0300, Dmitry Kasatkin wrote:
> >
> > This patch looks OK.
>
> It looks good to me too.
Thanks for the confirmation.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the arm tree
2012-05-16 5:14 ` Stephen Rothwell
@ 2012-05-16 7:26 ` Linus Walleij
-1 siblings, 0 replies; 12+ messages in thread
From: Linus Walleij @ 2012-05-16 7:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Herbert Xu, linux-next, linux-kernel, Russell King, Andreas Westin
On Wed, May 16, 2012 at 7:14 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the crypto tree got a conflict in
> arch/arm/mach-ux500/devices-common.h between commit 08956a0e8a69 ("ARM:
> 7372/1: ux500: factor out dynamic amba device allocator") from the tree
> and commit 585d188f8072 ("mach-ux500: crypto - core support for CRYP/HASH
> module") from the crypto tree.
>
> Just context changes (maybe). I fixed it up (see below) and can carry
> the fix as necessary.
>
> I suspect that there may be something deeper here, though.
This looks correct, thanks Stephen!
Linus Walleij
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the arm tree
@ 2012-05-16 7:26 ` Linus Walleij
0 siblings, 0 replies; 12+ messages in thread
From: Linus Walleij @ 2012-05-16 7:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Herbert Xu, linux-next, linux-kernel, Russell King, Andreas Westin
On Wed, May 16, 2012 at 7:14 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the crypto tree got a conflict in
> arch/arm/mach-ux500/devices-common.h between commit 08956a0e8a69 ("ARM:
> 7372/1: ux500: factor out dynamic amba device allocator") from the tree
> and commit 585d188f8072 ("mach-ux500: crypto - core support for CRYP/HASH
> module") from the crypto tree.
>
> Just context changes (maybe). I fixed it up (see below) and can carry
> the fix as necessary.
>
> I suspect that there may be something deeper here, though.
This looks correct, thanks Stephen!
Linus Walleij
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the crypto tree with the arm tree
@ 2012-05-16 5:14 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2012-05-16 5:14 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-next, linux-kernel, Linus Walleij, Russell King, Andreas Westin
[-- Attachment #1: Type: text/plain, Size: 3028 bytes --]
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
arch/arm/mach-ux500/devices-common.h between commit 08956a0e8a69 ("ARM:
7372/1: ux500: factor out dynamic amba device allocator") from the tree
and commit 585d188f8072 ("mach-ux500: crypto - core support for CRYP/HASH
module") from the crypto tree.
Just context changes (maybe). I fixed it up (see below) and can carry
the fix as necessary.
I suspect that there may be something deeper here, though.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-ux500/devices-common.h
index f75bcb2,89c5a59..0000000
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@@ -11,8 -11,17 +11,13 @@@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/sys_soc.h>
+#include <linux/amba/bus.h>
#include <plat/i2c.h>
+ #include <mach/crypto-ux500.h>
+
-extern struct amba_device *
-dbx500_add_amba_device(struct device *parent, const char *name,
- resource_size_t base, int irq, void *pdata,
- unsigned int periphid);
-
+ extern struct platform_device *
+ dbx500_add_platform_device_noirq(const char *name, int id,
+ resource_size_t base, void *pdata);
struct spi_master_cntlr;
@@@ -81,10 -90,58 +86,59 @@@ dbx500_add_i2c(struct device *parent, i
static inline struct amba_device *
dbx500_add_rtc(struct device *parent, resource_size_t base, int irq)
{
- return dbx500_add_amba_device(parent, "rtc-pl031", base, irq, NULL, 0);
+ return amba_apb_device_add(parent, "rtc-pl031", base, SZ_4K, irq,
+ 0, NULL, 0);
}
+ struct cryp_platform_data;
+
+ static inline struct platform_device *
+ dbx500_add_cryp1(struct device *parent, int id, resource_size_t base, int irq,
+ struct cryp_platform_data *pdata)
+ {
+ struct resource res[] = {
+ DEFINE_RES_MEM(base, SZ_4K),
+ DEFINE_RES_IRQ(irq),
+ };
+
+ struct platform_device_info pdevinfo = {
+ .parent = parent,
+ .name = "cryp1",
+ .id = id,
+ .res = res,
+ .num_res = ARRAY_SIZE(res),
+ .data = pdata,
+ .size_data = sizeof(*pdata),
+ .dma_mask = DMA_BIT_MASK(32),
+ };
+
+ return platform_device_register_full(&pdevinfo);
+ }
+
+ struct hash_platform_data;
+
+ static inline struct platform_device *
+ dbx500_add_hash1(struct device *parent, int id, resource_size_t base,
+ struct hash_platform_data *pdata)
+ {
+ struct resource res[] = {
+ DEFINE_RES_MEM(base, SZ_4K),
+ };
+
+ struct platform_device_info pdevinfo = {
+ .parent = parent,
+ .name = "hash1",
+ .id = id,
+ .res = res,
+ .num_res = ARRAY_SIZE(res),
+ .data = pdata,
+ .size_data = sizeof(*pdata),
+ .dma_mask = DMA_BIT_MASK(32),
+ };
+
+ return platform_device_register_full(&pdevinfo);
+ }
+
struct nmk_gpio_platform_data;
void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num,
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the crypto tree with the arm tree
@ 2012-05-16 5:14 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2012-05-16 5:14 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-next, linux-kernel, Linus Walleij, Russell King, Andreas Westin
[-- Attachment #1: Type: text/plain, Size: 3028 bytes --]
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
arch/arm/mach-ux500/devices-common.h between commit 08956a0e8a69 ("ARM:
7372/1: ux500: factor out dynamic amba device allocator") from the tree
and commit 585d188f8072 ("mach-ux500: crypto - core support for CRYP/HASH
module") from the crypto tree.
Just context changes (maybe). I fixed it up (see below) and can carry
the fix as necessary.
I suspect that there may be something deeper here, though.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-ux500/devices-common.h
index f75bcb2,89c5a59..0000000
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@@ -11,8 -11,17 +11,13 @@@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/sys_soc.h>
+#include <linux/amba/bus.h>
#include <plat/i2c.h>
+ #include <mach/crypto-ux500.h>
+
-extern struct amba_device *
-dbx500_add_amba_device(struct device *parent, const char *name,
- resource_size_t base, int irq, void *pdata,
- unsigned int periphid);
-
+ extern struct platform_device *
+ dbx500_add_platform_device_noirq(const char *name, int id,
+ resource_size_t base, void *pdata);
struct spi_master_cntlr;
@@@ -81,10 -90,58 +86,59 @@@ dbx500_add_i2c(struct device *parent, i
static inline struct amba_device *
dbx500_add_rtc(struct device *parent, resource_size_t base, int irq)
{
- return dbx500_add_amba_device(parent, "rtc-pl031", base, irq, NULL, 0);
+ return amba_apb_device_add(parent, "rtc-pl031", base, SZ_4K, irq,
+ 0, NULL, 0);
}
+ struct cryp_platform_data;
+
+ static inline struct platform_device *
+ dbx500_add_cryp1(struct device *parent, int id, resource_size_t base, int irq,
+ struct cryp_platform_data *pdata)
+ {
+ struct resource res[] = {
+ DEFINE_RES_MEM(base, SZ_4K),
+ DEFINE_RES_IRQ(irq),
+ };
+
+ struct platform_device_info pdevinfo = {
+ .parent = parent,
+ .name = "cryp1",
+ .id = id,
+ .res = res,
+ .num_res = ARRAY_SIZE(res),
+ .data = pdata,
+ .size_data = sizeof(*pdata),
+ .dma_mask = DMA_BIT_MASK(32),
+ };
+
+ return platform_device_register_full(&pdevinfo);
+ }
+
+ struct hash_platform_data;
+
+ static inline struct platform_device *
+ dbx500_add_hash1(struct device *parent, int id, resource_size_t base,
+ struct hash_platform_data *pdata)
+ {
+ struct resource res[] = {
+ DEFINE_RES_MEM(base, SZ_4K),
+ };
+
+ struct platform_device_info pdevinfo = {
+ .parent = parent,
+ .name = "hash1",
+ .id = id,
+ .res = res,
+ .num_res = ARRAY_SIZE(res),
+ .data = pdata,
+ .size_data = sizeof(*pdata),
+ .dma_mask = DMA_BIT_MASK(32),
+ };
+
+ return platform_device_register_full(&pdevinfo);
+ }
+
struct nmk_gpio_platform_data;
void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num,
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-05-16 7:26 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-04 2:53 linux-next: manual merge of the crypto tree with the arm tree Stephen Rothwell
2010-05-04 2:53 ` Stephen Rothwell
2010-05-04 7:24 ` Dmitry Kasatkin
2010-05-04 13:03 ` Herbert Xu
2010-05-04 13:03 ` Herbert Xu
2010-05-04 21:24 ` Stephen Rothwell
2010-05-04 21:24 ` Stephen Rothwell
2010-05-04 9:13 ` Will Deacon
2012-05-16 5:14 Stephen Rothwell
2012-05-16 5:14 ` Stephen Rothwell
2012-05-16 7:26 ` Linus Walleij
2012-05-16 7:26 ` Linus Walleij
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.