public inbox for linux-m68k@lists.linux-m68k.org
 help / color / mirror / Atom feed
* [PATCH] m68k: remove check for CONFIG_BSEIP
@ 2014-05-20  7:56 Paul Bolle
  2014-11-10  2:44 ` Greg Ungerer
  0 siblings, 1 reply; 2+ messages in thread
From: Paul Bolle @ 2014-05-20  7:56 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: linux-m68k, linux-kernel

There used to be a Kconfig symbol BSEIP. It was PPC specific and was
removed in v2.6.27. So the check for CONFIG_BSEIP can be removed. This
means a few defines will be removed. None of the macros involved are
used, so no one should care.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
Untested.

 arch/m68k/include/asm/commproc.h | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/arch/m68k/include/asm/commproc.h b/arch/m68k/include/asm/commproc.h
index 66a36bd51aa1..c67e09279ea9 100644
--- a/arch/m68k/include/asm/commproc.h
+++ b/arch/m68k/include/asm/commproc.h
@@ -480,28 +480,6 @@ typedef struct scc_enet {
 #define SICR_ENET_CLKRT	((uint)0x0000003d)
 #endif
 
-#ifdef CONFIG_BSEIP
-/* This ENET stuff is for the MPC823 with ethernet on SCC2.
- * This is unique to the BSE ip-Engine board.
- */
-#define PA_ENET_RXD	((ushort)0x0004)
-#define PA_ENET_TXD	((ushort)0x0008)
-#define PA_ENET_TCLK	((ushort)0x0100)
-#define PA_ENET_RCLK	((ushort)0x0200)
-#define PB_ENET_TENA	((uint)0x00002000)
-#define PC_ENET_CLSN	((ushort)0x0040)
-#define PC_ENET_RENA	((ushort)0x0080)
-
-/* BSE uses port B and C bits for PHY control also.
-*/
-#define PB_BSE_POWERUP	((uint)0x00000004)
-#define PB_BSE_FDXDIS	((uint)0x00008000)
-#define PC_BSE_LOOPBACK	((ushort)0x0800)
-
-#define SICR_ENET_MASK	((uint)0x0000ff00)
-#define SICR_ENET_CLKRT	((uint)0x00002c00)
-#endif
-
 /* SCC Event register as used by Ethernet.
 */
 #define SCCE_ENET_GRA	((ushort)0x0080)	/* Graceful stop complete */
-- 
1.9.0

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

* Re: [PATCH] m68k: remove check for CONFIG_BSEIP
  2014-05-20  7:56 [PATCH] m68k: remove check for CONFIG_BSEIP Paul Bolle
@ 2014-11-10  2:44 ` Greg Ungerer
  0 siblings, 0 replies; 2+ messages in thread
From: Greg Ungerer @ 2014-11-10  2:44 UTC (permalink / raw)
  To: Paul Bolle, Geert Uytterhoeven; +Cc: linux-m68k, linux-kernel

Hi Paul,

On 20/05/14 17:56, Paul Bolle wrote:
> There used to be a Kconfig symbol BSEIP. It was PPC specific and was
> removed in v2.6.27. So the check for CONFIG_BSEIP can be removed. This
> means a few defines will be removed. None of the macros involved are
> used, so no one should care.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>

Thanks, applied to m68knommu for-next branch.

Regards
Greg



> ---
> Untested.
> 
>  arch/m68k/include/asm/commproc.h | 22 ----------------------
>  1 file changed, 22 deletions(-)
> 
> diff --git a/arch/m68k/include/asm/commproc.h b/arch/m68k/include/asm/commproc.h
> index 66a36bd51aa1..c67e09279ea9 100644
> --- a/arch/m68k/include/asm/commproc.h
> +++ b/arch/m68k/include/asm/commproc.h
> @@ -480,28 +480,6 @@ typedef struct scc_enet {
>  #define SICR_ENET_CLKRT	((uint)0x0000003d)
>  #endif
>  
> -#ifdef CONFIG_BSEIP
> -/* This ENET stuff is for the MPC823 with ethernet on SCC2.
> - * This is unique to the BSE ip-Engine board.
> - */
> -#define PA_ENET_RXD	((ushort)0x0004)
> -#define PA_ENET_TXD	((ushort)0x0008)
> -#define PA_ENET_TCLK	((ushort)0x0100)
> -#define PA_ENET_RCLK	((ushort)0x0200)
> -#define PB_ENET_TENA	((uint)0x00002000)
> -#define PC_ENET_CLSN	((ushort)0x0040)
> -#define PC_ENET_RENA	((ushort)0x0080)
> -
> -/* BSE uses port B and C bits for PHY control also.
> -*/
> -#define PB_BSE_POWERUP	((uint)0x00000004)
> -#define PB_BSE_FDXDIS	((uint)0x00008000)
> -#define PC_BSE_LOOPBACK	((ushort)0x0800)
> -
> -#define SICR_ENET_MASK	((uint)0x0000ff00)
> -#define SICR_ENET_CLKRT	((uint)0x00002c00)
> -#endif
> -
>  /* SCC Event register as used by Ethernet.
>  */
>  #define SCCE_ENET_GRA	((ushort)0x0080)	/* Graceful stop complete */
> 

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

end of thread, other threads:[~2014-11-10  2:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-20  7:56 [PATCH] m68k: remove check for CONFIG_BSEIP Paul Bolle
2014-11-10  2:44 ` Greg Ungerer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox