Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785

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

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

authored by

Nobuhiro Iwamatsu and committed by
Paul Mundt
ffe0e190 9cdb81c7

+5 -17
+5 -17
arch/sh/include/cpu-sh4/cpu/dma-register.h
··· 30 30 #define CHCR_TS_LOW_SHIFT 3 31 31 #define CHCR_TS_HIGH_MASK 0x00300000 32 32 #define CHCR_TS_HIGH_SHIFT (20 - 2) /* 2 bits for shifted low TS */ 33 - #elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \ 34 - defined(CONFIG_CPU_SUBTYPE_SH7764) 35 - #define CHCR_TS_LOW_MASK 0x00000018 36 - #define CHCR_TS_LOW_SHIFT 3 37 - #define CHCR_TS_HIGH_MASK 0 38 - #define CHCR_TS_HIGH_SHIFT 0 39 - #elif defined(CONFIG_CPU_SUBTYPE_SH7757) 33 + #elif defined(CONFIG_CPU_SUBTYPE_SH7757) || \ 34 + defined(CONFIG_CPU_SUBTYPE_SH7763) || \ 35 + defined(CONFIG_CPU_SUBTYPE_SH7764) || \ 36 + defined(CONFIG_CPU_SUBTYPE_SH7780) || \ 37 + defined(CONFIG_CPU_SUBTYPE_SH7785) 40 38 #define CHCR_TS_LOW_MASK 0x00000018 41 39 #define CHCR_TS_LOW_SHIFT 3 42 40 #define CHCR_TS_HIGH_MASK 0x00100000 43 41 #define CHCR_TS_HIGH_SHIFT (20 - 2) /* 2 bits for shifted low TS */ 44 - #elif defined(CONFIG_CPU_SUBTYPE_SH7780) 45 - #define CHCR_TS_LOW_MASK 0x00000018 46 - #define CHCR_TS_LOW_SHIFT 3 47 - #define CHCR_TS_HIGH_MASK 0 48 - #define CHCR_TS_HIGH_SHIFT 0 49 - #else /* SH7785 */ 50 - #define CHCR_TS_LOW_MASK 0x00000018 51 - #define CHCR_TS_LOW_SHIFT 3 52 - #define CHCR_TS_HIGH_MASK 0 53 - #define CHCR_TS_HIGH_SHIFT 0 54 42 #endif 55 43 56 44 /* Transmit sizes and respective CHCR register values */