bcm63xx: refresh 3.6 patches

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35477 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch b/target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch
index bffca3c..572419c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch
+++ b/target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch
@@ -211,7 +211,7 @@ Subject: [PATCH 23/63] ohci: add driver for bcm63xx integrated controller.
 --- a/drivers/usb/host/ohci-hcd.c
 +++ b/drivers/usb/host/ohci-hcd.c
 @@ -1120,6 +1120,11 @@ MODULE_LICENSE ("GPL");
- #define PLATFORM_DRIVER               ohci_platform_driver
+ #define OHCI_PLATFORM_DRIVER          ohci_platform_driver
  #endif
  
 +#ifdef CONFIG_USB_OHCI_BCM63XX

diff --git a/target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch b/target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch
index 9b67b5a..207e981 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch
+++ b/target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch
@@ -229,7 +229,7 @@ Subject: [PATCH 25/63] ehci: add driver for bcm63xx integrated controller.
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
 @@ -1339,6 +1339,11 @@ MODULE_LICENSE ("GPL");
- #define PLATFORM_DRIVER               ehci_platform_driver
+ #define EHCI_PLATFORM_DRIVER  ehci_platform_driver
  #endif
  
 +#ifdef CONFIG_USB_EHCI_BCM63XX
@@ -239,4 +239,4 @@ Subject: [PATCH 25/63] ehci: add driver for bcm63xx integrated controller.
 +
  #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
      !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
-     !defined(XILINX_OF_PLATFORM_DRIVER)
+     !defined(XILINX_OF_PLATFORM_DRIVER) && !defined(EHCI_PLATFORM_DRIVER)

