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

Commit 455f9726 authored by Richard Weinberger's avatar Richard Weinberger Committed by Linus Torvalds
Browse files

sh: remove CPU_SUBTYPE_SH7764 



The symbol is an orphan, get rid of it.

Submitted by Richard a few months ago as "[PATCH 21/28] Remove
CPU_SUBTYPE_SH7764".

[pebolle@tiscali.nl: re-added dropped ||]
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8cdea060

arch/sh/drivers/dma/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -12,9 +12,8 @@ config SH_DMA_IRQ_MULTI 
	default y if CPU_SUBTYPE_SH7750  || CPU_SUBTYPE_SH7751  || \

		     CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || \

		     CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7091  || \

		     CPU_SUBTYPE_SH7763  || CPU_SUBTYPE_SH7764  || \

		     CPU_SUBTYPE_SH7780  || CPU_SUBTYPE_SH7785  || \

		     CPU_SUBTYPE_SH7760

		     CPU_SUBTYPE_SH7763  || CPU_SUBTYPE_SH7780  || \

		     CPU_SUBTYPE_SH7785  || CPU_SUBTYPE_SH7760



config SH_DMA_API

	depends on SH_DMA

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

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#define CHCR_TS_HIGH_SHIFT	(20 - 2)	/* 2 bits for shifted low TS */

#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

arch/sh/include/cpu-sh4a/cpu/dma.h

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
#define DMTE4_IRQ	evt2irq(0xb80)

#define DMAE0_IRQ	evt2irq(0xbc0)	/* DMA Error IRQ*/

#define SH_DMAC_BASE0	0xFE008020

#elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \

	defined(CONFIG_CPU_SUBTYPE_SH7764)

#elif defined(CONFIG_CPU_SUBTYPE_SH7763)

#define DMTE0_IRQ	evt2irq(0x640)

#define DMTE4_IRQ	evt2irq(0x780)

#define DMAE0_IRQ	evt2irq(0x6c0)