* [PATCH 1/1] omap-sham: OMAP macros corrected
@ 2010-05-10 12:07 Dmitry Kasatkin
2010-05-10 12:14 ` Herbert Xu
0 siblings, 1 reply; 5+ messages in thread
From: Dmitry Kasatkin @ 2010-05-10 12:07 UTC (permalink / raw)
To: herbert; +Cc: linux-crypto, linux-omap
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
---
arch/arm/mach-omap2/devices.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index beac46c..79dbf04 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -456,7 +456,7 @@ static inline void omap_init_mcspi(void) {}
#if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE)
-#ifdef CONFIG_ARCH_OMAP24XX
+#ifdef CONFIG_ARCH_OMAP2
static struct resource omap2_sham_resources[] = {
{
.start = OMAP24XX_SEC_SHA1MD5_BASE,
@@ -474,7 +474,7 @@ static int omap2_sham_resources_sz = ARRAY_SIZE(omap2_sham_resources);
#define omap2_sham_resources_sz 0
#endif
-#ifdef CONFIG_ARCH_OMAP34XX
+#ifdef CONFIG_ARCH_OMAP3
static struct resource omap3_sham_resources[] = {
{
.start = OMAP34XX_SEC_SHA1MD5_BASE,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/1] omap-sham: OMAP macros corrected
2010-05-10 12:07 [PATCH 1/1] omap-sham: OMAP macros corrected Dmitry Kasatkin
@ 2010-05-10 12:14 ` Herbert Xu
2010-05-10 12:49 ` Dmitry Kasatkin
0 siblings, 1 reply; 5+ messages in thread
From: Herbert Xu @ 2010-05-10 12:14 UTC (permalink / raw)
To: Dmitry Kasatkin; +Cc: linux-crypto, linux-omap, Tony Lindgren
On Mon, May 10, 2010 at 03:07:55PM +0300, Dmitry Kasatkin wrote:
> Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
> ---
> arch/arm/mach-omap2/devices.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
> index beac46c..79dbf04 100644
> --- a/arch/arm/mach-omap2/devices.c
> +++ b/arch/arm/mach-omap2/devices.c
> @@ -456,7 +456,7 @@ static inline void omap_init_mcspi(void) {}
>
> #if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE)
>
> -#ifdef CONFIG_ARCH_OMAP24XX
> +#ifdef CONFIG_ARCH_OMAP2
> static struct resource omap2_sham_resources[] = {
> {
> .start = OMAP24XX_SEC_SHA1MD5_BASE,
> @@ -474,7 +474,7 @@ static int omap2_sham_resources_sz = ARRAY_SIZE(omap2_sham_resources);
> #define omap2_sham_resources_sz 0
> #endif
>
> -#ifdef CONFIG_ARCH_OMAP34XX
> +#ifdef CONFIG_ARCH_OMAP3
> static struct resource omap3_sham_resources[] = {
> {
> .start = OMAP34XX_SEC_SHA1MD5_BASE,
Hi Tony:
If I add this patch to cryptodev, is this going to cause any
problems for you?
Thbanks,
--
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] 5+ messages in thread* Re: [PATCH 1/1] omap-sham: OMAP macros corrected
2010-05-10 12:14 ` Herbert Xu
@ 2010-05-10 12:49 ` Dmitry Kasatkin
2010-05-10 17:03 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Dmitry Kasatkin @ 2010-05-10 12:49 UTC (permalink / raw)
To: ext Herbert Xu
Cc: linux-crypto@vger.kernel.org, linux-omap@vger.kernel.org,
Tony Lindgren
On 10/05/10 15:14, ext Herbert Xu wrote:
> On Mon, May 10, 2010 at 03:07:55PM +0300, Dmitry Kasatkin wrote:
>
>> Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
>> ---
>> arch/arm/mach-omap2/devices.c | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
>> index beac46c..79dbf04 100644
>> --- a/arch/arm/mach-omap2/devices.c
>> +++ b/arch/arm/mach-omap2/devices.c
>> @@ -456,7 +456,7 @@ static inline void omap_init_mcspi(void) {}
>>
>> #if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE)
>>
>> -#ifdef CONFIG_ARCH_OMAP24XX
>> +#ifdef CONFIG_ARCH_OMAP2
>> static struct resource omap2_sham_resources[] = {
>> {
>> .start = OMAP24XX_SEC_SHA1MD5_BASE,
>> @@ -474,7 +474,7 @@ static int omap2_sham_resources_sz = ARRAY_SIZE(omap2_sham_resources);
>> #define omap2_sham_resources_sz 0
>> #endif
>>
>> -#ifdef CONFIG_ARCH_OMAP34XX
>> +#ifdef CONFIG_ARCH_OMAP3
>> static struct resource omap3_sham_resources[] = {
>> {
>> .start = OMAP34XX_SEC_SHA1MD5_BASE,
>>
> Hi Tony:
>
> If I add this patch to cryptodev, is this going to cause any
> problems for you?
>
> Thbanks,
>
Hi,
I should not be any problem, because it indeed needs to be like that.
- Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/1] omap-sham: OMAP macros corrected
2010-05-10 12:49 ` Dmitry Kasatkin
@ 2010-05-10 17:03 ` Tony Lindgren
2010-05-14 4:46 ` Herbert Xu
0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2010-05-10 17:03 UTC (permalink / raw)
To: Dmitry Kasatkin
Cc: ext Herbert Xu, linux-crypto@vger.kernel.org,
linux-omap@vger.kernel.org
* Dmitry Kasatkin <dmitry.kasatkin@nokia.com> [100510 05:45]:
>
> On 10/05/10 15:14, ext Herbert Xu wrote:
> > On Mon, May 10, 2010 at 03:07:55PM +0300, Dmitry Kasatkin wrote:
> >
> >> Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
> >> ---
> >> arch/arm/mach-omap2/devices.c | 4 ++--
> >> 1 files changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
> >> index beac46c..79dbf04 100644
> >> --- a/arch/arm/mach-omap2/devices.c
> >> +++ b/arch/arm/mach-omap2/devices.c
> >> @@ -456,7 +456,7 @@ static inline void omap_init_mcspi(void) {}
> >>
> >> #if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE)
> >>
> >> -#ifdef CONFIG_ARCH_OMAP24XX
> >> +#ifdef CONFIG_ARCH_OMAP2
> >> static struct resource omap2_sham_resources[] = {
> >> {
> >> .start = OMAP24XX_SEC_SHA1MD5_BASE,
> >> @@ -474,7 +474,7 @@ static int omap2_sham_resources_sz = ARRAY_SIZE(omap2_sham_resources);
> >> #define omap2_sham_resources_sz 0
> >> #endif
> >>
> >> -#ifdef CONFIG_ARCH_OMAP34XX
> >> +#ifdef CONFIG_ARCH_OMAP3
> >> static struct resource omap3_sham_resources[] = {
> >> {
> >> .start = OMAP34XX_SEC_SHA1MD5_BASE,
> >>
> > Hi Tony:
> >
> > If I add this patch to cryptodev, is this going to cause any
> > problems for you?
> >
> > Thbanks,
> >
> Hi,
>
> I should not be any problem, because it indeed needs to be like that.
Yeah please go ahead and add it. If we run into merge problems with
devices.c, we move some patches into omap for-next branch.
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-05-14 4:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-10 12:07 [PATCH 1/1] omap-sham: OMAP macros corrected Dmitry Kasatkin
2010-05-10 12:14 ` Herbert Xu
2010-05-10 12:49 ` Dmitry Kasatkin
2010-05-10 17:03 ` Tony Lindgren
2010-05-14 4:46 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox