[PATCH 2/2] sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785

linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 2/2] sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785
@ 2012-03-16  2:31 Nobuhiro Iwamatsu
  2012-03-16  4:11 ` Simon Horman
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Nobuhiro Iwamatsu @ 2012-03-16  2:31 UTC (permalink / raw)
  To: linux-sh

CHCR of SH7763, SH7764, SH7780 and SH7785 is constitution same as SH7757.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
 arch/sh/include/cpu-sh4/cpu/dma-register.h |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h
index 1af4a95..02788b6 100644
--- a/arch/sh/include/cpu-sh4/cpu/dma-register.h
+++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h
@@ -30,27 +30,15 @@
 #define CHCR_TS_LOW_SHIFT	3
 #define CHCR_TS_HIGH_MASK	0x00300000
 #define CHCR_TS_HIGH_SHIFT	(20 - 2)	/* 2 bits for shifted low TS */
-#elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-	defined(CONFIG_CPU_SUBTYPE_SH7764)
-#define CHCR_TS_LOW_MASK	0x00000018
-#define CHCR_TS_LOW_SHIFT	3
-#define CHCR_TS_HIGH_MASK	0
-#define CHCR_TS_HIGH_SHIFT	0
-#elif defined(CONFIG_CPU_SUBTYPE_SH7757)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7757) || \
+	defined(CONFIG_CPU_SUBTYPE_SH7763) || \
+	defined(CONFIG_CPU_SUBTYPE_SH7764) || \
+	defined(CONFIG_CPU_SUBTYPE_SH7780) || \
+	defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define CHCR_TS_LOW_MASK	0x00000018
 #define CHCR_TS_LOW_SHIFT	3
 #define CHCR_TS_HIGH_MASK	0x00100000
 #define CHCR_TS_HIGH_SHIFT	(20 - 2)	/* 2 bits for shifted low TS */
-#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
-#define CHCR_TS_LOW_MASK	0x00000018
-#define CHCR_TS_LOW_SHIFT	3
-#define CHCR_TS_HIGH_MASK	0
-#define CHCR_TS_HIGH_SHIFT	0
-#else /* SH7785 */
-#define CHCR_TS_LOW_MASK	0x00000018
-#define CHCR_TS_LOW_SHIFT	3
-#define CHCR_TS_HIGH_MASK	0
-#define CHCR_TS_HIGH_SHIFT	0
 #endif
 
 /* Transmit sizes and respective CHCR register values */
-- 
1.7.9.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785
  2012-03-16  2:31 [PATCH 2/2] sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785 Nobuhiro Iwamatsu
@ 2012-03-16  4:11 ` Simon Horman
  2012-03-19  0:57 ` Nobuhiro Iwamatsu
  2012-03-19  1:01 ` Simon Horman
  2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2012-03-16  4:11 UTC (permalink / raw)
  To: linux-sh

Hi Iwamatsu-san,

On Fri, Mar 16, 2012 at 11:31:26AM +0900, Nobuhiro Iwamatsu wrote:
> CHCR of SH7763, SH7764, SH7780 and SH7785 is constitution same as SH7757.

Is it intentional that this patch changes the definition of
CHCR_TS_HIGH_MASK and CHCR_TS_HIGH_SHIFT for sh7763, sh7764, sh7780 and
sh7785 ?

Is it also intentional that there is no longer a default case?

> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
> ---
>  arch/sh/include/cpu-sh4/cpu/dma-register.h |   22 +++++-----------------
>  1 files changed, 5 insertions(+), 17 deletions(-)
> 
> diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h
> index 1af4a95..02788b6 100644
> --- a/arch/sh/include/cpu-sh4/cpu/dma-register.h
> +++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h
> @@ -30,27 +30,15 @@
>  #define CHCR_TS_LOW_SHIFT	3
>  #define CHCR_TS_HIGH_MASK	0x00300000
>  #define CHCR_TS_HIGH_SHIFT	(20 - 2)	/* 2 bits for shifted low TS */
> -#elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \
> -	defined(CONFIG_CPU_SUBTYPE_SH7764)
> -#define CHCR_TS_LOW_MASK	0x00000018
> -#define CHCR_TS_LOW_SHIFT	3
> -#define CHCR_TS_HIGH_MASK	0
> -#define CHCR_TS_HIGH_SHIFT	0
> -#elif defined(CONFIG_CPU_SUBTYPE_SH7757)
> +#elif defined(CONFIG_CPU_SUBTYPE_SH7757) || \
> +	defined(CONFIG_CPU_SUBTYPE_SH7763) || \
> +	defined(CONFIG_CPU_SUBTYPE_SH7764) || \
> +	defined(CONFIG_CPU_SUBTYPE_SH7780) || \
> +	defined(CONFIG_CPU_SUBTYPE_SH7785)
>  #define CHCR_TS_LOW_MASK	0x00000018
>  #define CHCR_TS_LOW_SHIFT	3
>  #define CHCR_TS_HIGH_MASK	0x00100000
>  #define CHCR_TS_HIGH_SHIFT	(20 - 2)	/* 2 bits for shifted low TS */
> -#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
> -#define CHCR_TS_LOW_MASK	0x00000018
> -#define CHCR_TS_LOW_SHIFT	3
> -#define CHCR_TS_HIGH_MASK	0
> -#define CHCR_TS_HIGH_SHIFT	0
> -#else /* SH7785 */
> -#define CHCR_TS_LOW_MASK	0x00000018
> -#define CHCR_TS_LOW_SHIFT	3
> -#define CHCR_TS_HIGH_MASK	0
> -#define CHCR_TS_HIGH_SHIFT	0
>  #endif
>  
>  /* Transmit sizes and respective CHCR register values */
> -- 
> 1.7.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785
  2012-03-16  2:31 [PATCH 2/2] sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785 Nobuhiro Iwamatsu
  2012-03-16  4:11 ` Simon Horman
@ 2012-03-19  0:57 ` Nobuhiro Iwamatsu
  2012-03-19  1:01 ` Simon Horman
  2 siblings, 0 replies; 4+ messages in thread
From: Nobuhiro Iwamatsu @ 2012-03-19  0:57 UTC (permalink / raw)
  To: linux-sh

Hi,

Simon Horman さんは書きました:
> Hi Iwamatsu-san,
> 
> On Fri, Mar 16, 2012 at 11:31:26AM +0900, Nobuhiro Iwamatsu wrote:
>> CHCR of SH7763, SH7764, SH7780 and SH7785 is constitution same as SH7757.
> 
> Is it intentional that this patch changes the definition of
> CHCR_TS_HIGH_MASK and CHCR_TS_HIGH_SHIFT for sh7763, sh7764, sh7780 and
> sh7785 ?
> 

Yes, I checked this change with manual of Japanese and English.

Best regards,
   Nobuhiro

> Is it also intentional that there is no longer a default case?
> 
>> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
>> ---
>>  arch/sh/include/cpu-sh4/cpu/dma-register.h |   22 +++++-----------------
>>  1 files changed, 5 insertions(+), 17 deletions(-)
>>
>> diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h
>> index 1af4a95..02788b6 100644
>> --- a/arch/sh/include/cpu-sh4/cpu/dma-register.h
>> +++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h
>> @@ -30,27 +30,15 @@
>>  #define CHCR_TS_LOW_SHIFT	3
>>  #define CHCR_TS_HIGH_MASK	0x00300000
>>  #define CHCR_TS_HIGH_SHIFT	(20 - 2)	/* 2 bits for shifted low TS */
>> -#elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \
>> -	defined(CONFIG_CPU_SUBTYPE_SH7764)
>> -#define CHCR_TS_LOW_MASK	0x00000018
>> -#define CHCR_TS_LOW_SHIFT	3
>> -#define CHCR_TS_HIGH_MASK	0
>> -#define CHCR_TS_HIGH_SHIFT	0
>> -#elif defined(CONFIG_CPU_SUBTYPE_SH7757)
>> +#elif defined(CONFIG_CPU_SUBTYPE_SH7757) || \
>> +	defined(CONFIG_CPU_SUBTYPE_SH7763) || \
>> +	defined(CONFIG_CPU_SUBTYPE_SH7764) || \
>> +	defined(CONFIG_CPU_SUBTYPE_SH7780) || \
>> +	defined(CONFIG_CPU_SUBTYPE_SH7785)
>>  #define CHCR_TS_LOW_MASK	0x00000018
>>  #define CHCR_TS_LOW_SHIFT	3
>>  #define CHCR_TS_HIGH_MASK	0x00100000
>>  #define CHCR_TS_HIGH_SHIFT	(20 - 2)	/* 2 bits for shifted low TS */
>> -#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
>> -#define CHCR_TS_LOW_MASK	0x00000018
>> -#define CHCR_TS_LOW_SHIFT	3
>> -#define CHCR_TS_HIGH_MASK	0
>> -#define CHCR_TS_HIGH_SHIFT	0
>> -#else /* SH7785 */
>> -#define CHCR_TS_LOW_MASK	0x00000018
>> -#define CHCR_TS_LOW_SHIFT	3
>> -#define CHCR_TS_HIGH_MASK	0
>> -#define CHCR_TS_HIGH_SHIFT	0
>>  #endif
>>  
>>  /* Transmit sizes and respective CHCR register values */
>> -- 
>> 1.7.9.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785
  2012-03-16  2:31 [PATCH 2/2] sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785 Nobuhiro Iwamatsu
  2012-03-16  4:11 ` Simon Horman
  2012-03-19  0:57 ` Nobuhiro Iwamatsu
@ 2012-03-19  1:01 ` Simon Horman
  2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2012-03-19  1:01 UTC (permalink / raw)
  To: linux-sh

On Mon, Mar 19, 2012 at 09:57:44AM +0900, Nobuhiro Iwamatsu wrote:
> Hi,
> 
> Simon Horman さんは書きました:
> >Hi Iwamatsu-san,
> >
> >On Fri, Mar 16, 2012 at 11:31:26AM +0900, Nobuhiro Iwamatsu wrote:
> >>CHCR of SH7763, SH7764, SH7780 and SH7785 is constitution same as SH7757.
> >
> >Is it intentional that this patch changes the definition of
> >CHCR_TS_HIGH_MASK and CHCR_TS_HIGH_SHIFT for sh7763, sh7764, sh7780 and
> >sh7785 ?
> >
> 
> Yes, I checked this change with manual of Japanese and English.

Thanks

Reviewed-by:  Simon Horman <horms@verge.net.au>

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-03-19  1:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-16  2:31 [PATCH 2/2] sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785 Nobuhiro Iwamatsu
2012-03-16  4:11 ` Simon Horman
2012-03-19  0:57 ` Nobuhiro Iwamatsu
2012-03-19  1:01 ` Simon Horman

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).