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

Commit 28fa031e authored by Eugene Surovegin's avatar Eugene Surovegin Committed by Linus Torvalds
Browse files

[PATCH] ppc32: move 4xx PHY_MODE_XXX defines to ibm_ocp.h 



Move 4xx PHY_MODE_XXX defines to asm-ppc/ibm_ocp.h.  This is a preparation
step for the new EMAC driver.

Signed-off-by: default avatarEugene Surovegin <ebs@ebshome.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7c31625a

arch/ppc/platforms/4xx/bamboo.c

+0 −7
Original line number Diff line number Diff line
@@ -52,13 +52,6 @@ 
#include <syslib/gen550.h>

#include <syslib/ibm440gx_common.h>



/*

 * This is a horrible kludge, we eventually need to abstract this

 * generic PHY stuff, so the  standard phy mode defines can be

 * easily used from arch code.

 */

#include "../../../../drivers/net/ibm_emac/ibm_emac_phy.h"



bd_t __res;



static struct ibm44x_clocks clocks __initdata;

arch/ppc/platforms/4xx/ebony.c

+0 −7
Original line number Diff line number Diff line
@@ -55,13 +55,6 @@ 
#include <syslib/gen550.h>

#include <syslib/ibm440gp_common.h>



/*

 * This is a horrible kludge, we eventually need to abstract this

 * generic PHY stuff, so the  standard phy mode defines can be

 * easily used from arch code.

 */

#include "../../../../drivers/net/ibm_emac/ibm_emac_phy.h"



bd_t __res;



static struct ibm44x_clocks clocks __initdata;

arch/ppc/platforms/4xx/luan.c

+0 −7
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ 
#include <syslib/ibm440gx_common.h>

#include <syslib/ibm440sp_common.h>



/*

 * This is a horrible kludge, we eventually need to abstract this

 * generic PHY stuff, so the  standard phy mode defines can be

 * easily used from arch code.

 */

#include "../../../../drivers/net/ibm_emac/ibm_emac_phy.h"



bd_t __res;



static struct ibm44x_clocks clocks __initdata;

arch/ppc/platforms/4xx/ocotea.c

+0 −7
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ 
#include <syslib/gen550.h>

#include <syslib/ibm440gx_common.h>



/*

 * This is a horrible kludge, we eventually need to abstract this

 * generic PHY stuff, so the  standard phy mode defines can be

 * easily used from arch code.

 */

#include "../../../../drivers/net/ibm_emac/ibm_emac_phy.h"



bd_t __res;



static struct ibm44x_clocks clocks __initdata;

include/asm-ppc/ibm_ocp.h

+13 −0
Original line number Diff line number Diff line
@@ -101,6 +101,19 @@ void ocp_show_emac_data(struct device *dev) \ 
	device_create_file(dev, &dev_attr_emac_phy_map);		\

}



/*

 * PHY mode settings (EMAC <-> ZMII/RGMII bridge <-> PHY)

 */

#define PHY_MODE_NA	0

#define PHY_MODE_MII	1

#define PHY_MODE_RMII	2

#define PHY_MODE_SMII	3

#define PHY_MODE_RGMII	4

#define PHY_MODE_TBI	5

#define PHY_MODE_GMII	6

#define PHY_MODE_RTBI	7

#define PHY_MODE_SGMII	8



#ifdef CONFIG_40x

/*

 * Helper function to copy MAC addresses from the bd_t to OCP EMAC