diff options
Diffstat (limited to 'target/linux/generic/patches-3.0')
9 files changed, 13 insertions, 33 deletions
diff --git a/target/linux/generic/patches-3.0/020-ssb_update.patch b/target/linux/generic/patches-3.0/020-ssb_update.patch index 32f5557673..74fb28c84e 100644 --- a/target/linux/generic/patches-3.0/020-ssb_update.patch +++ b/target/linux/generic/patches-3.0/020-ssb_update.patch @@ -154,35 +154,15 @@ { u16 tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(0)); if (((tmp & 0xF000) >> 12) != pc->dev->core_index) { -@@ -514,12 +514,16 @@ static void ssb_pcicore_pcie_setup_worka +@@ -514,7 +514,7 @@ static void ssb_pcicore_pcie_setup_worka * Generic and Clientmode operation code. **************************************************/ -static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc) +static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc) { -- ssb_pcicore_fix_sprom_core_index(pc); -+ struct ssb_device *pdev = pc->dev; -+ struct ssb_bus *bus = pdev->bus; -+ -+ if (bus->bustype == SSB_BUSTYPE_PCI) -+ ssb_pcicore_fix_sprom_core_index(pc); - - /* Disable PCI interrupts. */ -- ssb_write32(pc->dev, SSB_INTVEC, 0); -+ ssb_write32(pdev, SSB_INTVEC, 0); - - /* Additional PCIe always once-executed workarounds */ - if (pc->dev->id.coreid == SSB_DEV_PCIE) { -@@ -529,7 +533,7 @@ static void ssb_pcicore_init_clientmode( - } - } - --void ssb_pcicore_init(struct ssb_pcicore *pc) -+void __devinit ssb_pcicore_init(struct ssb_pcicore *pc) - { - struct ssb_device *dev = pc->dev; - + struct ssb_device *pdev = pc->dev; + struct ssb_bus *bus = pdev->bus; --- a/drivers/ssb/embedded.c +++ b/drivers/ssb/embedded.c @@ -3,7 +3,7 @@ diff --git a/target/linux/generic/patches-3.0/100-overlayfs_v10.patch b/target/linux/generic/patches-3.0/100-overlayfs_v10.patch index e4fe1a57e4..179626324c 100644 --- a/target/linux/generic/patches-3.0/100-overlayfs_v10.patch +++ b/target/linux/generic/patches-3.0/100-overlayfs_v10.patch @@ -164,7 +164,7 @@ } ____cacheline_aligned; struct seq_file; -@@ -1997,6 +1998,7 @@ extern long do_sys_open(int dfd, const c +@@ -1998,6 +1999,7 @@ extern long do_sys_open(int dfd, const c extern struct file *filp_open(const char *, int, int); extern struct file *file_open_root(struct dentry *, struct vfsmount *, const char *, int); @@ -184,7 +184,7 @@ struct pipe_inode_info *opipe, --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1495,6 +1495,23 @@ void drop_collected_mounts(struct vfsmou +@@ -1492,6 +1492,23 @@ void drop_collected_mounts(struct vfsmou release_mounts(&umount_list); } diff --git a/target/linux/generic/patches-3.0/720-phy_adm6996.patch b/target/linux/generic/patches-3.0/720-phy_adm6996.patch index 9e8e56678b..d4dbbb5c88 100644 --- a/target/linux/generic/patches-3.0/720-phy_adm6996.patch +++ b/target/linux/generic/patches-3.0/720-phy_adm6996.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -98,6 +98,13 @@ config MICREL_PHY +@@ -102,6 +102,13 @@ config MICREL_PHY ---help--- Supports the KSZ9021, VSC8201, KS8001 PHYs. diff --git a/target/linux/generic/patches-3.0/722-phy_mvswitch.patch b/target/linux/generic/patches-3.0/722-phy_mvswitch.patch index 2025b229a4..925cc4561f 100644 --- a/target/linux/generic/patches-3.0/722-phy_mvswitch.patch +++ b/target/linux/generic/patches-3.0/722-phy_mvswitch.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -105,6 +105,9 @@ config ADM6996_PHY +@@ -109,6 +109,9 @@ config ADM6996_PHY Currently supports the ADM6996FC and ADM6996M switches. Support for FC is very limited. diff --git a/target/linux/generic/patches-3.0/723-phy_ip175c.patch b/target/linux/generic/patches-3.0/723-phy_ip175c.patch index 9e13e579dd..0ac339e9a2 100644 --- a/target/linux/generic/patches-3.0/723-phy_ip175c.patch +++ b/target/linux/generic/patches-3.0/723-phy_ip175c.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -108,6 +108,10 @@ config ADM6996_PHY +@@ -112,6 +112,10 @@ config ADM6996_PHY config MVSWITCH_PHY tristate "Driver for Marvell 88E6060 switches" diff --git a/target/linux/generic/patches-3.0/724-phy_ar8216.patch b/target/linux/generic/patches-3.0/724-phy_ar8216.patch index a718e370f1..7a51dccee8 100644 --- a/target/linux/generic/patches-3.0/724-phy_ar8216.patch +++ b/target/linux/generic/patches-3.0/724-phy_ar8216.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -112,6 +112,10 @@ config IP17XX_PHY +@@ -116,6 +116,10 @@ config IP17XX_PHY tristate "Driver for IC+ IP17xx switches" select SWCONFIG diff --git a/target/linux/generic/patches-3.0/725-phy_rtl8306.patch b/target/linux/generic/patches-3.0/725-phy_rtl8306.patch index a6d188f2ce..42cd274ca7 100644 --- a/target/linux/generic/patches-3.0/725-phy_rtl8306.patch +++ b/target/linux/generic/patches-3.0/725-phy_rtl8306.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -116,6 +116,10 @@ config AR8216_PHY +@@ -120,6 +120,10 @@ config AR8216_PHY tristate "Driver for Atheros AR8216 switches" select SWCONFIG diff --git a/target/linux/generic/patches-3.0/726-phy_rtl8366.patch b/target/linux/generic/patches-3.0/726-phy_rtl8366.patch index badc0a4e62..080793d707 100644 --- a/target/linux/generic/patches-3.0/726-phy_rtl8366.patch +++ b/target/linux/generic/patches-3.0/726-phy_rtl8366.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -158,4 +158,29 @@ config MDIO_OCTEON +@@ -162,4 +162,29 @@ config MDIO_OCTEON If in doubt, say Y. diff --git a/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch index 49a88ec7e2..34e9c6398c 100644 --- a/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch @@ -1,7 +1,7 @@ --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c -@@ -429,6 +429,8 @@ reset_needed: +@@ -430,6 +430,8 @@ reset_needed: } EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); @@ -10,7 +10,7 @@ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; -@@ -882,3 +884,5 @@ static void __devinit quirk_usb_early_ha +@@ -876,3 +878,5 @@ static void __devinit quirk_usb_early_ha quirk_usb_handoff_xhci(pdev); } DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); |