On 07/09/2018 03:42 AM, peng.ma@nxp.com wrote:
From: Peng Ma peng.ma@nxp.com
Add ahci compatible support for ls1043a soc.
Signed-off-by: Peng Ma peng.ma@nxp.com
depend on: patchwork.ozlabs.org/patch/924896/
drivers/ata/sata_ceva.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c index 4c9ebe4..39269fe 100644 --- a/drivers/ata/sata_ceva.c +++ b/drivers/ata/sata_ceva.c @@ -7,7 +7,6 @@ #include <dm.h> #include <ahci.h> #include <scsi.h> -#include <asm/arch/hardware.h>
#include <asm/io.h>
@@ -90,6 +89,7 @@ enum ceva_soc { CEVA_1V84, CEVA_LS1012A,
- CEVA_LS1043A,
};
struct ceva_sata_priv { @@ -98,6 +98,13 @@ struct ceva_sata_priv { ulong flag; };
+static const struct udevice_id sata_ceva_ids[] = {
- { .compatible = "ceva,ahci-1v84", .data = CEVA_1V84 },
- { .compatible = "fsl,ls1012a-ahci", .data = CEVA_LS1012A },
- { .compatible = "fsl,ls1043a-ahci", .data = CEVA_LS1043A },
- { }
+};
static int ceva_init_sata(struct ceva_sata_priv *priv) { ulong base = priv->base; @@ -116,6 +123,7 @@ static int ceva_init_sata(struct ceva_sata_priv *priv) break;
case CEVA_LS1012A:
- case CEVA_LS1043A: writel(ECC_DIS_ADDR_CH2, ECC_DIS_VAL_CH2); writel(CEVA_PHY1_CFG, base + AHCI_VEND_PPCFG); writel(CEVA_TRANS_CFG, base + AHCI_VEND_PTC);
@@ -143,12 +151,6 @@ static int sata_ceva_probe(struct udevice *dev) return ahci_probe_scsi(dev, priv->base); }
-static const struct udevice_id sata_ceva_ids[] = {
- { .compatible = "ceva,ahci-1v84", .data = CEVA_1V84 },
- { .compatible = "fsl,ls1012a-ahci", .data = CEVA_LS1012A },
- { }
-};
Why do you move this structure?
York