diff --git a/target/linux/brcm63xx/patches-3.6/500-board-D4PW.patch b/target/linux/brcm63xx/patches-3.6/500-board-D4PW.patch
index db5db63..e2be7ac 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/500-board-D4PW.patch
+++ b/target/linux/brcm63xx/patches-3.6/500-board-D4PW.patch
@@ -57,7 +57,7 @@
  #endif
  
  /*
-@@ -686,6 +734,7 @@ static const struct board_info __initdat
+@@ -686,6 +736,7 @@ static const struct board_info __initdat
        &board_DV201AMR,
        &board_96348gw_a,
        &board_rta1025w_16,

diff --git a/target/linux/brcm63xx/patches-3.6/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.6/501-board-NB4.patch
index f59b71f..ab06628 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.6/501-board-NB4.patch
@@ -22,7 +22,7 @@
  static struct board_info board;
  
  /*
-@@ -709,6 +717,596 @@ static struct board_info __initdata boar
+@@ -711,6 +719,596 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
  };
@@ -619,7 +619,7 @@
  #endif
  
  /*
-@@ -742,6 +1330,11 @@ static const struct board_info __initdat
+@@ -744,6 +1342,11 @@ static const struct board_info __initdat
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
@@ -631,7 +631,7 @@
  #endif
  };
  
-@@ -796,6 +1389,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -798,6 +1401,16 @@ static void __init boardid_fixup(u8 *boo
        struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
        char *board_name = (char *)bcm63xx_nvram_get_name();
  

diff --git a/target/linux/brcm63xx/patches-3.6/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.6/502-board-96338W2_E7T.patch
index a1c14f4..767940a 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/502-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-3.6/502-board-96338W2_E7T.patch
@@ -41,7 +41,7 @@
  #endif
  
  /*
-@@ -1309,6 +1341,7 @@ static const struct board_info __initdat
+@@ -1321,6 +1355,7 @@ static const struct board_info __initdat
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
        &board_96338w,

diff --git a/target/linux/brcm63xx/patches-3.6/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-3.6/503-board-CPVA642.patch
index ad7af8f..287b021 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/503-board-CPVA642.patch
+++ b/target/linux/brcm63xx/patches-3.6/503-board-CPVA642.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -706,6 +706,98 @@ static struct board_info __initdata boar
+@@ -710,6 +710,98 @@ static struct board_info __initdata boar
        },
  };
  
@@ -99,7 +99,7 @@
  static struct board_info __initdata board_AGPFS0 = {
        .name                           = "AGPF-S0",
        .expected_cpu_id                = 0x6358,
-@@ -1362,6 +1452,7 @@ static const struct board_info __initdat
+@@ -1376,6 +1468,7 @@ static const struct board_info __initdat
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,

diff --git a/target/linux/brcm63xx/patches-3.6/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-3.6/504-board_dsl_274xb_rev_c.patch
index d0c4b03..159deb0 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/504-board_dsl_274xb_rev_c.patch
+++ b/target/linux/brcm63xx/patches-3.6/504-board_dsl_274xb_rev_c.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -840,6 +840,61 @@ static struct board_info __initdata boar
+@@ -846,6 +846,61 @@ static struct board_info __initdata boar
        .has_ohci0                      = 1,
  };
  
@@ -62,7 +62,7 @@
  struct spi_gpio_platform_data nb4_spi_gpio_data = {
        .sck            = NB4_SPI_GPIO_CLK,
        .mosi           = NB4_SPI_GPIO_MOSI,
-@@ -1454,6 +1507,7 @@ static const struct board_info __initdat
+@@ -1470,6 +1525,7 @@ static const struct board_info __initdat
        &board_AGPFS0,
        &board_CPVA642,
        &board_DWVS0,

diff --git a/target/linux/brcm63xx/patches-3.6/505-board_spw500v.patch b/target/linux/brcm63xx/patches-3.6/505-board_spw500v.patch
index 277210b..0a0ce13 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/505-board_spw500v.patch
+++ b/target/linux/brcm63xx/patches-3.6/505-board_spw500v.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -600,6 +600,67 @@ static struct board_info __initdata boar
+@@ -604,6 +604,67 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -68,7 +68,7 @@
  #endif
  
  /*
-@@ -1499,6 +1560,7 @@ static const struct board_info __initdat
+@@ -1517,6 +1578,7 @@ static const struct board_info __initdat
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,

diff --git a/target/linux/brcm63xx/patches-3.6/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.6/506-board_gw6200_gw6000.patch
index 35cc222..7b7f3ca 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/506-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.6/506-board_gw6200_gw6000.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -469,6 +469,112 @@ static struct board_info __initdata boar
+@@ -471,6 +471,112 @@ static struct board_info __initdata boar
        },
  };
  
@@ -113,7 +113,7 @@
  static struct board_info __initdata board_FAST2404 = {
        .name                           = "F@ST2404",
        .expected_cpu_id                = 0x6348,
-@@ -1553,6 +1659,8 @@ static const struct board_info __initdat
+@@ -1571,6 +1677,8 @@ static const struct board_info __initdat
  #ifdef CONFIG_BCM63XX_CPU_6348
        &board_96348r,
        &board_96348gw,

diff --git a/target/linux/brcm63xx/patches-3.6/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.6/507-board-MAGIC.patch
index a391b36..4d32bf2 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.6/507-board-MAGIC.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -767,6 +767,78 @@ static struct board_info __initdata boar
+@@ -771,6 +771,78 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -79,7 +79,7 @@
  #endif
  
  /*
-@@ -1669,6 +1739,7 @@ static const struct board_info __initdat
+@@ -1687,6 +1759,7 @@ static const struct board_info __initdat
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_spw500v,

diff --git a/target/linux/brcm63xx/patches-3.6/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.6/508-board_hw553.patch
index 8d3b877..4d40b2b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/508-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.6/508-board_hw553.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1709,6 +1709,82 @@ static struct board_info __initdata boar
+@@ -1729,6 +1729,82 @@ static struct board_info __initdata boar
        .spis = nb4_spi_devices,
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
@@ -83,7 +83,7 @@
  #endif
  
  /*
-@@ -1754,6 +1828,7 @@ static const struct board_info __initdat
+@@ -1774,6 +1850,7 @@ static const struct board_info __initdat
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,

diff --git a/target/linux/brcm63xx/patches-3.6/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.6/509-board_rta1320_16m.patch
index 71e5d0e..06d340e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.6/509-board_rta1320_16m.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -215,6 +215,45 @@ static struct board_info __initdata boar
+@@ -217,6 +217,45 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -46,7 +46,7 @@
  #endif
  
  /*
-@@ -1796,6 +1833,7 @@ static const struct board_info __initdat
+@@ -1818,6 +1857,7 @@ static const struct board_info __initdat
        &board_96338gw,
        &board_96338w,
        &board_96338w2_e7t,

diff --git a/target/linux/brcm63xx/patches-3.6/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.6/510-board_spw303v.patch
index 4af8a6f..e58b226 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/510-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.6/510-board_spw303v.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1820,6 +1820,72 @@ static struct board_info __initdata boar
+@@ -1844,6 +1844,72 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -73,7 +73,7 @@
  #endif
  
  /*
-@@ -1867,6 +1933,7 @@ static const struct board_info __initdat
+@@ -1891,6 +1957,7 @@ static const struct board_info __initdat
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
        &board_HW553,

diff --git a/target/linux/brcm63xx/patches-3.6/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.6/511-board_V2500V.patch
index c739392..90ea4ef 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.6/511-board_V2500V.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -874,6 +874,65 @@ static struct board_info __initdata boar
+@@ -882,6 +882,65 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -66,7 +66,7 @@
  #endif
  
  /*
-@@ -1918,6 +1975,7 @@ static const struct board_info __initdat
+@@ -1942,6 +2001,7 @@ static const struct board_info __initdat
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -74,7 +74,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2038,6 +2096,23 @@ void __init board_prom_init(void)
+@@ -2062,6 +2122,23 @@ void __init board_prom_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);

diff --git a/target/linux/brcm63xx/patches-3.6/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.6/512-board_BTV2110.patch
index 24fa4a6..edde41a 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/512-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.6/512-board_BTV2110.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -438,6 +438,64 @@ static struct board_info __initdata boar
+@@ -442,6 +442,64 @@ static struct board_info __initdata boar
        },
  };
  
@@ -65,7 +65,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -1976,6 +2032,7 @@ static const struct board_info __initdat
+@@ -2002,6 +2060,7 @@ static const struct board_info __initdat
        &board_spw500v,
        &board_96348sv,
        &board_V2500V_BB,

diff --git a/target/linux/brcm63xx/patches-3.6/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.6/514-board_ct536_ct5621.patch
index e91f204..09f6762 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/514-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.6/514-board_ct536_ct5621.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -494,6 +494,51 @@ static struct board_info __initdata boar
+@@ -500,6 +500,51 @@ static struct board_info __initdata boar
  };
  
  
@@ -52,7 +52,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2033,6 +2076,7 @@ static const struct board_info __initdat
+@@ -2061,6 +2106,7 @@ static const struct board_info __initdat
        &board_96348sv,
        &board_V2500V_BB,
        &board_V2110,

diff --git a/target/linux/brcm63xx/patches-3.6/515-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-3.6/515-board_DWV-S0_fixes.patch
index 8c802e0..3320c41 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/515-board_DWV-S0_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.6/515-board_DWV-S0_fixes.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1253,6 +1253,8 @@ static struct board_info __initdata boar
+@@ -1269,6 +1269,8 @@ static struct board_info __initdata boar
        .name                           = "DWV-S0",
        .expected_cpu_id                = 0x6358,
  
@@ -9,7 +9,7 @@
        .has_enet0                      = 1,
        .has_enet1                      = 1,
        .has_pci                        = 1,
-@@ -1268,6 +1270,7 @@ static struct board_info __initdata boar
+@@ -1284,6 +1286,7 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0                      = 1,

diff --git a/target/linux/brcm63xx/patches-3.6/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.6/516-board_96348A-122.patch
index 19ef500..e10feca 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-3.6/516-board_96348A-122.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -537,6 +537,69 @@ static struct board_info __initdata boar
+@@ -545,6 +545,69 @@ static struct board_info __initdata boar
        },
  };
  
@@ -70,7 +70,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2080,6 +2141,7 @@ static const struct board_info __initdat
+@@ -2110,6 +2173,7 @@ static const struct board_info __initdat
        &board_V2500V_BB,
        &board_V2110,
        &board_ct536_ct5621,

diff --git a/target/linux/brcm63xx/patches-3.6/517-RTA1205W_16_uart_fixes.patch b/target/linux/brcm63xx/patches-3.6/517-RTA1205W_16_uart_fixes.patch
index 01c16ba..e8196ea 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/517-RTA1205W_16_uart_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.6/517-RTA1205W_16_uart_fixes.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -800,6 +800,7 @@ static struct board_info __initdata boar
+@@ -810,6 +810,7 @@ static struct board_info __initdata boar
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
  

diff --git a/target/linux/brcm63xx/patches-3.6/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.6/519_board_CPVA502plus.patch
index e0f52a7..8c1b0da 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.6/519_board_CPVA502plus.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1092,6 +1092,46 @@ static struct board_info __initdata boar
+@@ -1108,6 +1108,46 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -47,7 +47,7 @@
  #endif
  
  /*
-@@ -2143,6 +2181,7 @@ static const struct board_info __initdat
+@@ -2175,6 +2215,7 @@ static const struct board_info __initdat
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,

diff --git a/target/linux/brcm63xx/patches-3.6/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.6/520-bcm63xx-add-support-for-96368MVWG-board.patch
index 85e2753..4d2c8f0 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.6/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2148,6 +2148,78 @@ static struct board_info __initdata boar
+@@ -2182,6 +2182,78 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -89,7 +89,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initdata *bcm963xx_boards[] = {
-@@ -2199,6 +2271,10 @@ static const struct board_info __initdat
+@@ -2233,6 +2305,10 @@ static const struct board_info __initdat
        &board_HW553,
        &board_spw303v,
  #endif
@@ -100,7 +100,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  /*
-@@ -2370,12 +2446,25 @@ void __init board_prom_init(void)
+@@ -2404,12 +2480,25 @@ void __init board_prom_init(void)
                bcm63xx_pci_enabled = 1;
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G2_PCI;

diff --git a/target/linux/brcm63xx/patches-3.6/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.6/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index f7b9762..63dd31b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.6/521-bcm63xx-add-support-for-96368MVNgr-board.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2217,6 +2217,72 @@ static struct board_info __initdata boar
+@@ -2251,6 +2251,72 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
@@ -82,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif
  
  /*
-@@ -2274,6 +2340,7 @@ static const struct board_info __initdat
+@@ -2308,6 +2374,7 @@ static const struct board_info __initdat
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,

diff --git a/target/linux/brcm63xx/patches-3.6/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.6/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index e3bc61e..061eb68 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.6/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  
  /*
-@@ -2323,6 +2393,7 @@ static struct board_info __initdata boar
+@@ -2357,6 +2427,7 @@ static struct board_info __initdata boar
  static const struct board_info __initdata *bcm963xx_boards[] = {
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,

diff --git a/target/linux/brcm63xx/patches-3.6/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.6/524-board_dsl_274xb_rev_f.patch
index ec0efca..49d96a6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.6/524-board_dsl_274xb_rev_f.patch
@@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  
  /*
-@@ -2394,6 +2499,7 @@ static const struct board_info __initdat
+@@ -2428,6 +2533,7 @@ static const struct board_info __initdat
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,

diff --git a/target/linux/brcm63xx/patches-3.6/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.6/525-board_96348w3.patch
index 758045c..eb0a514 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/525-board_96348w3.patch
+++ b/target/linux/brcm63xx/patches-3.6/525-board_96348w3.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1337,6 +1337,59 @@ static struct board_info __initdata boar
+@@ -1355,6 +1355,59 @@ static struct board_info __initdata boar
        },
  };
  
@@ -60,7 +60,7 @@
  #endif
  
  /*
-@@ -2529,6 +2580,7 @@ static const struct board_info __initdat
+@@ -2563,6 +2616,7 @@ static const struct board_info __initdat
        &board_ct536_ct5621,
        &board_96348A_122,
        &board_CPVA502plus,

diff --git a/target/linux/brcm63xx/patches-3.6/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.6/526-board_CT6373-1.patch
index 295b80b..6b8e40a 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.6/526-board_CT6373-1.patch
@@ -14,7 +14,7 @@
  static struct board_info board;
  
  /*
-@@ -2264,6 +2271,113 @@ static struct board_info __initdata boar
+@@ -2298,6 +2305,113 @@ static struct board_info __initdata boar
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
  
@@ -128,7 +128,7 @@
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -2595,6 +2707,7 @@ static const struct board_info __initdat
+@@ -2631,6 +2745,7 @@ static const struct board_info __initdat
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,

diff --git a/target/linux/brcm63xx/patches-3.6/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.6/527-board_dva-g3810bn-tl-1.patch
index b3b8819..202de74 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/527-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-3.6/527-board_dva-g3810bn-tl-1.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2515,6 +2515,73 @@ static struct board_info __initdata boar
+@@ -2553,6 +2553,73 @@ static struct board_info __initdata boar
                },
        }
  };
@@ -74,7 +74,7 @@
  #endif
  
  /*
-@@ -2710,6 +2775,7 @@ static const struct board_info __initdat
+@@ -2748,6 +2815,7 @@ static const struct board_info __initdat
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,

diff --git a/target/linux/brcm63xx/patches-3.6/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.6/528-board_nb6.patch
index 297759f..fac4217 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.6/528-board_nb6.patch
@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2582,6 +2585,103 @@ static struct board_info __initdata boar
+@@ -2622,6 +2625,103 @@ static struct board_info __initdata boar
  };
  #endif
  
@@ -121,7 +121,7 @@
  /*
   * known 6368 boards
   */
