2010-05-10 12:07:55

by Dmitry Kasatkin

Subject: [PATCH 1/1] omap-sham: OMAP macros corrected

Signed-off-by: Dmitry Kasatkin <[email protected]>
---
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

2010-05-10 12:14:20

by Herbert Xu

Subject: Re: [PATCH 1/1] omap-sham: OMAP macros corrected

On Mon, May 10, 2010 at 03:07:55PM +0300, Dmitry Kasatkin wrote:
> Signed-off-by: Dmitry Kasatkin <[email protected]>
> ---
> 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~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2010-05-10 12:51:04

by Dmitry Kasatkin

Subject: Re: [PATCH 1/1] omap-sham: OMAP macros corrected

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 <[email protected]>
>> ---
>> 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

2010-05-10 17:03:29

by Tony Lindgren

Subject: Re: [PATCH 1/1] omap-sham: OMAP macros corrected

* Dmitry Kasatkin <[email protected]> [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 <[email protected]>
> >> ---
> >> 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 <[email protected]>

2010-05-14 04:46:05

by Herbert Xu

Subject: Re: [PATCH 1/1] omap-sham: OMAP macros corrected

On Mon, May 10, 2010 at 10:03:29AM -0700, Tony Lindgren wrote:
>
> 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 <[email protected]>

Applied to cryptodev. Thanks everyone!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt