New MIIPHYBB implementation with multi-bus support
Subsystems (2)
v5 cover New MIIPHYBB implementation with multi-bus support
This patch rewrites the miiphybb ( Bit-banged MII bus driver ) in order to support an arbitrary number of mii buses. This feature is useful when your board uses different mii buses for different phys and all (or a part) of these buses are implemented via bit-banging mode.
The driver requires that the following macros should be defined into the board configuration file:
CONFIG_BITBANGMII - Enable the miiphybb driverCONFIG_BITBANGMII_MULTI - Enable the multi bus support
If the CONFIG_BITBANGMII_MULTI is not defined, the board's config file needs to define at least the following macros:
MII_INIT - Generic code to enable the MII bus (optional) MDIO_DECLARE - Declaration needed to access to the MDIO pin (optional) MDIO_ACTIVE - Activate the MDIO pin as out pin MDIO_TRISTATE - Activate the MDIO pin as input/tristate pin MDIO_READ - Read the MDIO pin MDIO(v) - Write v on the MDIO pin MDC_DECLARE - Declaration needed to access to the MDC pin (optional) MDC(v) - Write v on the MDC pin
The previous macros make the driver compatible with the previous version (that didn't support the multi-bus).
When the CONFIG_BITBANGMII_MULTI is also defined, the board code needs to fill the bb_miiphy_buses[] array with a record for each required bus and declare the bb_miiphy_buses_num variable with the number of mii buses. The record (struct bb_miiphy_bus) has the following fields/callbacks (see miiphy.h for details):
char name[] - The symbolic name that must be equal to the MII bus
registered name
int (*init)() - Initialization function called at startup time (just
before the Ethernet initialization)
int (*mdio_active)() - Activate the MDIO pin as output
int (*mdio_tristate)() - Activate the MDIO pin as input/tristate pin
int (*set_mdio)() - Write the MDIO pin int (*get_mdio)() - Read the MDIO pin int (*set_mdc)() - Write the MDC pin int (*delay)() - Delay function void *priv - Private data used by board specific code
The board code will look like:
struct bb_miiphy_bus bb_miiphy_buses[] = {
{ .name = "miibus#1", .init = b1_init, .mdio_active = b1_mdio_active, ... }, { .name = "miibus#2", .init = b2_init, .mdio_active = b2_mdio_active, ... },
...
};
int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
sizeof(bb_miiphy_buses[0]);
Patch Changelog:
v1 -- First (broken) release
v2 -- Fix some typos and disable callbacks pointers relacation (if
CONFIG_RELOC_FIXUP_WORKS is not defined)
v3 -- Do not relocate NULL pointers
v4 -- Code Cleanup.
v5 -- Fix typos and cleanup config files
Luigi 'Comio' Mantellini (3):
This patch rewrites the miiphybb ( Bit-banged MII bus driver ) in
order to support an arbitrary number of mii buses. This feature is useful when your board uses different mii buses for different phys and all (or a part) of these buses are implemented via bit-banging mode.
Add bb_miiphy_init call before any ethernet bring-up code. Update all board to support new bbmiiphy driver (with multibus
support)
doc/README.bitbangMII | 56 +++++++ drivers/net/phy/miiphybb.c | 346 +++++++++++++++++++++++++++++------------- include/configs/ISPAN.h | 4 + include/configs/MPC8260ADS.h | 3 + include/configs/MPC8266ADS.h | 4 + include/configs/MPC8560ADS.h | 4 + include/configs/Rattler.h | 4 + include/configs/SBC8540.h | 4 + include/configs/TQM8272.h | 3 + include/configs/VoVPN-GW.h | 5 + include/configs/ZPC1900.h | 4 + include/configs/ep8248.h | 1 + include/configs/ep82xxm.h | 1 + include/configs/gw8260.h | 5 + include/configs/hymod.h | 12 ++ include/configs/muas3001.h | 4 + include/configs/ppmc8260.h | 4 + include/configs/sacsng.h | 4 + include/configs/sbc8260.h | 4 + include/configs/sbc8560.h | 4 + include/miiphy.h | 25 +++- lib_arm/board.c | 7 + lib_avr32/board.c | 7 + lib_blackfin/board.c | 7 + lib_i386/board.c | 9 +- lib_m68k/board.c | 7 + lib_mips/board.c | 7 + lib_ppc/board.c | 7 + lib_sh/board.c | 7 + lib_sparc/board.c | 7 + 30 files changed, 460 insertions(+), 106 deletions(-) create mode 100644 doc/README.bitbangMII
PATCH v5 1/3 Rewrite the miiphybb (Bit-banged MII bus driver) in order to support an arbitrary number of mii buses.
This feature is useful when your board uses different mii buses for different phys and all (or a part) of these buses are implemented via bit-banging mode.
The driver requires that the following macros should be defined into the board configuration file:
CONFIG_BITBANGMII - Enable the miiphybb driverCONFIG_BITBANGMII_MULTI - Enable the multi bus support
If the CONFIG_BITBANGMII_MULTI is not defined, the board's config file needs to define at least the following macros:
MII_INIT - Generic code to enable the MII bus (optional) MDIO_DECLARE - Declaration needed to access to the MDIO pin (optional) MDIO_ACTIVE - Activate the MDIO pin as out pin MDIO_TRISTATE - Activate the MDIO pin as input/tristate pin MDIO_READ - Read the MDIO pin MDIO(v) - Write v on the MDIO pin MDC_DECLARE - Declaration needed to access to the MDC pin (optional) MDC(v) - Write v on the MDC pin
The previous macros make the driver compatible with the previous version (that didn't support the multi-bus).
When the CONFIG_BITBANGMII_MULTI is also defined, the board code needs to fill the bb_miiphy_buses[] array with a record for each required bus and declare the bb_miiphy_buses_num variable with the number of mii buses. The record (struct bb_miiphy_bus) has the following fields/callbacks (see miiphy.h for details):
char name[] - The symbolic name that must be equal to the MII bus
registered name
int (*init)() - Initialization function called at startup time (just
before the Ethernet initialization)
int (*mdio_active)() - Activate the MDIO pin as output
int (*mdio_tristate)() - Activate the MDIO pin as input/tristate pin
int (*set_mdio)() - Write the MDIO pin int (*get_mdio)() - Read the MDIO pin int (*set_mdc)() - Write the MDC pin int (*delay)() - Delay function void *priv - Private data used by board specific code
The board code will look like:
struct bb_miiphy_bus bb_miiphy_buses[] = {
{ .name = miibus#1, .init = b1_init, .mdio_active = b1_mdio_active, ... }, { .name = miibus#2, .init = b2_init, .mdio_active = b2_mdio_active, ... },
...
int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
sizeof(bb_miiphy_buses[0]);
--- doc/README.bitbangMII | 56 +++++++ drivers/net/phy/miiphybb.c | 346 +++++++++++++++++++++++++++++++------------- include/miiphy.h | 25 +++- 3 files changed, 322 insertions(+), 105 deletions(-) create mode 100644 doc/README.bitbangMII
doc/README.bitbangMII new file +56 -0
@@ -0,0 +1,56 @@ +This patch rewrites the miiphybb ( Bit-banged MII bus driver ) in order to +support an arbitrary number of mii buses. This feature is useful when your +board uses different mii buses for different phys and all (or a part) of these +buses are implemented via bit-banging mode. + +The driver requires that the following macros should be defined into the board +configuration file: + +CONFIG_BITBANGMII - Enable the miiphybb driver +CONFIG_BITBANGMII_MULTI - Enable the multi bus support + +If the CONFIG_BITBANGMII_MULTI is not defined, the board's config file needs +to define at least the following macros: + +MII_INIT - Generic code to enable the MII bus (optional) +MDIO_DECLARE - Declaration needed to access to the MDIO pin (optional) +MDIO_ACTIVE - Activate the MDIO pin as out pin +MDIO_TRISTATE - Activate the MDIO pin as input/tristate pin +MDIO_READ - Read the MDIO pin +MDIO(v) - Write v on the MDIO pin +MDC_DECLARE - Declaration needed to access to the MDC pin (optional) +MDC(v) - Write v on the MDC pin + +The previous macros make the driver compatible with the previous version +(that didn't support the multi-bus). + +When the CONFIG_BITBANGMII_MULTI is also defined, the board code needs to fill +the bb_miiphy_buses[] array with a record for each required bus and declare +the bb_miiphy_buses_num variable with the number of mii buses. +The record (struct bb_miiphy_bus) has the following fields/callbacks (see +miiphy.h for details): + +char name[] - The symbolic name that must be equal to the MII bus + registered name +int (*init)() - Initialization function called at startup time (just + before the Ethernet initialization) +int (*mdio_active)() - Activate the MDIO pin as output +int (*mdio_tristate)() - Activate the MDIO pin as input/tristate pin +int (*set_mdio)() - Write the MDIO pin +int (*get_mdio)() - Read the MDIO pin +int (*set_mdc)() - Write the MDC pin +int (*delay)() - Delay function +void *priv - Private data used by board specific code + +The board code will look like: + +struct bb_miiphy_bus bb_miiphy_buses[] = { + { .name = "miibus#1", .init = b1_init, .mdio_active = b1_mdio_active, ... }, + { .name = "miibus#2", .init = b2_init, .mdio_active = b2_mdio_active, ... }, + ... +}; +int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) / + sizeof(bb_miiphy_buses[0]); + +2009 Industrie Dial Face S.p.A. + Luigi 'Comio' Mantellini <[email protected]>
drivers/net/phy/miiphybb.c +242 -104
444 lines not on this page · raw message
include/miiphy.h +24 -1
@@ -19,6 +19,8 @@| | COPYRIGHT I B M CORPORATION 1999 | LICENSED MATERIAL - PROGRAM PROPERTY OF I B M +| +| Additions (C) Copyright 2009 Industrie Dial Face S.p.A. +----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------+ |
@@ -61,12 +63,33 @@ char *miiphy_get_current_dev (void);void miiphy_listdev (void ); -#define BB_MII_DEVNAME "bbmii" +#ifdef CONFIG_BITBANGMII + +#define BB_MII_DEVNAME "bb_miiphy" + +struct bb_miiphy_bus { +char name[NAMESIZE ]; +int (*init)(struct bb_miiphy_bus *bus); +int (*mdio_active)(struct bb_miiphy_bus *bus); +int (*mdio_tristate)(struct bb_miiphy_bus *bus); +int (*set_mdio)(struct bb_miiphy_bus *bus,int v); +int (*get_mdio)(struct bb_miiphy_bus *bus,int *v); +int (*set_mdc)(struct bb_miiphy_bus *bus,int v); +int (*delay)(struct bb_miiphy_bus *bus); +#ifdef CONFIG_BITBANGMII_MULTI +void *priv; +#endif +}; + +extern struct bb_miiphy_bus bb_miiphy_buses[]; +extern int bb_miiphy_buses_num; +void bb_miiphy_init (void );int bb_miiphy_read (char *devname,unsigned char addr,unsigned char reg,unsigned short *value);int bb_miiphy_write (char *devname,unsigned char addr,unsigned char reg,unsigned short value); +#endif /* phy seed setup */ #define AUTO 99
Signature · 1 line
1.6.3.3
PATCH v5 2/3 Add bb_miiphy_init call before any ethernet bring-up code.
--- lib_arm/board.c | 7 +++++++ lib_avr32/board.c | 7 +++++++ lib_blackfin/board.c | 7 +++++++ lib_i386/board.c | 9 ++++++++- lib_m68k/board.c | 7 +++++++ lib_mips/board.c | 7 +++++++ lib_ppc/board.c | 7 +++++++ lib_sh/board.c | 7 +++++++ lib_sparc/board.c | 7 +++++++ 9 files changed, 64 insertions(+), 1 deletions(-)
lib_arm/board.c +7 -0
@@ -50,6 +50,10 @@#include <onenand_uboot.h> #include <mmc.h> +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif +#ifdef CONFIG_DRIVER_SMC91111 #include "../drivers/net/smc91111.h" #endif
@@ -417,6 +421,9 @@ extern void davinci_eth_set_mac_addr (const u_int8_t *addr);mmc_initialize (gd->bd);#endif +#ifdef CONFIG_BITBANGMII +bb_miiphy_init (); +#endif #if defined(CONFIG_CMD_NET )#if defined(CONFIG_NET_MULTI )puts ("Net: " );
lib_avr32/board.c +7 -0
@@ -27,6 +27,10 @@#include <version.h> #include <net.h> +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif +#include <asm/initcalls.h> #include <asm/sections.h>
@@ -337,6 +341,9 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)if (s) load_addr =simple_strtoul (s,NULL ,16 ); +#ifdef CONFIG_BITBANGMII +bb_miiphy_init (); +#endif #if defined(CONFIG_CMD_NET ) s =getenv ("bootfile" );if (s)
lib_blackfin/board.c +7 -0
@@ -26,6 +26,10 @@#include <nand.h> /* cannot even include nand.h if it isnt configured */ #endif +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif +#if defined(CONFIG_POST )#include <post.h> int post_flag;
@@ -270,6 +274,9 @@ void board_init_f(ulong bootflag)static void board_net_init_r (bd_t *bd) { +#ifdef CONFIG_BITBANGMII +bb_miiphy_init (); +#endif #ifdef CONFIG_CMD_NET uchar enetaddr[6 ];char *s;
lib_i386/board.c +8 -1
@@ -1,6 +1,6 @@/* * (C) Copyright 2002 -* Daniel Engstr?m, Omicron Ceti AB, daniel at omicron.se +* Daniel Engstr???m, Omicron Ceti AB, daniel at omicron.se * * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
@@ -39,6 +39,10 @@#include <ide.h> #include <asm/u-boot-i386.h> +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif +DECLARE_GLOBAL_DATA_PTR ;extern long _i386boot_start;
@@ -351,6 +355,9 @@ void start_i386boot (void)doc_init ();#endif +#ifdef CONFIG_BITBANGMII +bb_miiphy_init (); +#endif #if defined(CONFIG_CMD_NET )#if defined(CONFIG_NET_MULTI )WATCHDOG_RESET ();
lib_m68k/board.c +7 -0
@@ -63,6 +63,10 @@#include <spi.h> #endif +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif +#include <nand.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -630,6 +634,9 @@ void board_init_r (gd_t *id, ulong dest_addr)nand_init ();/* go init the NAND */ #endif +#ifdef CONFIG_BITBANGMII +bb_miiphy_init (); +#endif #if defined(CONFIG_CMD_NET )WATCHDOG_RESET ();#if defined(FEC_ENET )
lib_mips/board.c +7 -0
@@ -33,6 +33,10 @@#include <onenand_uboot.h> #include <spi.h> +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif +DECLARE_GLOBAL_DATA_PTR ; #if ( ((CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) < CONFIG_SYS_MONITOR_BASE) || \
@@ -407,6 +411,9 @@ void board_init_r (gd_t *id, ulong dest_addr)misc_init_r ();#endif +#ifdef CONFIG_BITBANGMII +bb_miiphy_init (); +#endif #if defined(CONFIG_CMD_NET )#if defined(CONFIG_NET_MULTI )puts ("Net: " );
lib_ppc/board.c +7 -0
@@ -83,6 +83,10 @@#include <asm/mp.h> #endif +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif +#ifdef CONFIG_SYS_UPDATE_FLASH_SIZE extern int update_flash_size (int flash_size);#endif
@@ -942,6 +946,9 @@ void board_init_r (gd_t *id, ulong dest_addr)doc_init ();#endif +#ifdef CONFIG_BITBANGMII +bb_miiphy_init (); +#endif #if defined(CONFIG_CMD_NET )#if defined(CONFIG_NET_MULTI )WATCHDOG_RESET ();
lib_sh/board.c +7 -0
@@ -28,6 +28,10 @@#include <net.h> #include <environment.h> +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif +extern void malloc_bin_reloc (void );extern int cpu_init (void );extern int board_init (void );
@@ -178,6 +182,9 @@ void sh_generic_init(void)#endif /* CONFIG_WATCHDOG*/ +#ifdef CONFIG_BITBANGMII +bb_miiphy_init (); +#endif #if defined(CONFIG_CMD_NET ) {char *s;
lib_sparc/board.c +7 -0
@@ -49,6 +49,10 @@#include <ambapp.h> #endif +#ifdef CONFIG_BITBANGMII +#include <miiphy.h> +#endif +DECLARE_GLOBAL_DATA_PTR ;/* Debug options
@@ -405,6 +409,9 @@ void board_init_f(ulong bootflag)doc_init ();#endif +#ifdef CONFIG_BITBANGMII +bb_miiphy_init (); +#endif #if defined(CONFIG_CMD_NET )#if defined(CONFIG_NET_MULTI )WATCHDOG_RESET ();
Signature · 1 line
1.6.3.3
PATCH v5 3/3 Update all board to support new bbmiiphy driver (with multibus support)
--- include/configs/ISPAN.h | 4 ++++ include/configs/MPC8260ADS.h | 3 +++ include/configs/MPC8266ADS.h | 4 ++++ include/configs/MPC8560ADS.h | 4 ++++ include/configs/Rattler.h | 4 ++++ include/configs/SBC8540.h | 4 ++++ include/configs/TQM8272.h | 3 +++ include/configs/VoVPN-GW.h | 5 +++++ include/configs/ZPC1900.h | 4 ++++ include/configs/ep8248.h | 1 + include/configs/ep82xxm.h | 1 + include/configs/gw8260.h | 5 +++++ include/configs/hymod.h | 12 ++++++++++++ include/configs/muas3001.h | 4 ++++ include/configs/ppmc8260.h | 4 ++++ include/configs/sacsng.h | 4 ++++ include/configs/sbc8260.h | 4 ++++ include/configs/sbc8560.h | 4 ++++ 18 files changed, 74 insertions(+), 0 deletions(-)
include/configs/ISPAN.h +4 -0
@@ -84,6 +84,10 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 3/* Port D */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define CONFIG_SYS_MDIO_PIN 0x00040000/* PD13 */ #define CONFIG_SYS_MDC_PIN 0x00080000/* PD12 */
include/configs/MPC8260ADS.h +3 -0
@@ -150,6 +150,9 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 2/* Port C */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE#if CONFIG_ADSTYPE ==CONFIG_SYS_8272ADS #define CONFIG_SYS_MDIO_PIN 0x00002000/* PC18 */
include/configs/MPC8266ADS.h +4 -0
@@ -96,6 +96,10 @@* Port pins used for bit-banged MII communictions (if applicable). */ #define MDIO_PORT 2/* Port C */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define MDIO_ACTIVE (iop->pdir |= 0x00400000)#define MDIO_TRISTATE (iop->pdir &= ~0x00400000)#define MDIO_READ ((iop->pdat & 0x00400000) != 0)
include/configs/MPC8560ADS.h +4 -0
@@ -363,6 +363,10 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 2/* Port C */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define MDIO_ACTIVE (iop->pdir |= 0x00400000)#define MDIO_TRISTATE (iop->pdir &= ~0x00400000)#define MDIO_READ ((iop->pdat & 0x00400000) != 0)
include/configs/Rattler.h +4 -0
@@ -103,6 +103,10 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 2/* Port C */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define MDIO_ACTIVE (iop->pdir |= 0x00400000)#define MDIO_TRISTATE (iop->pdir &= ~0x00400000)#define MDIO_READ ((iop->pdat & 0x00400000) != 0)
include/configs/SBC8540.h +4 -0
@@ -290,6 +290,10 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 2/* Port C */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define MDIO_ACTIVE (iop->pdir |= 0x00400000)#define MDIO_TRISTATE (iop->pdir &= ~0x00400000)#define MDIO_READ ((iop->pdat & 0x00400000) != 0)
include/configs/TQM8272.h +3 -0
@@ -219,6 +219,9 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 2/* Port C */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE#if STK82xx_150#define CONFIG_SYS_MDIO_PIN 0x00008000/* PC16 */
include/configs/VoVPN-GW.h +5 -0
@@ -124,6 +124,11 @@#define CONFIG_BITBANGMII #define MDIO_PORT 1/* Port B */ + +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define CONFIG_SYS_MDIO_PIN 0x00002000/* PB18 */ #define CONFIG_SYS_MDC_PIN 0x00001000/* PB19 */ #define MDIO_ACTIVE (iop->pdir |= CONFIG_SYS_MDIO_PIN)
include/configs/ZPC1900.h +4 -0
@@ -86,6 +86,10 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 2/* Port C */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define MDIO_ACTIVE (iop->pdir |= 0x00400000)#define MDIO_TRISTATE (iop->pdir &= ~0x00400000)#define MDIO_READ ((iop->pdat & 0x00400000) != 0)
include/configs/ep8248.h +1 -0
@@ -92,6 +92,7 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 0/* Not used - implemented in BCSR */ +#define MDIO_ACTIVE (*(vu_char *)(CONFIG_SYS_BCSR + 8) &= 0xFB)#define MDIO_TRISTATE (*(vu_char *)(CONFIG_SYS_BCSR + 8) |= 0x04)#define MDIO_READ (*(vu_char *)(CONFIG_SYS_BCSR + 8) & 1)
include/configs/ep82xxm.h +1 -0
@@ -85,6 +85,7 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 0/* Not used - implemented in BCSR */ +#define MDIO_ACTIVE (*(vu_char *)(CONFIG_SYS_BCSR + 8) &= 0xFB)#define MDIO_TRISTATE (*(vu_char *)(CONFIG_SYS_BCSR + 8) |= 0x04)#define MDIO_READ (*(vu_char *)(CONFIG_SYS_BCSR + 8) & 1)
include/configs/gw8260.h +5 -0
@@ -212,6 +212,11 @@* Port pins used for bit-banged MII communictions (if applicable). */ #define MDIO_PORT 2/* Port C */ + +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define MDIO_ACTIVE (iop->pdir |= 0x00400000)#define MDIO_TRISTATE (iop->pdir &= ~0x00400000)#define MDIO_READ ((iop->pdat & 0x00400000) != 0)
include/configs/hymod.h +12 -0
@@ -93,6 +93,10 @@# define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE|FCC_PSMR_LPB)# define MDIO_PORT 0/* Port A */ +# define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +# define MDC_DECLARE MDIO_DECLARE +# define MDIO_DATA_PINMASK 0x00040000/* Pin 13 */ # define MDIO_CLCK_PINMASK 0x00080000/* Pin 12 */
@@ -110,6 +114,10 @@# define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE|FCC_PSMR_LPB)# define MDIO_PORT 0/* Port A */ +# define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +# define MDC_DECLARE MDIO_DECLARE +# define MDIO_DATA_PINMASK 0x00000040/* Pin 25 */ # define MDIO_CLCK_PINMASK 0x00000080/* Pin 24 */
@@ -127,6 +135,10 @@# define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE|FCC_PSMR_LPB)# define MDIO_PORT 0/* Port A */ +# define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +# define MDC_DECLARE MDIO_DECLARE +# define MDIO_DATA_PINMASK 0x00000100/* Pin 23 */ # define MDIO_CLCK_PINMASK 0x00000200/* Pin 22 */
include/configs/muas3001.h +4 -0
@@ -101,6 +101,10 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 0/* Port A */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define CONFIG_SYS_MDIO_PIN 0x00200000/* PA10 */ #define CONFIG_SYS_MDC_PIN 0x00400000/* PA9 */
include/configs/ppmc8260.h +4 -0
@@ -182,6 +182,10 @@* Port pins used for bit-banged MII communictions (if applicable). */ #define MDIO_PORT 2/* Port C */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define MDIO_ACTIVE (iop->pdir |= 0x00400000)#define MDIO_TRISTATE (iop->pdir &= ~0x00400000)#define MDIO_READ ((iop->pdat & 0x00400000) != 0)
include/configs/sacsng.h +4 -0
@@ -179,6 +179,10 @@*/ #define MDIO_PORT 2/* Port A=0, B=1, C=2, D=3 */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define MDIO_ACTIVE (iop->pdir |= 0x40000000)#define MDIO_TRISTATE (iop->pdir &= ~0x40000000)#define MDIO_READ ((iop->pdat & 0x40000000) != 0)
include/configs/sbc8260.h +4 -0
@@ -201,6 +201,10 @@* Port pins used for bit-banged MII communictions (if applicable). */ #define MDIO_PORT 2/* Port C */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define MDIO_ACTIVE (iop->pdir |= 0x00400000)#define MDIO_TRISTATE (iop->pdir &= ~0x00400000)#define MDIO_READ ((iop->pdat & 0x00400000) != 0)
include/configs/sbc8560.h +4 -0
@@ -293,6 +293,10 @@* GPIO pins used for bit-banged MII communications */ #define MDIO_PORT 2/* Port C */ +#define MDIO_DECLARE volatile ioport_t *iop = ioport_addr ( \ + (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT ) +#define MDC_DECLARE MDIO_DECLARE +#define MDIO_ACTIVE (iop->pdir |= 0x00400000)#define MDIO_TRISTATE (iop->pdir &= ~0x00400000)#define MDIO_READ ((iop->pdat & 0x00400000) != 0)
Signature · 1 line
1.6.3.3
PATCH 1/1 drivers/net/phy/miiphybb.c: fix warning: no newline at end of file
In reply to Luigi 'Comio' MantelliniAdd missing newline.
--- drivers/net/phy/miiphybb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/phy/miiphybb.c +1 -1
@@ -377,4 +377,4 @@ int bb_miiphy_write (char *devname, unsigned char addr, bus->delay (bus);return 0 ; -} +}
Signature · 1 line
1.6.2.5
Wolfgang Denk
AppliedPATCH 1/1 drivers/net/phy/miiphybb.c: fix warning: no newline at end of file
Quoted 8 lines · In message <[email protected]> you wrote:
Add missing newline.
Signed-off-by Wolfgang Denk <[email protected]>Cc Luigi Mantellini <[email protected]>Cc Ben Warren <[email protected]>--- drivers/net/phy/miiphybb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Applied.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de core error - bus dumped
v5 cover New MIIPHYBB implementation with multi-bus support
In reply to Luigi 'Comio' Mantellinimy log:
comio at cartesio:/mnt/devel/olt-ppc/u-boot$ ./MAKEALL ISPAN MPC8260ADS MPC8266ADS MPC8560ADS Rattler sbc8540 VoVPN-GW_66MHz TQM8272 ZPC1900 ep8248 gw8260 hymod muas3001 ppmc8260 sacsng sbc8260 sbc8560 Configuring for ISPAN board...
text data bss dec hex filename
185851 15940 19408 221199 3600f ./u-boot
Configuring for MPC8260ADS board...
text data bss dec hex filename
236811 19392 19908 276111 4368f ./u-boot
Configuring for MPC8266ADS board...
text data bss dec hex filename
175438 13276 18716 207430 32a46 ./u-boot
Configuring for MPC8560ADS board...
text data bss dec hex filename
221767 18252 21816 261835 3fecb ./u-boot
Configuring for Rattler board...
text data bss dec hex filename
199098 16308 19988 235394 39782 ./u-boot
Configuring for SBC8540 board...
text data bss dec hex filename
163639 16596 15200 195435 2fb6b ./u-boot
Configuring for VoVPN-GW board...
text data bss dec hex filename
128655 10924 16328 155907 26103 ./u-boot
Configuring for TQM8272 board...
text data bss dec hex filename
229866 17488 39704 287058 46152 ./u-boot
Configuring for ZPC1900 board...
text data bss dec hex filename
185325 15824 19076 220225 35c41 ./u-boot
Configuring for ep8248 board...
text data bss dec hex filename
214490 16864 21032 252386 3d9e2 ./u-boot
Configuring for gw8260 board...
text data bss dec hex filename
173538 27724 19084 220346 35cba ./u-boot
Configuring for hymod board...
text data bss dec hex filename
211190 279633 248332 739155 b4753 ./u-boot
Configuring for muas3001 board...
text data bss dec hex filename
197672 15280 22296 235248 396f0 ./u-boot
Configuring for ppmc8260 board...
text data bss dec hex filename
158128 12540 18968 189636 2e4c4 ./u-boot
Configuring for sacsng board...
text data bss dec hex filename
197251 18804 19140 235195 396bb ./u-boot
Configuring for sbc8260 board...
text data bss dec hex filename
160776 13120 18368 192264 2ef08 ./u-boot
Configuring for sbc8560 board...
text data bss dec hex filename
189590 18092 16232 223914 36aaa ./u-boot
--------------------- SUMMARY ---------------------------- Boards compiled: 17
----------------------------------------------------------
Signature · 10 lines
Luigi 'Comio' Mantellini R&D - Software Industrie Dial Face S.p.A. Via Canzo, 4 20068 Peschiera Borromeo (MI), Italy Tel.: +39 02 5167 2813 Fax: +39 02 5167 2459 web: www.idf-hit.com mail: luigi.mantellini at idf-hit.com
v5 cover New MIIPHYBB implementation with multi-bus support
In reply to Luigi 'Comio' MantelliniHi Luigi,
Quoted 5 lines · Luigi 'Comio' Mantellini
This patch rewrites the miiphybb ( Bit-banged MII bus driver ) in order to support an arbitrary number of mii buses. This feature is useful when your board uses different mii buses for different phys and all (or a part) of these buses are implemented via bit-banging mode.
<snip>
All 3 patches applied to net repo. Thanks for all your hard work!
regards,
Ben