From dd25ae88e170e21cfe4d1a539b4d32cc946cf789 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Sat, 25 Jun 2005 14:54:39 -0700 Subject: [PATCH] --- yaml --- r: 3219 b: refs/heads/master c: 3d9077afea4927e488282da7189de9159db20c17 h: refs/heads/master i: 3217: 080c1170fd4a6c7b9bb9f6080123dbb422650491 3215: 53592b5674dcd7bf9d4d17145ce8c285226875e7 v: v3 --- [refs] | 2 +- trunk/arch/ppc/Kconfig.debug | 2 +- trunk/include/asm-ppc/fsl_ocp.h | 54 --------------------------------- trunk/include/asm-ppc/ocp.h | 4 --- 4 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 trunk/include/asm-ppc/fsl_ocp.h diff --git a/[refs] b/[refs] index 1d529fdb2dfb..458f81be7459 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33d9e9b56d5ccd7776fdfe3ecce4a2793dee6fd3 +refs/heads/master: 3d9077afea4927e488282da7189de9159db20c17 diff --git a/trunk/arch/ppc/Kconfig.debug b/trunk/arch/ppc/Kconfig.debug index d2e1eea8e8e4..e16c7710d4be 100644 --- a/trunk/arch/ppc/Kconfig.debug +++ b/trunk/arch/ppc/Kconfig.debug @@ -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 diff --git a/trunk/include/asm-ppc/fsl_ocp.h b/trunk/include/asm-ppc/fsl_ocp.h deleted file mode 100644 index 050fbba8d049..000000000000 --- a/trunk/include/asm-ppc/fsl_ocp.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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__ */ diff --git a/trunk/include/asm-ppc/ocp.h b/trunk/include/asm-ppc/ocp.h index c726f1845190..983116f59d90 100644 --- a/trunk/include/asm-ppc/ocp.h +++ b/trunk/include/asm-ppc/ocp.h @@ -202,10 +202,6 @@ static DEVICE_ATTR(name##_##field, S_IRUGO, show_##name##_##field, NULL); #include #endif -#ifdef CONFIG_FSL_OCP -#include -#endif - #endif /* CONFIG_PPC_OCP */ #endif /* __OCP_H__ */ #endif /* __KERNEL__ */