Date:2010-08-19 16:56:16 (13 years 7 months ago)
Author:florian
Commit:9b3461e885fe4434568d804f42b41dea6557beea
Message:[ar7] remove fixed phy support, enable most ar7 switch drivers.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22727 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: target/linux/ar7/config-2.6.32 (8 diffs)
target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch (1 diff)

Change Details

target/linux/ar7/config-2.6.32
11CONFIG_32BIT=y
22# CONFIG_64BIT is not set
3CONFIG_ADM6996_PHY=y
34# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
5CONFIG_AR7=y
46CONFIG_AR7_GPIO=y
57CONFIG_AR7_WDT=y
6CONFIG_AR7=y
78# CONFIG_ARCH_HAS_ILOG2_U32 is not set
89# CONFIG_ARCH_HAS_ILOG2_U64 is not set
910CONFIG_ARCH_HIBERNATION_POSSIBLE=y
...... 
1718CONFIG_BOOT_ELF32=y
1819# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
1920# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
20CONFIG_CEVT_R4K_LIB=y
2121CONFIG_CEVT_R4K=y
22CONFIG_CEVT_R4K_LIB=y
2223CONFIG_CFG80211_DEFAULT_PS_VALUE=0
2324CONFIG_CMDLINE="rootfstype=squashfs,jffs2"
2425CONFIG_CPMAC=y
...... 
2829CONFIG_CPU_HAS_SYNC=y
2930CONFIG_CPU_LITTLE_ENDIAN=y
3031# CONFIG_CPU_LOONGSON2E is not set
32CONFIG_CPU_MIPS32=y
3133CONFIG_CPU_MIPS32_R1=y
3234# CONFIG_CPU_MIPS32_R2 is not set
33CONFIG_CPU_MIPS32=y
3435# CONFIG_CPU_MIPS64_R1 is not set
3536# CONFIG_CPU_MIPS64_R2 is not set
3637CONFIG_CPU_MIPSR1=y
...... 
5253# CONFIG_CPU_TX39XX is not set
5354# CONFIG_CPU_TX49XX is not set
5455# CONFIG_CPU_VR41XX is not set
55CONFIG_CSRC_R4K_LIB=y
5656CONFIG_CSRC_R4K=y
57CONFIG_CSRC_R4K_LIB=y
5758CONFIG_DECOMPRESS_LZMA=y
5859# CONFIG_DM9000 is not set
5960CONFIG_DMA_NEED_PCI_MAP_STATE=y
6061CONFIG_DMA_NONCOHERENT=y
6162CONFIG_EARLY_PRINTK=y
62CONFIG_FIXED_PHY=y
6363# CONFIG_FSNOTIFY is not set
64CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
6564CONFIG_GENERIC_CLOCKEVENTS=y
65CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
6666CONFIG_GENERIC_CMOS_UPDATE=y
6767CONFIG_GENERIC_FIND_LAST_BIT=y
6868CONFIG_GENERIC_FIND_NEXT_BIT=y
...... 
7878CONFIG_HAVE_OPROFILE=y
7979CONFIG_HW_RANDOM=y
8080CONFIG_INITRAMFS_SOURCE=""
81CONFIG_IP17XX_PHY=y
8182CONFIG_IRQ_CPU=y
8283CONFIG_KALLSYMS=y
8384CONFIG_LEDS_GPIO=y
...... 
8990# CONFIG_MACH_TX49XX is not set
9091# CONFIG_MACH_VR41XX is not set
9192# CONFIG_MIKROTIK_RB532 is not set
93CONFIG_MIPS=y
9294# CONFIG_MIPS_COBALT is not set
9395CONFIG_MIPS_L1_CACHE_SHIFT=5
9496# CONFIG_MIPS_MACHINE is not set
...... 
9799# CONFIG_MIPS_MT_SMP is not set
98100# CONFIG_MIPS_MT_SMTC is not set
99101# CONFIG_MIPS_SIM is not set
100CONFIG_MIPS=y
101102CONFIG_MTD_AR7_PARTS=y
102103CONFIG_MTD_CFI_STAA=y
103104CONFIG_MTD_PHYSMAP=y
105CONFIG_MVSWITCH_PHY=y
104106CONFIG_NO_EXCEPT_FILL=y
105107# CONFIG_NO_IOPORT is not set
106108# CONFIG_NXP_STB220 is not set
107109# CONFIG_NXP_STB225 is not set
108110CONFIG_PAGEFLAGS_EXTENDED=y
109# CONFIG_PCI is not set
110111CONFIG_PHYLIB=y
111112# CONFIG_PMC_MSP is not set
112113# CONFIG_PMC_YOSEMITE is not set
113114# CONFIG_PNX8550_JBS is not set
114115# CONFIG_PNX8550_STB810 is not set
115# CONFIG_PROBE_INITRD_HEADER is not set
116116CONFIG_SCHED_OMIT_FRAME_POINTER=y
117117# CONFIG_SCSI_DMA is not set
118118# CONFIG_SERIAL_8250_EXTENDED is not set
...... 
129129# CONFIG_SIBYTE_SENTOSA is not set
130130# CONFIG_SIBYTE_SWARM is not set
131131CONFIG_SWAP_IO_SPACE=y
132CONFIG_SWCONFIG=y
132133CONFIG_SYS_HAS_CPU_MIPS32_R1=y
133134CONFIG_SYS_HAS_EARLY_PRINTK=y
134135CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
1--- a/arch/mips/ar7/platform.c
2@@ -33,7 +33,6 @@
3 #include <linux/string.h>
4 #include <linux/etherdevice.h>
5 #include <linux/phy.h>
6-#include <linux/phy_fixed.h>
7
8 #include <asm/addrspace.h>
9 #include <asm/mach-ar7/ar7.h>
10@@ -294,12 +293,6 @@ static struct physmap_flash_data physmap
11     .width = 2,
12 };
13
14-static struct fixed_phy_status fixed_phy_status __initdata = {
15- .link = 1,
16- .speed = 100,
17- .duplex = 1,
18-};
19-
20 static struct plat_cpmac_data cpmac_low_data = {
21     .reset_bit = 17,
22     .power_bit = 20,
23@@ -716,11 +709,6 @@ static int __init ar7_register_devices(v
24     }
25
26     if (ar7_has_high_cpmac()) {
27- res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_high_titan.id : cpmac_high.id,
28- &fixed_phy_status);
29- if (res && res != -ENODEV)
30- return res;
31-
32         cpmac_get_mac(1, ar7_is_titan() ? cpmac_high_data_titan.dev_addr :
33                         cpmac_high_data.dev_addr);
34         res = platform_device_register(ar7_is_titan() ? &cpmac_high_titan :
35@@ -736,11 +724,6 @@ static int __init ar7_register_devices(v
36
37     }
38
39- res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_low_titan.id :
40- cpmac_low.id, &fixed_phy_status);
41- if (res && res != -ENODEV)
42- return res;
43-
44     cpmac_get_mac(0, ar7_is_titan() ? cpmac_low_data_titan.dev_addr :
45             cpmac_low_data.dev_addr);
46     res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
47--- a/drivers/net/cpmac.c
48@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct
49
50     pdata = pdev->dev.platform_data;
51
52- if (external_switch || dumb_switch) {
53- strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
54- phy_id = pdev->id;
55- } else {
56- for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
57- if (!(pdata->phy_mask & (1 << phy_id)))
58- continue;
59- if (!cpmac_mii->phy_map[phy_id])
60- continue;
61- strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
62- break;
63- }
64+ for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
65+ if (!(pdata->phy_mask & (1 << phy_id)))
66+ continue;
67+ if (!cpmac_mii->phy_map[phy_id])
68+ continue;
69+ strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
70+ break;
71     }
72-
73+
74     if (phy_id == PHY_MAX_ADDR) {
75+ //This probably wont work as no fixed bus anymore.
76         dev_err(&pdev->dev, "no PHY present, falling back to switch mode\n");
77         strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
78         phy_id = pdev->id;
79@@ -1268,7 +1264,7 @@ int __devinit cpmac_init(void)
80     }
81
82     cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):
83- ~(mask | 0x80000000);
84+ ~(mask | 0x80000001);
85     snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
86
87     res = mdiobus_register(cpmac_mii);

Archive Download the corresponding diff file



interactive