diff mbox

[1/3] Revert "ahci: added support for Freescale AHCI sata"

Message ID 1441614196-4284-1-git-send-email-Yuantian.Tang@freescale.com
State Not Applicable
Delegated to: David Miller
Headers show

Commit Message

tang yuantian Sept. 7, 2015, 8:23 a.m. UTC
From: Tang Yuantian <Yuantian.Tang@freescale.com>

This reverts commit 5163fb62541e
("ahci: added support for Freescale AHCI sata")

The reverted patch added Freescale QorIQ AHCI sata support to
ahci_platform driver though, but it left SoC specific settings to uboot.
It leads to QorIQ sata heavily depending on uboot. In order to removing
the dependency we first revert the old patch and then will add a new driver
for QorIQ SATA.
Since there are no LS* platforms that have been upstreamed, So
the revert would not break anything exists.

Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
---
 Documentation/devicetree/bindings/ata/ahci-platform.txt | 2 --
 drivers/ata/ahci_platform.c                             | 1 -
 2 files changed, 3 deletions(-)

Comments

Hans de Goede Sept. 7, 2015, 8:52 a.m. UTC | #1
Hi,

On 07-09-15 10:23, Yuantian.Tang@freescale.com wrote:
> From: Tang Yuantian <Yuantian.Tang@freescale.com>
>
> This reverts commit 5163fb62541e
> ("ahci: added support for Freescale AHCI sata")
>
> The reverted patch added Freescale QorIQ AHCI sata support to
> ahci_platform driver though, but it left SoC specific settings to uboot.
> It leads to QorIQ sata heavily depending on uboot. In order to removing
> the dependency we first revert the old patch and then will add a new driver
> for QorIQ SATA.
> Since there are no LS* platforms that have been upstreamed, So
> the revert would not break anything exists.
>
> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>

The entire series looks good to me and is:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans


> ---
>   Documentation/devicetree/bindings/ata/ahci-platform.txt | 2 --
>   drivers/ata/ahci_platform.c                             | 1 -
>   2 files changed, 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt
> index a232181..c2340ee 100644
> --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
> +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
> @@ -16,8 +16,6 @@ Required properties:
>     - "snps,dwc-ahci"
>     - "snps,exynos5440-ahci"
>     - "snps,spear-ahci"
> -  - "fsl,qoriq-ahci" : for qoriq series socs which include ls1021, ls2085, etc.
> -  - "fsl,<chip>-ahci" : chip could be ls1021, ls2085 etc.
>     - "generic-ahci"
>   - interrupts        : <interrupt mapping for SATA IRQ>
>   - reg               : <registers mapping>
> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
> index 1befb11..04975b8 100644
> --- a/drivers/ata/ahci_platform.c
> +++ b/drivers/ata/ahci_platform.c
> @@ -76,7 +76,6 @@ static const struct of_device_id ahci_of_match[] = {
>   	{ .compatible = "ibm,476gtr-ahci", },
>   	{ .compatible = "snps,dwc-ahci", },
>   	{ .compatible = "hisilicon,hisi-ahci", },
> -	{ .compatible = "fsl,qoriq-ahci", },
>   	{},
>   };
>   MODULE_DEVICE_TABLE(of, ahci_of_match);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tejun Heo Sept. 8, 2015, 4:31 p.m. UTC | #2
On Mon, Sep 07, 2015 at 10:52:14AM +0200, Hans de Goede wrote:
> Hi,
> 
> On 07-09-15 10:23, Yuantian.Tang@freescale.com wrote:
> >From: Tang Yuantian <Yuantian.Tang@freescale.com>
> >
> >This reverts commit 5163fb62541e
> >("ahci: added support for Freescale AHCI sata")
> >
> >The reverted patch added Freescale QorIQ AHCI sata support to
> >ahci_platform driver though, but it left SoC specific settings to uboot.
> >It leads to QorIQ sata heavily depending on uboot. In order to removing
> >the dependency we first revert the old patch and then will add a new driver
> >for QorIQ SATA.
> >Since there are no LS* platforms that have been upstreamed, So
> >the revert would not break anything exists.
> >
> >Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
> 
> The entire series looks good to me and is:
> 
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Applied to libata/for-4.4.

Thanks.
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt
index a232181..c2340ee 100644
--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@ -16,8 +16,6 @@  Required properties:
   - "snps,dwc-ahci"
   - "snps,exynos5440-ahci"
   - "snps,spear-ahci"
-  - "fsl,qoriq-ahci" : for qoriq series socs which include ls1021, ls2085, etc.
-  - "fsl,<chip>-ahci" : chip could be ls1021, ls2085 etc.
   - "generic-ahci"
 - interrupts        : <interrupt mapping for SATA IRQ>
 - reg               : <registers mapping>
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 1befb11..04975b8 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -76,7 +76,6 @@  static const struct of_device_id ahci_of_match[] = {
 	{ .compatible = "ibm,476gtr-ahci", },
 	{ .compatible = "snps,dwc-ahci", },
 	{ .compatible = "hisilicon,hisi-ahci", },
-	{ .compatible = "fsl,qoriq-ahci", },
 	{},
 };
 MODULE_DEVICE_TABLE(of, ahci_of_match);