diff mbox

[21/28] Remove CPU_SUBTYPE_SH7764

Message ID 1391971686-9517-22-git-send-email-richard@nod.at (mailing list archive)
State Superseded
Delegated to: Paul Mundt
Headers show

Commit Message

Richard Weinberger Feb. 9, 2014, 6:47 p.m. UTC
The symbol is an orphan, get rid of it.

Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/sh/drivers/dma/Kconfig                | 5 ++---
 arch/sh/include/cpu-sh4/cpu/dma-register.h | 1 -
 arch/sh/include/cpu-sh4a/cpu/dma.h         | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

Comments

Paul Bolle Feb. 9, 2014, 9:36 p.m. UTC | #1
On Sun, 2014-02-09 at 19:47 +0100, Richard Weinberger wrote:
> The symbol is an orphan, get rid of it.
> 
> Signed-off-by: Richard Weinberger <richard@nod.at>

Paul Mundt had something similar queued a year ago:
https://lkml.org/lkml/2013/3/11/211 . What happened?


Paul Bolle

>  arch/sh/drivers/dma/Kconfig                | 5 ++---
>  arch/sh/include/cpu-sh4/cpu/dma-register.h | 1 -
>  arch/sh/include/cpu-sh4a/cpu/dma.h         | 3 +--
>  3 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
> index cfd5b90..e07afe8 100644
> --- a/arch/sh/drivers/dma/Kconfig
> +++ b/arch/sh/drivers/dma/Kconfig
> @@ -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
> diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h
> index 02788b6..9cd81e5 100644
> --- a/arch/sh/include/cpu-sh4/cpu/dma-register.h
> +++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h
> @@ -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
> diff --git a/arch/sh/include/cpu-sh4a/cpu/dma.h b/arch/sh/include/cpu-sh4a/cpu/dma.h
> index 89afb65..8ceccce 100644
> --- a/arch/sh/include/cpu-sh4a/cpu/dma.h
> +++ b/arch/sh/include/cpu-sh4a/cpu/dma.h
> @@ -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)


--
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
Paul Bolle April 15, 2014, 9:39 a.m. UTC | #2
On Sun, 2014-02-09 at 22:36 +0100, Paul Bolle wrote:
> On Sun, 2014-02-09 at 19:47 +0100, Richard Weinberger wrote:
> > The symbol is an orphan, get rid of it.
> > 
> > Signed-off-by: Richard Weinberger <richard@nod.at>
> 
> Paul Mundt had something similar queued a year ago:
> https://lkml.org/lkml/2013/3/11/211 . What happened?

By now the SuperH port has been orphaned. So what's the current
procedure for small SuperH fixes like this one?


Paul Bolle

> >  arch/sh/drivers/dma/Kconfig                | 5 ++---
> >  arch/sh/include/cpu-sh4/cpu/dma-register.h | 1 -
> >  arch/sh/include/cpu-sh4a/cpu/dma.h         | 3 +--
> >  3 files changed, 3 insertions(+), 6 deletions(-)
> > 
> > diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
> > index cfd5b90..e07afe8 100644
> > --- a/arch/sh/drivers/dma/Kconfig
> > +++ b/arch/sh/drivers/dma/Kconfig
> > @@ -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
> > diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h
> > index 02788b6..9cd81e5 100644
> > --- a/arch/sh/include/cpu-sh4/cpu/dma-register.h
> > +++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h
> > @@ -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
> > diff --git a/arch/sh/include/cpu-sh4a/cpu/dma.h b/arch/sh/include/cpu-sh4a/cpu/dma.h
> > index 89afb65..8ceccce 100644
> > --- a/arch/sh/include/cpu-sh4a/cpu/dma.h
> > +++ b/arch/sh/include/cpu-sh4a/cpu/dma.h
> > @@ -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)
> 


--
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
Geert Uytterhoeven April 15, 2014, 9:55 a.m. UTC | #3
Hi Paul,

On Tue, Apr 15, 2014 at 11:39 AM, Paul Bolle <pebolle@tiscali.nl> wrote:
> On Sun, 2014-02-09 at 22:36 +0100, Paul Bolle wrote:
>> On Sun, 2014-02-09 at 19:47 +0100, Richard Weinberger wrote:
>> > The symbol is an orphan, get rid of it.
>> >
>> > Signed-off-by: Richard Weinberger <richard@nod.at>
>>
>> Paul Mundt had something similar queued a year ago:
>> https://lkml.org/lkml/2013/3/11/211 . What happened?
>
> By now the SuperH port has been orphaned. So what's the current
> procedure for small SuperH fixes like this one?

Please submit them to Andrew Morton <akpm@linux-foundation.org>.

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
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
diff mbox

Patch

diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index cfd5b90..e07afe8 100644
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -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
diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h
index 02788b6..9cd81e5 100644
--- a/arch/sh/include/cpu-sh4/cpu/dma-register.h
+++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h
@@ -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
diff --git a/arch/sh/include/cpu-sh4a/cpu/dma.h b/arch/sh/include/cpu-sh4a/cpu/dma.h
index 89afb65..8ceccce 100644
--- a/arch/sh/include/cpu-sh4a/cpu/dma.h
+++ b/arch/sh/include/cpu-sh4a/cpu/dma.h
@@ -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)