sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

macb: allow to pass the phy interface 

as we will add later the GMAC IP verion support (GEM)

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2013-01-28 23:27:27 +01:00 committed by Sascha Hauer
parent f0aa3cdf8d
commit f7e3126619
19 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boards/at91rm9200ek/init.c
View File

@ -33,7 +33,7 @@
#include <spi/spi.h>
static struct at91_ether_platform_data ether_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = 0,
};

2
arch/arm/boards/at91sam9260ek/init.c
View File

@ -127,7 +127,7 @@ static void ek_add_device_nand(void)
}
static struct at91_ether_platform_data macb_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = 0,
};

2
arch/arm/boards/at91sam9263ek/init.c
View File

@ -83,7 +83,7 @@ static void ek_add_device_nand(void)
}
static struct at91_ether_platform_data macb_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = 0,
};

2
arch/arm/boards/at91sam9m10g45ek/init.c
View File

@ -106,7 +106,7 @@ static void ek_add_device_nand(void)
}
static struct at91_ether_platform_data macb_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = 0,
};

2
arch/arm/boards/at91sam9m10ihd/init.c
View File

@ -80,7 +80,7 @@ static void ek_add_device_nand(void)
}
static struct at91_ether_platform_data macb_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = 0,
};

2
arch/arm/boards/at91sam9x5ek/init.c
View File

@ -106,7 +106,7 @@ static void ek_add_device_nand(void)
}
static struct at91_ether_platform_data macb_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = 0,
};

2
arch/arm/boards/pm9263/init.c
View File

@ -89,7 +89,7 @@ static void pm_add_device_nand(void)
}
static struct at91_ether_platform_data macb_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = 0,
};

2
arch/arm/boards/pm9g45/init.c
View File

@ -113,7 +113,7 @@ static void __init pm9g45_add_device_usbh(void) {}
#endif
static struct at91_ether_platform_data macb_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = 0,
};

2
arch/arm/boards/qil-a9260/init.c
View File

@ -78,7 +78,7 @@ static void qil_a9260_add_device_mci(void) {}
#ifdef CONFIG_CALAO_MB_QIL_A9260
static struct at91_ether_platform_data macb_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = -1,
};

2
arch/arm/boards/tny-a926x/init.c
View File

@ -113,7 +113,7 @@ static void tny_a9260_add_device_nand(void)
#ifdef CONFIG_DRIVER_NET_MACB
static struct at91_ether_platform_data macb_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = -1,
};

2
arch/arm/boards/usb-a926x/init.c
View File

@ -113,7 +113,7 @@ static void usb_a9260_add_device_nand(void)
}
static struct at91_ether_platform_data macb_pdata = {
.is_rmii = 1,
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = -1,
};

2
arch/arm/mach-at91/at91rm9200_devices.c
View File

