Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8e3149b authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

sh: merge sh7722 and sh7724 DMA register definitions 



DMA CHCR register layout is equal on sh7722 and sh7724, reuse definitions.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent bff932cf

arch/sh/include/cpu-sh4/cpu/dma-register.h

+2 −6
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
#define CHCR_TS_LOW_SHIFT	3

#define CHCR_TS_HIGH_MASK	0

#define CHCR_TS_HIGH_SHIFT	0

#elif defined(CONFIG_CPU_SUBTYPE_SH7722)

#elif defined(CONFIG_CPU_SUBTYPE_SH7722) || \

	defined(CONFIG_CPU_SUBTYPE_SH7724)

#define CHCR_TS_LOW_MASK	0x00000018

#define CHCR_TS_LOW_SHIFT	3

#define CHCR_TS_HIGH_MASK	0x00300000
@@ -38,11 +39,6 @@ 
#define CHCR_TS_LOW_SHIFT	3

#define CHCR_TS_HIGH_MASK	0

#define CHCR_TS_HIGH_SHIFT	0

#elif defined(CONFIG_CPU_SUBTYPE_SH7724)

#define CHCR_TS_LOW_MASK	0x00000018

#define CHCR_TS_LOW_SHIFT	3

#define CHCR_TS_HIGH_MASK	0x00600000

#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