kernel: update kernel 4.4 to version 4.4.7
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 49176
This commit is contained in:
@@ -30,7 +30,7 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
|
||||
|
||||
#define IPROC_PCIE_REG_INVALID 0xffff
|
||||
|
||||
@@ -170,20 +169,6 @@ static inline void iproc_pcie_ob_write(struct iproc_pcie *pcie,
|
||||
@@ -170,20 +169,6 @@ static inline void iproc_pcie_ob_write(s
|
||||
writel(val, pcie->base + offset + (window * 8));
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
|
||||
/**
|
||||
* Note access to the configuration registers are protected at the higher layer
|
||||
* by 'pci_lock' in drivers/pci/access.c
|
||||
@@ -199,11 +184,11 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct pci_bus *bus,
|
||||
@@ -199,11 +184,11 @@ static void __iomem *iproc_pcie_map_cfg_
|
||||
u32 val;
|
||||
u16 offset;
|
||||
|
||||
@@ -66,7 +66,7 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
|
||||
iproc_pcie_write_reg(pcie, IPROC_PCIE_CFG_IND_ADDR,
|
||||
where & CFG_IND_ADDR_MASK);
|
||||
offset = iproc_pcie_reg_offset(pcie, IPROC_PCIE_CFG_IND_DATA);
|
||||
@@ -213,6 +198,14 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct pci_bus *bus,
|
||||
@@ -213,6 +198,14 @@ static void __iomem *iproc_pcie_map_cfg_
|
||||
return (pcie->base + offset);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
|
||||
--- a/drivers/pci/host/pcie-iproc-bcma.c
|
||||
+++ b/drivers/pci/host/pcie-iproc-bcma.c
|
||||
@@ -40,6 +40,15 @@ static int iproc_pcie_bcma_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
@@ -40,6 +40,15 @@ static int iproc_pcie_bcma_map_irq(const
|
||||
return bcma_core_irq(bdev, 5);
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
|
||||
{
|
||||
struct iproc_pcie *pcie;
|
||||
@@ -65,6 +74,9 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
|
||||
@@ -65,6 +74,9 @@ static int iproc_pcie_bcma_probe(struct
|
||||
|
||||
pcie->map_irq = iproc_pcie_bcma_map_irq;
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
MODULE_AUTHOR("Hauke Mehrtens");
|
||||
MODULE_DESCRIPTION("Common USB driver for BCMA Bus");
|
||||
MODULE_LICENSE("GPL");
|
||||
@@ -167,10 +178,35 @@ static void bcma_hcd_init_chip_mips(struct bcma_device *dev)
|
||||
@@ -167,10 +178,35 @@ static void bcma_hcd_init_chip_mips(stru
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
|
||||
arm_core = bcma_find_core(dev->bus, BCMA_CORE_ARMCA9);
|
||||
if (!arm_core) {
|
||||
@@ -184,14 +220,29 @@ static void bcma_hcd_init_chip_arm_phy(struct bcma_device *dev)
|
||||
@@ -184,14 +220,29 @@ static void bcma_hcd_init_chip_arm_phy(s
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
|
||||
iounmap(dmu);
|
||||
}
|
||||
@@ -219,15 +270,17 @@ static void bcma_hcd_init_chip_arm_hc(struct bcma_device *dev)
|
||||
@@ -219,15 +270,17 @@ static void bcma_hcd_init_chip_arm_hc(st
|
||||
|
||||
static void bcma_hcd_init_chip_arm(struct bcma_device *dev)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user