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

Commit 3d9077af authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds
Browse files

[PATCH] ppc32: Remove FSL OCP support 



Support for the OCP device model on Freescale (FSL) PPC's is no longer used.
All FSL PPC's that were using OCP have be converted to using the platform
device model.

Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 33d9e9b5

arch/ppc/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ config SERIAL_TEXT_DEBUG 


config PPC_OCP

	bool

	depends on IBM_OCP || FSL_OCP || XILINX_OCP

	depends on IBM_OCP || XILINX_OCP

	default y



endmenu

include/asm-ppc/fsl_ocp.h

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
/*

 * include/asm-ppc/fsl_ocp.h

 *

 * Definitions for the on-chip peripherals on Freescale PPC processors

 *

 * Maintainer: Kumar Gala (kumar.gala@freescale.com)

 *

 * Copyright 2004 Freescale Semiconductor, Inc

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



#ifdef __KERNEL__

#ifndef __ASM_FS_OCP_H__

#define __ASM_FS_OCP_H__



/* A table of information for supporting the Gianfar Ethernet Controller

 * This helps identify which enet controller we are dealing with,

 * and what type of enet controller it is

 */

struct ocp_gfar_data {

	uint interruptTransmit;

	uint interruptError;

	uint interruptReceive;

	uint interruptPHY;

	uint flags;

	uint phyid;

	uint phyregidx;

	unsigned char mac_addr[6];

};



/* Flags in the flags field */

#define GFAR_HAS_COALESCE		0x20

#define GFAR_HAS_RMON			0x10

#define GFAR_HAS_MULTI_INTR		0x08

#define GFAR_FIRM_SET_MACADDR		0x04

#define GFAR_HAS_PHY_INTR		0x02	/* if not set use a timer */

#define GFAR_HAS_GIGABIT		0x01



/* Data structure for I2C support.  Just contains a couple flags

 * to distinguish various I2C implementations*/

struct ocp_fs_i2c_data {

	uint flags;

};



/* Flags for I2C */

#define FS_I2C_SEPARATE_DFSRR	0x02

#define FS_I2C_CLOCK_5200	0x01



#endif	/* __ASM_FS_OCP_H__ */

#endif	/* __KERNEL__ */

include/asm-ppc/ocp.h

+0 −4
Original line number Diff line number Diff line
@@ -202,10 +202,6 @@ static DEVICE_ATTR(name##_##field, S_IRUGO, show_##name##_##field, NULL); 
#include <asm/ibm_ocp.h>

#endif



#ifdef CONFIG_FSL_OCP

#include <asm/fsl_ocp.h>

#endif



#endif				/* CONFIG_PPC_OCP */

#endif				/* __OCP_H__ */

#endif				/* __KERNEL__ */