Diff
Modified: trunk/arch/blackfin/mach-bf518/boards/ezbrd.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf518/boards/ezbrd.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf518/boards/ezbrd.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -87,13 +87,53 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] = {
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_MII0_ETxD0,
+ P_MII0_ETxD1,
+ P_MII0_ETxD2,
+ P_MII0_ETxD3,
+ P_MII0_ETxEN,
+ P_MII0_TxCLK,
+ P_MII0_PHYINT,
+ P_MII0_COL,
+ P_MII0_ERxD0,
+ P_MII0_ERxD1,
+ P_MII0_ERxD2,
+ P_MII0_ERxD3,
+ P_MII0_ERxDV,
+ P_MII0_ERxCLK,
+ P_MII0_CRS,
+ P_MII0_MDC,
+ P_MII0_MDIO,
+ 0
+#else
+ P_MII0_ETxD0,
+ P_MII0_ETxD1,
+ P_MII0_ETxEN,
+ P_MII0_ERxD0,
+ P_MII0_ERxD1,
+ P_MII0_TxCLK,
+ P_MII0_PHYINT,
+ P_MII0_CRS,
+ P_MII0_MDC,
+ P_MII0_MDIO,
+ 0
+#endif
+};
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
Modified: trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -81,13 +81,25 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] =
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_RMII0;
+#else
+ P_MII0;
+#endif
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#endif
Modified: trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -273,13 +273,25 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] =
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_RMII0;
+#else
+ P_MII0;
+#endif
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#endif
Modified: trunk/arch/blackfin/mach-bf527/boards/ezbrd.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf527/boards/ezbrd.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf527/boards/ezbrd.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -190,13 +190,25 @@
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] =
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_RMII0;
+#else
+ P_MII0;
+#endif
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#endif
Modified: trunk/arch/blackfin/mach-bf527/boards/ezkit.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf527/boards/ezkit.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf527/boards/ezkit.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -362,13 +362,25 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] =
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_RMII0;
+#else
+ P_MII0;
+#endif
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#endif
Modified: trunk/arch/blackfin/mach-bf537/boards/cm_bf537e.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf537/boards/cm_bf537e.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf537/boards/cm_bf537e.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -597,13 +597,25 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] =
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_RMII0;
+#else
+ P_MII0;
+#endif
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#endif
Modified: trunk/arch/blackfin/mach-bf537/boards/cm_bf537u.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf537/boards/cm_bf537u.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf537/boards/cm_bf537u.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -562,13 +562,25 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] =
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_RMII0;
+#else
+ P_MII0;
+#endif
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#endif
Modified: trunk/arch/blackfin/mach-bf537/boards/minotaur.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf537/boards/minotaur.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf537/boards/minotaur.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -68,13 +68,25 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] =
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_RMII0;
+#else
+ P_MII0;
+#endif
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#endif
Modified: trunk/arch/blackfin/mach-bf537/boards/pnav10.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf537/boards/pnav10.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf537/boards/pnav10.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -99,13 +99,25 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] =
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_RMII0;
+#else
+ P_MII0;
+#endif
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#endif
Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf537/boards/stamp.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -327,13 +327,25 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] =
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_RMII0;
+#else
+ P_MII0;
+#endif
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#endif
Modified: trunk/arch/blackfin/mach-bf537/boards/tcm_bf537.c (8906 => 8907)
--- trunk/arch/blackfin/mach-bf537/boards/tcm_bf537.c 2010-06-11 10:44:22 UTC (rev 8906)
+++ trunk/arch/blackfin/mach-bf537/boards/tcm_bf537.c 2010-06-11 10:45:44 UTC (rev 8907)
@@ -564,13 +564,25 @@
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+unsigned short bfin_mac_peripherals[] =
+#if defined(CONFIG_BFIN_MAC_RMII)
+ P_RMII0;
+#else
+ P_MII0;
+#endif
+
static struct platform_device bfin_mii_bus = {
.name = "bfin_mii_bus",
+ .dev = {
+ .platform_data = &bfin_mac_peripherals,
+ }
};
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
- .dev.platform_data = &bfin_mii_bus,
+ .dev = {
+ .platform_data = &bfin_mii_bus,
+ }
};
#endif
