layerscape: refresh patches

[openwrt/staging/chunkeey.git] / target / linux / layerscape / patches-4.9 / 801-ata-support-layerscape.patch

diff --git a/target/linux/layerscape/patches-4.9/801-ata-support-layerscape.patch b/target/linux/layerscape/patches-4.9/801-ata-support-layerscape.patch
index bc7641015cba5eb7d5533d3fc5f755a2cb1e8f4a..0c1cd1bf84dadd29313250d5b10503c3ce376314 100644 (file)
--- a/target/linux/layerscape/patches-4.9/801-ata-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/801-ata-support-layerscape.patch
@@ -11,8 +11,6 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  drivers/ata/ahci_qoriq.c | 63 ++++++++++++++++++++++++++++++++++++++++++------
  1 file changed, 56 insertions(+), 7 deletions(-)
 
  drivers/ata/ahci_qoriq.c | 63 ++++++++++++++++++++++++++++++++++++++++++------
  1 file changed, 56 insertions(+), 7 deletions(-)
 

-diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c
-index 1eba8dff..2f30a39f 100644

 --- a/drivers/ata/ahci_qoriq.c
 +++ b/drivers/ata/ahci_qoriq.c
 @@ -1,7 +1,7 @@
 --- a/drivers/ata/ahci_qoriq.c
 +++ b/drivers/ata/ahci_qoriq.c
 @@ -1,7 +1,7 @@


@@ -57,7 +55,7 @@ index 1eba8dff..2f30a39f 100644
        {},
  };
  MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match);
        {},
  };
  MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match);

-@@ -154,6 +163,8 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)
+@@ -154,6 +163,8 @@ static int ahci_qoriq_phy_init(struct ah

  
        switch (qpriv->type) {
        case AHCI_LS1021A:
  
        switch (qpriv->type) {
        case AHCI_LS1021A:


@@ -66,7 +64,7 @@ index 1eba8dff..2f30a39f 100644
                writel(SATA_ECC_DISABLE, qpriv->ecc_addr);
                writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
                writel(LS1021A_PORT_PHY2, reg_base + PORT_PHY2);
                writel(SATA_ECC_DISABLE, qpriv->ecc_addr);
                writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
                writel(LS1021A_PORT_PHY2, reg_base + PORT_PHY2);

-@@ -161,19 +172,56 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)
+@@ -161,19 +172,56 @@ static int ahci_qoriq_phy_init(struct ah

                writel(LS1021A_PORT_PHY4, reg_base + PORT_PHY4);
                writel(LS1021A_PORT_PHY5, reg_base + PORT_PHY5);
                writel(AHCI_PORT_TRANS_CFG, reg_base + PORT_TRANS);
                writel(LS1021A_PORT_PHY4, reg_base + PORT_PHY4);
                writel(LS1021A_PORT_PHY5, reg_base + PORT_PHY5);
                writel(AHCI_PORT_TRANS_CFG, reg_base + PORT_TRANS);


@@ -126,7 +124,7 @@ index 1eba8dff..2f30a39f 100644
                break;
        }
  
                break;
        }
  

-@@ -204,13 +252,14 @@ static int ahci_qoriq_probe(struct platform_device *pdev)
+@@ -204,13 +252,14 @@ static int ahci_qoriq_probe(struct platf

  
        qoriq_priv->type = (enum ahci_qoriq_type)of_id->data;
  
  
        qoriq_priv->type = (enum ahci_qoriq_type)of_id->data;
  


@@ -144,6 +142,3 @@ index 1eba8dff..2f30a39f 100644
  
        rc = ahci_platform_enable_resources(hpriv);
        if (rc)
  
        rc = ahci_platform_enable_resources(hpriv);
        if (rc)

--- 
-2.14.1
-