@ -103,7 +103,7 @@ void __init at91_add_device_eth(int id, struct at91_ether_platform_data *data)
at91_set_A_periph(AT91_PIN_PA8, 0); /* ETXEN */
at91_set_A_periph(AT91_PIN_PA7, 0); /* ETXCK_EREFCK */
if (!data->is_rmii) {
if (data->phy_interface != PHY_INTERFACE_MODE_RMII) {
at91_set_B_periph(AT91_PIN_PB19, 0); /* ERXCK */
at91_set_B_periph(AT91_PIN_PB18, 0); /* ECOL */
at91_set_B_periph(AT91_PIN_PB17, 0); /* ERXDV */

2
arch/arm/mach-at91/at91sam9260_devices.c
View File

@ -98,7 +98,7 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data)
at91_set_A_periph(AT91_PIN_PA21, 0); /* EMDIO */
at91_set_A_periph(AT91_PIN_PA20, 0); /* EMDC */
if (!data->is_rmii) {
if (data->phy_interface != PHY_INTERFACE_MODE_RMII) {
at91_set_B_periph(AT91_PIN_PA28, 0); /* ECRS */
at91_set_B_periph(AT91_PIN_PA29, 0); /* ECOL */
at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */

2
arch/arm/mach-at91/at91sam9263_devices.c
View File

@ -97,7 +97,7 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data)
at91_set_A_periph(AT91_PIN_PE30, 0); /* EMDIO */
at91_set_A_periph(AT91_PIN_PE29, 0); /* EMDC */
if (!data->is_rmii) {
if (data->phy_interface != PHY_INTERFACE_MODE_RMII) {
at91_set_A_periph(AT91_PIN_PE22, 0); /* ECRS */
at91_set_B_periph(AT91_PIN_PC26, 0); /* ECOL */
at91_set_B_periph(AT91_PIN_PC22, 0); /* ERX2 */

2
arch/arm/mach-at91/at91sam9g45_devices.c
View File

@ -99,7 +99,7 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data)
at91_set_A_periph(AT91_PIN_PA19, 0); /* EMDIO */
at91_set_A_periph(AT91_PIN_PA18, 0); /* EMDC */
if (!data->is_rmii) {
if (data->phy_interface != PHY_INTERFACE_MODE_RMII) {
at91_set_B_periph(AT91_PIN_PA29, 0); /* ECRS */
at91_set_B_periph(AT91_PIN_PA30, 0); /* ECOL */
at91_set_B_periph(AT91_PIN_PA8, 0); /* ERX2 */

4
arch/arm/mach-at91/at91sam9x5_devices.c
View File

@ -111,7 +111,7 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data)
at91_set_A_periph(AT91_PIN_PB5, 0); /* EMDIO */
at91_set_A_periph(AT91_PIN_PB6, 0); /* EMDC */
if (!data->is_rmii) {
if (data->phy_interface != PHY_INTERFACE_MODE_RMII) {
at91_set_A_periph(AT91_PIN_PB16, 0); /* ECRS */
at91_set_A_periph(AT91_PIN_PB17, 0); /* ECOL */
at91_set_A_periph(AT91_PIN_PB13, 0); /* ERX2 */
@ -124,7 +124,7 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data)
break;
case 1:
start = AT91SAM9X5_BASE_EMAC1;
if (!data->is_rmii)
if (data->phy_interface != PHY_INTERFACE_MODE_RMII)
pr_warn("AT91: Only RMII available on interface macb%d.\n", id);
/* Pins used for RMII */

3
arch/arm/mach-at91/include/mach/board.h
View File

@ -26,6 +26,7 @@
#include <linux/mtd/mtd.h>
#include <fb.h>
#include <video/atmel_lcdc.h>
#include <linux/phy.h>
/* USB Host */
struct at91_usbh_data {
@ -74,7 +75,7 @@ struct at91_ether_platform_data {
unsigned int phy_flags;
unsigned int flags;
int phy_addr;
int is_rmii;
phy_interface_t phy_interface;
int (*get_ethaddr)(struct eth_device*, unsigned char *adr);
};

2
drivers/net/at91_ether.c
View File

@ -342,7 +342,7 @@ static int at91_ether_probe(struct device_d *dev)
mac_cfg |= AT91_EMAC_CLK_DIV32 | AT91_EMAC_BIG;
if (pdata->is_rmii) {
if (pdata->phy_interface == PHY_INTERFACE_MODE_RMII) {
ether_dev->interface = PHY_INTERFACE_MODE_RGMII;
mac_cfg |= AT91_EMAC_RMII;
} else {

6
drivers/net/macb.c
View File

@ -436,10 +436,10 @@ static int macb_probe(struct device_d *dev)
macb->miibus.priv = macb;
macb->miibus.parent = dev;
if (pdata->is_rmii)
macb->interface = PHY_INTERFACE_MODE_RMII;
else
if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
macb->interface = PHY_INTERFACE_MODE_MII;
else
macb->interface = pdata->phy_interface;
macb->phy_flags = pdata->phy_flags;