summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/patches-2.6.37/022-USB-Add-ehci-ssb-driver.patch6
-rw-r--r--target/linux/brcm47xx/patches-2.6.37/023-usb_ehci_ohci.patch4
-rw-r--r--target/linux/brcm47xx/patches-2.6.37/700-ssb-gigabit-ethernet-driver.patch16
-rw-r--r--target/linux/brcm47xx/patches-2.6.37/830-tg3_add_pci_ids.patch4
-rw-r--r--target/linux/brcm47xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch2
5 files changed, 16 insertions, 16 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.37/022-USB-Add-ehci-ssb-driver.patch b/target/linux/brcm47xx/patches-2.6.37/022-USB-Add-ehci-ssb-driver.patch
index 6d15783b1..0f9a80094 100644
--- a/target/linux/brcm47xx/patches-2.6.37/022-USB-Add-ehci-ssb-driver.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/022-USB-Add-ehci-ssb-driver.patch
@@ -37,7 +37,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
depends on USB
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1216,9 +1216,14 @@ MODULE_LICENSE ("GPL");
+@@ -1229,9 +1229,14 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_octeon_driver
#endif
@@ -53,7 +53,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#error "missing bus glue for ehci-hcd"
#endif
-@@ -1278,10 +1283,20 @@ static int __init ehci_hcd_init(void)
+@@ -1291,10 +1296,20 @@ static int __init ehci_hcd_init(void)
if (retval < 0)
goto clean4;
#endif
@@ -75,7 +75,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
clean4:
#endif
#ifdef OF_PLATFORM_DRIVER
-@@ -1312,6 +1327,9 @@ module_init(ehci_hcd_init);
+@@ -1325,6 +1340,9 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{
diff --git a/target/linux/brcm47xx/patches-2.6.37/023-usb_ehci_ohci.patch b/target/linux/brcm47xx/patches-2.6.37/023-usb_ehci_ohci.patch
index 0d264d70c..2f6bbfe1d 100644
--- a/target/linux/brcm47xx/patches-2.6.37/023-usb_ehci_ohci.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/023-usb_ehci_ohci.patch
@@ -152,7 +152,7 @@
+#endif
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1284,17 +1284,21 @@ static int __init ehci_hcd_init(void)
+@@ -1297,17 +1297,21 @@ static int __init ehci_hcd_init(void)
goto clean4;
#endif
@@ -174,7 +174,7 @@
#ifdef XILINX_OF_PLATFORM_DRIVER
of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER);
clean4:
-@@ -1327,9 +1331,11 @@ module_init(ehci_hcd_init);
+@@ -1340,9 +1344,11 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{
diff --git a/target/linux/brcm47xx/patches-2.6.37/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.37/700-ssb-gigabit-ethernet-driver.patch
index 2915e3e9b..7d9c8f8e3 100644
--- a/target/linux/brcm47xx/patches-2.6.37/700-ssb-gigabit-ethernet-driver.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/700-ssb-gigabit-ethernet-driver.patch
@@ -211,7 +211,7 @@
if (tg3_nvram_read(tp, 0, &magic) != 0)
return -EIO;
-@@ -11169,7 +11230,7 @@ static int tg3_ioctl(struct net_device *
+@@ -11171,7 +11232,7 @@ static int tg3_ioctl(struct net_device *
return -EAGAIN;
spin_lock_bh(&tp->lock);
@@ -220,7 +220,7 @@
spin_unlock_bh(&tp->lock);
data->val_out = mii_regval;
-@@ -11185,7 +11246,7 @@ static int tg3_ioctl(struct net_device *
+@@ -11189,7 +11250,7 @@ static int tg3_ioctl(struct net_device *
return -EAGAIN;
spin_lock_bh(&tp->lock);
@@ -229,7 +229,7 @@
spin_unlock_bh(&tp->lock);
return err;
-@@ -11830,6 +11891,12 @@ static void __devinit tg3_get_5717_nvram
+@@ -11834,6 +11895,12 @@ static void __devinit tg3_get_5717_nvram
/* Chips other than 5700/5701 use the NVRAM for fetching info. */
static void __devinit tg3_nvram_init(struct tg3 *tp)
{
@@ -242,7 +242,7 @@
tw32_f(GRC_EEPROM_ADDR,
(EEPROM_ADDR_FSM_RESET |
(EEPROM_DEFAULT_CLOCK_PERIOD <<
-@@ -12093,6 +12160,9 @@ static int tg3_nvram_write_block(struct
+@@ -12097,6 +12164,9 @@ static int tg3_nvram_write_block(struct
{
int ret;
@@ -252,7 +252,7 @@
if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
~GRC_LCLCTRL_GPIO_OUTPUT1);
-@@ -13518,6 +13588,11 @@ static int __devinit tg3_get_invariants(
+@@ -13522,6 +13592,11 @@ static int __devinit tg3_get_invariants(
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
@@ -264,7 +264,7 @@
/* Get eeprom hw config before calling tg3_set_power_state().
* In particular, the TG3_FLG2_IS_NIC flag must be
* determined before calling tg3_set_power_state() so that
-@@ -13916,6 +13991,10 @@ static int __devinit tg3_get_device_addr
+@@ -13920,6 +13995,10 @@ static int __devinit tg3_get_device_addr
}
if (!is_valid_ether_addr(&dev->dev_addr[0])) {
@@ -275,7 +275,7 @@
#ifdef CONFIG_SPARC
if (!tg3_get_default_macaddr_sparc(tp))
return 0;
-@@ -14432,6 +14511,7 @@ static char * __devinit tg3_phy_string(s
+@@ -14436,6 +14515,7 @@ static char * __devinit tg3_phy_string(s
case TG3_PHY_ID_BCM5704: return "5704";
case TG3_PHY_ID_BCM5705: return "5705";
case TG3_PHY_ID_BCM5750: return "5750";
@@ -283,7 +283,7 @@
case TG3_PHY_ID_BCM5752: return "5752";
case TG3_PHY_ID_BCM5714: return "5714";
case TG3_PHY_ID_BCM5780: return "5780";
-@@ -14643,6 +14723,13 @@ static int __devinit tg3_init_one(struct
+@@ -14647,6 +14727,13 @@ static int __devinit tg3_init_one(struct
tp->msg_enable = tg3_debug;
else
tp->msg_enable = TG3_DEF_MSG_ENABLE;
diff --git a/target/linux/brcm47xx/patches-2.6.37/830-tg3_add_pci_ids.patch b/target/linux/brcm47xx/patches-2.6.37/830-tg3_add_pci_ids.patch
index 7166794a8..6bb25b9b1 100644
--- a/target/linux/brcm47xx/patches-2.6.37/830-tg3_add_pci_ids.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/830-tg3_add_pci_ids.patch
@@ -23,7 +23,7 @@ Date: Thu Dec 16 20:01:17 2010 +0100
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752)},
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
-@@ -2067,6 +2067,7 @@
+@@ -2068,6 +2068,7 @@
#define PCI_DEVICE_ID_NX2_57711E 0x1650
#define PCI_DEVICE_ID_TIGON3_5705 0x1653
#define PCI_DEVICE_ID_TIGON3_5705_2 0x1654
@@ -31,7 +31,7 @@ Date: Thu Dec 16 20:01:17 2010 +0100
#define PCI_DEVICE_ID_TIGON3_5721 0x1659
#define PCI_DEVICE_ID_TIGON3_5722 0x165a
#define PCI_DEVICE_ID_TIGON3_5723 0x165b
-@@ -2080,11 +2081,13 @@
+@@ -2081,11 +2082,13 @@
#define PCI_DEVICE_ID_TIGON3_5754M 0x1672
#define PCI_DEVICE_ID_TIGON3_5755M 0x1673
#define PCI_DEVICE_ID_TIGON3_5756 0x1674
diff --git a/target/linux/brcm47xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch b/target/linux/brcm47xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch
index 2a22a3a38..b13563d69 100644
--- a/target/linux/brcm47xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch
@@ -10,7 +10,7 @@
bool ssb_is_sprom_available(struct ssb_bus *bus)
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
-@@ -401,6 +401,7 @@ extern bool ssb_is_sprom_available(struc
+@@ -408,6 +408,7 @@ extern bool ssb_is_sprom_available(struc
/* Set a fallback SPROM.
* See kdoc at the function definition for complete documentation. */
extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 00:59:16 +0000