-@@ -2778,6 +2878,10 @@ static const struct board_info __initdat
+@@ -2818,6 +2918,10 @@ static const struct board_info __initdat
        &board_DVAG3810BN,
  #endif
  
@@ -132,7 +132,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -2845,6 +2949,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2885,6 +2989,11 @@ static void __init boardid_fixup(u8 *boo
                }
        }
  

diff --git a/target/linux/brcm63xx/patches-3.6/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.6/529-board_fast2604.patch
index e04dcd1..f09472e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-3.6/529-board_fast2604.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1013,6 +1013,57 @@ static struct board_info __initdata boar
+@@ -1023,6 +1023,57 @@ static struct board_info __initdata boar
        .has_ehci0                      = 1,
  };
  
@@ -58,7 +58,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
-@@ -2846,6 +2895,7 @@ static const struct board_info __initdat
+@@ -2886,6 +2937,7 @@ static const struct board_info __initdat
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,

diff --git a/target/linux/brcm63xx/patches-3.6/530-board_963281T_TEF.patch b/target/linux/brcm63xx/patches-3.6/530-board_963281T_TEF.patch
index acd4ca4..19559d9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/530-board_963281T_TEF.patch
+++ b/target/linux/brcm63xx/patches-3.6/530-board_963281T_TEF.patch
@@ -126,7 +126,7 @@
  static struct board_info __initdata board_dsl_274xb_f1 = {
        .name                           = "AW4339U",
        .expected_cpu_id                = 0x6328,
-@@ -2876,6 +2995,7 @@ static const struct board_info __initdat
+@@ -2918,6 +3037,7 @@ static const struct board_info __initdat
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,

diff --git a/target/linux/brcm63xx/patches-3.6/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.6/531-board_96328A-1441N1.patch
index 82800a7..c620536 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/531-board_96328A-1441N1.patch
+++ b/target/linux/brcm63xx/patches-3.6/531-board_96328A-1441N1.patch
@@ -79,7 +79,7 @@
  static struct board_info __initdata board_963281TAN = {
        .name                           = "963281TAN",
        .expected_cpu_id                = 0x6328,
-@@ -2994,6 +3066,7 @@ static struct board_info __initdata boar
+@@ -3036,6 +3108,7 @@ static struct board_info __initdata boar
  static const struct board_info __initdata *bcm963xx_boards[] = {
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,

diff --git a/target/linux/brcm63xx/patches-3.6/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.6/532-board_96328a-1241N.patch
index 58a3deb..674f50f 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/532-board_96328a-1241N.patch
+++ b/target/linux/brcm63xx/patches-3.6/532-board_96328a-1241N.patch
@@ -73,7 +73,7 @@
  static struct board_info __initdata board_96328A_1441N1 = {
        .name                                   = "96328A-1441N1",
        .expected_cpu_id                        = 0x6328,
-@@ -3066,6 +3132,7 @@ static struct board_info __initdata boar
+@@ -3108,6 +3174,7 @@ static struct board_info __initdata boar
  static const struct board_info __initdata *bcm963xx_boards[] = {
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,

diff --git a/target/linux/brcm63xx/patches-3.6/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.6/550-alice_gate2_leds.patch
index 382e98e..e98e96b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/550-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.6/550-alice_gate2_leds.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1921,6 +1921,99 @@ static struct board_info __initdata boar
+@@ -1945,6 +1945,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,

diff --git a/target/linux/brcm63xx/patches-3.6/551-96348gw_a_leds.patch b/target/linux/brcm63xx/patches-3.6/551-96348gw_a_leds.patch
index 37d838b..562f3b5 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/551-96348gw_a_leds.patch
+++ b/target/linux/brcm63xx/patches-3.6/551-96348gw_a_leds.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1378,6 +1378,19 @@ static struct board_info __initdata boar
+@@ -1390,6 +1390,19 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0 = 1,

diff --git a/target/linux/brcm63xx/patches-3.6/552-board_96348gw-10_reset_button.patch b/target/linux/brcm63xx/patches-3.6/552-board_96348gw-10_reset_button.patch
index 9a551d9..4904f2f 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/552-board_96348gw-10_reset_button.patch
+++ b/target/linux/brcm63xx/patches-3.6/552-board_96348gw-10_reset_button.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -846,6 +846,17 @@ static struct board_info __initdata boar
+@@ -850,6 +850,17 @@ static struct board_info __initdata boar
                        .active_low     = 1,
                },
        },

diff --git a/target/linux/brcm63xx/patches-3.6/553-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.6/553-board_rta770bw.patch
index cd1ee99..80df533 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/553-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-3.6/553-board_rta770bw.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -738,6 +738,55 @@ static struct board_info __initdata boar
+@@ -742,6 +742,55 @@ static struct board_info __initdata boar
  
        .has_uart0                      = 1,
  };
@@ -56,7 +56,7 @@
  #endif
  
  /*
-@@ -3263,6 +3310,7 @@ static const struct board_info __initdat
+@@ -3305,6 +3354,7 @@ static const struct board_info __initdat
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,

diff --git a/target/linux/brcm63xx/patches-3.6/554-board_hw556.patch b/target/linux/brcm63xx/patches-3.6/554-board_hw556.patch
index 69f0539..d084664 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/554-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.6/554-board_hw556.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2923,6 +2923,374 @@ static struct board_info __initdata boar
+@@ -2965,6 +2965,374 @@ static struct board_info __initdata boar
        },
  };
  
@@ -375,7 +375,7 @@
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -3349,6 +3709,10 @@ static const struct board_info __initdat
+@@ -3393,6 +3761,10 @@ static const struct board_info __initdat
        &board_nb4_fxc_r2,
        &board_ct6373_1,
        &board_HW553,
@@ -386,7 +386,7 @@
        &board_spw303v,
        &board_DVAG3810BN,
  #endif
-@@ -3414,13 +3778,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3458,13 +3830,37 @@ static void __init boardid_fixup(u8 *boo
        struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
        char *board_name = (char *)bcm63xx_nvram_get_name();
  

diff --git a/target/linux/brcm63xx/patches-3.6/555-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.6/555-boards_probe_switch.patch
index 5dd1bf4..5994b1b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/555-boards_probe_switch.patch
+++ b/target/linux/brcm63xx/patches-3.6/555-boards_probe_switch.patch
@@ -1,6 +1,6 @@
---- linux-3.6.11/arch/mips/bcm63xx/boards/board_bcm963xx.c.orig        2013-01-05 21:18:15.153079713 +0100
-+++ linux-3.6.11/arch/mips/bcm63xx/boards/board_bcm963xx.c     2013-01-05 21:18:27.899285369 +0100
-@@ -583,6 +583,8 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -581,6 +581,8 @@ static struct board_info __initdata boar
        .has_uart0                      = 1,
        .has_enet0                      = 1,
        .enet0 = {
@@ -9,7 +9,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -626,6 +628,8 @@
+@@ -624,6 +626,8 @@ static struct board_info __initdata boar
        .has_uart0                      = 1,
        .has_enet0                      = 1,
        .enet0 = {
@@ -18,7 +18,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -857,6 +861,8 @@
+@@ -855,6 +859,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -27,7 +27,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -929,6 +935,8 @@
+@@ -927,6 +933,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -36,7 +36,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1158,6 +1166,8 @@
+@@ -1156,6 +1164,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -45,7 +45,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1333,6 +1343,8 @@
+@@ -1331,6 +1341,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -54,7 +54,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1407,6 +1419,8 @@
+@@ -1405,6 +1417,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -63,7 +63,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1428,6 +1442,8 @@
+@@ -1426,6 +1440,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -72,7 +72,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1447,6 +1463,8 @@
+@@ -1445,6 +1461,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -81,7 +81,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1822,6 +1840,8 @@
+@@ -1820,6 +1838,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -90,7 +90,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1874,6 +1894,8 @@
+@@ -1872,6 +1892,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -99,7 +99,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2014,6 +2036,8 @@
+@@ -2012,6 +2034,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -108,7 +108,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2131,6 +2155,8 @@
+@@ -2129,6 +2153,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {

diff --git a/target/linux/brcm63xx/patches-3.6/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.6/801-ssb_export_fallback_sprom.patch
index 7f3275d..9484b82 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/801-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-3.6/801-ssb_export_fallback_sprom.patch
@@ -8,7 +8,7 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
  #include <linux/spi/74x164.h>
-@@ -3732,7 +3733,7 @@ static const struct board_info __initdat
+@@ -3810,7 +3811,7 @@ static const struct board_info __initdat
   * bcm4318 WLAN work
   */
  #ifdef CONFIG_SSB_PCIHOST
@@ -17,7 +17,7 @@
        .revision               = 0x02,
        .board_rev              = 0x17,
        .country_code           = 0x0,
-@@ -3752,6 +3753,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -3830,6 +3831,7 @@ static struct ssb_sprom bcm63xx_sprom =
        .boardflags_lo          = 0x2848,
        .boardflags_hi          = 0x0000,
  };