From 9aa3283595451ca093500ff0977b106e1f465586 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 13 May 2011 14:29:12 -0700 Subject: ehea/ibm*: Move the IBM drivers Move the IBM drivers into drivers/net/ethernet/ibm/ and make the necessary Kconfig and Makefile changes. - Renamed ibm_new_emac to emac - Cleaned up Makefile and Kconfig options which referred to IBM_NEW_EMAC to IBM_EMAC - ibmlana driver is a National Semiconductor SONIC driver so it was not moved CC: Christoph Raisch CC: Santiago Leon CC: Benjamin Herrenschmidt CC: David Gibson CC: Kyle Lucke CC: Michael Ellerman Signed-off-by: Jeff Kirsher --- drivers/net/ibm_newemac/zmii.h | 78 ------------------------------------------ 1 file changed, 78 deletions(-) delete mode 100644 drivers/net/ibm_newemac/zmii.h (limited to 'drivers/net/ibm_newemac/zmii.h') diff --git a/drivers/net/ibm_newemac/zmii.h b/drivers/net/ibm_newemac/zmii.h deleted file mode 100644 index 1333fa2b2781..000000000000 --- a/drivers/net/ibm_newemac/zmii.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * drivers/net/ibm_newemac/zmii.h - * - * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support. - * - * Copyright 2007 Benjamin Herrenschmidt, IBM Corp. - * - * - * Based on the arch/ppc version of the driver: - * - * Copyright (c) 2004, 2005 Zultys Technologies. - * Eugene Surovegin or - * - * Based on original work by - * Armin Kuster - * Copyright 2001 MontaVista Softare 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. - * - */ -#ifndef __IBM_NEWEMAC_ZMII_H -#define __IBM_NEWEMAC_ZMII_H - -/* ZMII bridge registers */ -struct zmii_regs { - u32 fer; /* Function enable reg */ - u32 ssr; /* Speed select reg */ - u32 smiirs; /* SMII status reg */ -}; - -/* ZMII device */ -struct zmii_instance { - struct zmii_regs __iomem *base; - - /* Only one EMAC whacks us at a time */ - struct mutex lock; - - /* subset of PHY_MODE_XXXX */ - int mode; - - /* number of EMACs using this ZMII bridge */ - int users; - - /* FER value left by firmware */ - u32 fer_save; - - /* OF device instance */ - struct platform_device *ofdev; -}; - -#ifdef CONFIG_IBM_NEW_EMAC_ZMII - -extern int zmii_init(void); -extern void zmii_exit(void); -extern int zmii_attach(struct platform_device *ofdev, int input, int *mode); -extern void zmii_detach(struct platform_device *ofdev, int input); -extern void zmii_get_mdio(struct platform_device *ofdev, int input); -extern void zmii_put_mdio(struct platform_device *ofdev, int input); -extern void zmii_set_speed(struct platform_device *ofdev, int input, int speed); -extern int zmii_get_regs_len(struct platform_device *ocpdev); -extern void *zmii_dump_regs(struct platform_device *ofdev, void *buf); - -#else -# define zmii_init() 0 -# define zmii_exit() do { } while(0) -# define zmii_attach(x,y,z) (-ENXIO) -# define zmii_detach(x,y) do { } while(0) -# define zmii_get_mdio(x,y) do { } while(0) -# define zmii_put_mdio(x,y) do { } while(0) -# define zmii_set_speed(x,y,z) do { } while(0) -# define zmii_get_regs_len(x) 0 -# define zmii_dump_regs(x,buf) (buf) -#endif /* !CONFIG_IBM_NEW_EMAC_ZMII */ - -#endif /* __IBM_NEWEMAC_ZMII_H */ -- cgit v1.2.3