aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ppc44x/patches/100-taishan_emac.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-02-03 14:54:01 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-02-03 14:54:01 +0000
commit98236f47c8bf854c4350765de24df6392bf25cfb (patch)
tree5e092cc71b419ef4f41dc4222046d1478eed6ba1 /target/linux/ppc44x/patches/100-taishan_emac.patch
parent4f71fabba4e42becf7f5a072cce3df3190961600 (diff)
downloadupstream-98236f47c8bf854c4350765de24df6392bf25cfb.tar.gz
upstream-98236f47c8bf854c4350765de24df6392bf25cfb.tar.bz2
upstream-98236f47c8bf854c4350765de24df6392bf25cfb.zip
convert ppc44x to arch/powerpc, use squashfs images by default
SVN-Revision: 10372
Diffstat (limited to 'target/linux/ppc44x/patches/100-taishan_emac.patch')
-rw-r--r--target/linux/ppc44x/patches/100-taishan_emac.patch71
1 files changed, 0 insertions, 71 deletions
diff --git a/target/linux/ppc44x/patches/100-taishan_emac.patch b/target/linux/ppc44x/patches/100-taishan_emac.patch
deleted file mode 100644
index fde73b77b6..0000000000
--- a/target/linux/ppc44x/patches/100-taishan_emac.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Nur linux-2.6.21/drivers/net/ibm_emac/ibm_emac_phy.c linux-2.6.21-owrt/drivers/net/ibm_emac/ibm_emac_phy.c
---- linux-2.6.21/drivers/net/ibm_emac/ibm_emac_phy.c 2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21-owrt/drivers/net/ibm_emac/ibm_emac_phy.c 2007-05-28 16:27:15.000000000 +0200
-@@ -299,11 +299,50 @@
- .ops = &cis8201_phy_ops
- };
-
-+#if defined(CONFIG_TAISHAN)
-+static int et1011c_init(struct mii_phy *phy)
-+{
-+ u16 reg_short;
-+
-+ reg_short = (u16)(phy_read(phy,0x16));
-+ reg_short &= ~(0x7);
-+ reg_short |= 0x6; /* RGMII Trace Delay*/
-+ phy_write(phy, 0x16, reg_short);
-+
-+ reg_short = (u16)(phy_read(phy, 0x17));
-+ reg_short &= ~(0x40);
-+ phy_write(phy, 0x17, reg_short);
-+
-+ phy_write(phy,0x1c,0x74f0);
-+ return 0;
-+}
-+
-+static struct mii_phy_ops et1011c_phy_ops = {
-+ .init = et1011c_init,
-+ .setup_aneg = genmii_setup_aneg,
-+ .setup_forced = genmii_setup_forced,
-+ .poll_link = genmii_poll_link,
-+ .read_link = genmii_read_link
-+};
-+
-+static struct mii_phy_def et1011c_phy_def = {
-+ .phy_id = 0x0282f000,
-+ .phy_id_mask = 0x0fffff00,
-+ .name = "ET1011C Gigabit Ethernet",
-+ .ops = &et1011c_phy_ops
-+};
-+
-+static struct mii_phy_def *mii_phy_table[] = {
-+ &et1011c_phy_def,
-+ NULL
-+};
-+#else
- static struct mii_phy_def *mii_phy_table[] = {
- &cis8201_phy_def,
- &genmii_phy_def,
- NULL
- };
-+#endif
-
- int mii_phy_probe(struct mii_phy *phy, int address)
- {
-diff -Nur linux-2.6.21/drivers/net/ibm_emac/ibm_emac_zmii.c linux-2.6.21-owrt/drivers/net/ibm_emac/ibm_emac_zmii.c
---- linux-2.6.21/drivers/net/ibm_emac/ibm_emac_zmii.c 2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21-owrt/drivers/net/ibm_emac/ibm_emac_zmii.c 2007-05-28 16:26:48.000000000 +0200
-@@ -170,6 +170,13 @@
- struct ocp_func_emac_data *emacdata = dev->def->additions;
-
- if (emacdata->zmii_idx >= 0) {
-+#if defined(CONFIG_TAISHAN)
-+ /* don't attach emac0 and emac1 */
-+ if( dev->def->index < 2 )
-+ {
-+ return -ENODEV;
-+ }
-+#endif
- dev->zmii_input = emacdata->zmii_mux;
- dev->zmii_dev =
- ocp_find_device(OCP_VENDOR_IBM, OCP_FUNC_ZMII,