diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-02 22:26:15 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-02 22:26:15 +0000 |
| commit | fa839274b0f1de41be498c25bbc4d1a92b48d64e (patch) | |
| tree | b5b146b519d6740390e78285b054228e5ccc74c2 /target/linux/generic/patches-3.6 | |
| parent | 125fc703bb1477599809db96e5d62a1915864fad (diff) | |
| download | master-31e0f0ae-fa839274b0f1de41be498c25bbc4d1a92b48d64e.tar.gz master-31e0f0ae-fa839274b0f1de41be498c25bbc4d1a92b48d64e.tar.bz2 master-31e0f0ae-fa839274b0f1de41be498c25bbc4d1a92b48d64e.zip | |
kernel: bcma: update to wireless-testing master-2013-10-01
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38290
Diffstat (limited to 'target/linux/generic/patches-3.6')
| -rw-r--r-- | target/linux/generic/patches-3.6/025-bcma_backport.patch | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/target/linux/generic/patches-3.6/025-bcma_backport.patch b/target/linux/generic/patches-3.6/025-bcma_backport.patch index 0e60758458..5428868e64 100644 --- a/target/linux/generic/patches-3.6/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.6/025-bcma_backport.patch @@ -1684,14 +1684,20 @@ /************************************************** * Workarounds. **************************************************/ -@@ -203,6 +210,25 @@ static void bcma_core_pci_config_fixup(s - } +@@ -229,6 +236,32 @@ void __devinit bcma_core_pci_init(struct + bcma_core_pci_clientmode_init(pc); } -+static void bcma_core_pci_power_save(struct bcma_drv_pci *pc, bool up) ++void bcma_core_pci_power_save(struct bcma_bus *bus, bool up) +{ ++ struct bcma_drv_pci *pc; + u16 data; + ++ if (bus->hosttype != BCMA_HOSTTYPE_PCI) ++ return; ++ ++ pc = &bus->drv_pci[0]; ++ + if (pc->core->id.rev >= 15 && pc->core->id.rev <= 20) { + data = up ? 0x74 : 0x7C; + bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1, @@ -1706,11 +1712,12 @@ + BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data); + } +} ++EXPORT_SYMBOL_GPL(bcma_core_pci_power_save); + - /************************************************** - * Init. - **************************************************/ -@@ -262,7 +288,7 @@ out: + int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core, + bool enable) + { +@@ -262,7 +295,7 @@ out: } EXPORT_SYMBOL_GPL(bcma_core_pci_irq_ctl); @@ -1719,7 +1726,7 @@ { u32 w; -@@ -274,4 +300,33 @@ void bcma_core_pci_extend_L1timer(struct +@@ -274,4 +307,29 @@ void bcma_core_pci_extend_L1timer(struct bcma_pcie_write(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG, w); bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG); } @@ -1734,8 +1741,6 @@ + + pc = &bus->drv_pci[0]; + -+ bcma_core_pci_power_save(pc, true); -+ + bcma_core_pci_extend_L1timer(pc, true); +} +EXPORT_SYMBOL_GPL(bcma_core_pci_up); @@ -1750,8 +1755,6 @@ + pc = &bus->drv_pci[0]; + + bcma_core_pci_extend_L1timer(pc, false); -+ -+ bcma_core_pci_power_save(pc, false); +} +EXPORT_SYMBOL_GPL(bcma_core_pci_down); --- a/drivers/bcma/driver_pci_host.c @@ -3210,13 +3213,14 @@ #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE struct bcma_drv_pci_host { -@@ -217,7 +240,8 @@ struct bcma_drv_pci { +@@ -217,7 +240,9 @@ struct bcma_drv_pci { extern void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc); extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core, bool enable); -extern void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend); +extern void bcma_core_pci_up(struct bcma_bus *bus); +extern void bcma_core_pci_down(struct bcma_bus *bus); ++extern void bcma_core_pci_power_save(struct bcma_bus *bus, bool up); extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev); extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev); |