kernel: bump to 4.4.40

[openwrt/staging/yousong.git] / target / linux / layerscape / patches-4.4 / 8230-layerscape-pci-fix-linkup-issue.patch

diff --git a/target/linux/layerscape/patches-4.4/8230-layerscape-pci-fix-linkup-issue.patch b/target/linux/layerscape/patches-4.4/8230-layerscape-pci-fix-linkup-issue.patch
index 0feb800367381c8db56eba4ee08f78c461e6c2a8..f28776cba17ea144886e0f927e8c27bc732afa36 100644 (file)
--- a/target/linux/layerscape/patches-4.4/8230-layerscape-pci-fix-linkup-issue.patch
+++ b/target/linux/layerscape/patches-4.4/8230-layerscape-pci-fix-linkup-issue.patch
@@ -12,31 +12,26 @@ Integrated-by: Zhao Qiang <qiang.zhao@nxp.com>
  drivers/pci/host/pci-layerscape.c |   13 +++++++++----
  1 file changed, 9 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c
-index 00feabf..f85ebcf 100644
 --- a/drivers/pci/host/pci-layerscape.c
 +++ b/drivers/pci/host/pci-layerscape.c
-@@ -158,11 +158,16 @@ static void ls1021_pcie_host_init(struct pcie_port *pp)
+@@ -158,11 +158,16 @@ static void ls1021_pcie_host_init(struct
  static int ls_pcie_link_up(struct pcie_port *pp)
  {
        struct ls_pcie *pcie = to_ls_pcie(pp);
 -      u32 state;
 +      u32 state, offset;
-+
-+      if (of_get_property(pp->dev->of_node, "fsl,lut_diff", NULL))
-+              offset = 0x407fc;
-+      else
-+              offset = PCIE_LUT_DBG;
  
 -      state = (ioread32(pcie->lut + pcie->drvdata->lut_dbg) >>
 -               pcie->drvdata->ltssm_shift) &
 -               LTSSM_STATE_MASK;
++      if (of_get_property(pp->dev->of_node, "fsl,lut_diff", NULL))
++              offset = 0x407fc;
++      else
++              offset = PCIE_LUT_DBG;
++
 +      state = (ioread32(pcie->lut + offset) >>
 +                      pcie->drvdata->ltssm_shift) &
 +              LTSSM_STATE_MASK;
  
        if (state < LTSSM_PCIE_L0)
                return 0;
--- 
-1.7.9.5
-