diff options
Diffstat (limited to 'target/linux/ipq806x/patches/0110-ahci-platform-Add-support-for-devices-with-more-then.patch')
| -rw-r--r-- | target/linux/ipq806x/patches/0110-ahci-platform-Add-support-for-devices-with-more-then.patch | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/target/linux/ipq806x/patches/0110-ahci-platform-Add-support-for-devices-with-more-then.patch b/target/linux/ipq806x/patches/0110-ahci-platform-Add-support-for-devices-with-more-then.patch index 09c4f220b4..54f84ee072 100644 --- a/target/linux/ipq806x/patches/0110-ahci-platform-Add-support-for-devices-with-more-then.patch +++ b/target/linux/ipq806x/patches/0110-ahci-platform-Add-support-for-devices-with-more-then.patch @@ -18,8 +18,6 @@ Signed-off-by: Tejun Heo <tj@kernel.org> include/linux/ahci_platform.h | 4 + 4 files changed, 93 insertions(+), 28 deletions(-) -diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt -index 89de156..3ced07d 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -10,6 +10,7 @@ Required properties: @@ -30,8 +28,6 @@ index 89de156..3ced07d 100644 Example: sata@ffe08000 { -diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h -index 64d1a99..c12862b 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -51,6 +51,7 @@ @@ -42,7 +38,7 @@ index 64d1a99..c12862b 100644 AHCI_MAX_SG = 168, /* hardware max is 64K */ AHCI_DMA_BOUNDARY = 0xffffffff, AHCI_MAX_CMDS = 32, -@@ -321,7 +322,7 @@ struct ahci_host_priv { +@@ -322,7 +323,7 @@ struct ahci_host_priv { u32 em_loc; /* enclosure management location */ u32 em_buf_sz; /* EM buffer size in byte */ u32 em_msg_type; /* EM message type */ @@ -51,11 +47,9 @@ index 64d1a99..c12862b 100644 void *plat_data; /* Other platform data */ /* * Optional ahci_start_engine override, if not set this gets set to the -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 4b231ba..2342a42 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -87,6 +87,60 @@ static struct scsi_host_template ahci_platform_sht = { +@@ -87,6 +87,60 @@ static struct scsi_host_template ahci_pl AHCI_SHT("ahci_platform"), }; @@ -116,7 +110,7 @@ index 4b231ba..2342a42 100644 static int ahci_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -97,6 +151,7 @@ static int ahci_probe(struct platform_device *pdev) +@@ -97,6 +151,7 @@ static int ahci_probe(struct platform_de struct ahci_host_priv *hpriv; struct ata_host *host; struct resource *mem; @@ -124,7 +118,7 @@ index 4b231ba..2342a42 100644 int irq; int n_ports; int i; -@@ -131,17 +186,31 @@ static int ahci_probe(struct platform_device *pdev) +@@ -131,17 +186,31 @@ static int ahci_probe(struct platform_de return -ENOMEM; } @@ -178,7 +172,7 @@ index 4b231ba..2342a42 100644 return rc; } -@@ -239,10 +306,8 @@ static void ahci_host_stop(struct ata_host *host) +@@ -239,10 +306,8 @@ static void ahci_host_stop(struct ata_ho if (pdata && pdata->exit) pdata->exit(dev); @@ -191,7 +185,7 @@ index 4b231ba..2342a42 100644 } #ifdef CONFIG_PM_SLEEP -@@ -277,8 +342,7 @@ static int ahci_suspend(struct device *dev) +@@ -277,8 +342,7 @@ static int ahci_suspend(struct device *d if (pdata && pdata->suspend) return pdata->suspend(dev); @@ -201,7 +195,7 @@ index 4b231ba..2342a42 100644 return 0; } -@@ -290,13 +354,9 @@ static int ahci_resume(struct device *dev) +@@ -290,13 +354,9 @@ static int ahci_resume(struct device *de struct ahci_host_priv *hpriv = host->private_data; int rc; @@ -218,7 +212,7 @@ index 4b231ba..2342a42 100644 if (pdata && pdata->resume) { rc = pdata->resume(dev); -@@ -317,8 +377,7 @@ static int ahci_resume(struct device *dev) +@@ -317,8 +377,7 @@ static int ahci_resume(struct device *de return 0; disable_unprepare_clk: @@ -228,8 +222,6 @@ index 4b231ba..2342a42 100644 return rc; } -diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h -index 73a2500..769d065 100644 --- a/include/linux/ahci_platform.h +++ b/include/linux/ahci_platform.h @@ -19,6 +19,7 @@ @@ -248,6 +240,3 @@ index 73a2500..769d065 100644 +void ahci_platform_disable_clks(struct ahci_host_priv *hpriv); + #endif /* _AHCI_PLATFORM_H */ --- -1.7.10.4 - |