[U-Boot] [PATCH 1/3] armv8: dts: fsl-ls1043a: add sata node support
From: Peng Ma peng.ma@nxp.com
Add sata node to support ls1043a.
Signed-off-by: Peng Ma peng.ma@nxp.com --- arch/arm/dts/fsl-ls1043a-qds.dtsi | 4 ++++ arch/arm/dts/fsl-ls1043a.dtsi | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/arch/arm/dts/fsl-ls1043a-qds.dtsi b/arch/arm/dts/fsl-ls1043a-qds.dtsi index addb9ab..3841aee 100644 --- a/arch/arm/dts/fsl-ls1043a-qds.dtsi +++ b/arch/arm/dts/fsl-ls1043a-qds.dtsi @@ -174,3 +174,7 @@ &lpuart0 { status = "okay"; }; + +&sata { + status = "okay"; +}; diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi index a804f51..bb70992 100644 --- a/arch/arm/dts/fsl-ls1043a.dtsi +++ b/arch/arm/dts/fsl-ls1043a.dtsi @@ -287,5 +287,13 @@ ranges = <0x81000000 0x0 0x00000000 0x50 0x00020000 0x0 0x00010000 /* downstream I/O */ 0x82000000 0x0 0x40000000 0x50 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ }; + + sata: sata@3200000 { + compatible = "fsl,ls1043a-ahci"; + reg = <0x0 0x3200000 0x0 0x10000>; + interrupts = <0 69 4>; + clocks = <&clockgen 4 0>; + status = "disabled"; + }; }; };
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 }, - { } -}; - static int sata_ceva_ofdata_to_platdata(struct udevice *dev) { struct ceva_sata_priv *priv = dev_get_priv(dev);
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
-----Original Message----- From: York Sun Sent: 2018年8月1日 1:38 To: Peng Ma peng.ma@nxp.com Cc: albert.u.boot@aribaud.net; Mingkai Hu mingkai.hu@nxp.com; Pankaj Bansal pankaj.bansal@nxp.com; Fabio Estevam fabio.estevam@nxp.com; Yinbo Zhu yinbo.zhu@nxp.com; sjg@chromium.org; bmeng.cn@gmail.com; michal.simek@xilinx.com; Andy Tang andy.tang@nxp.com; u-boot@lists.denx.de Subject: Re: [PATCH 2/3] scsi: ceva: add ls1043a soc support
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
Replay: In our internal review, you suggested to me that compatible should put before, so I did that.
Best regards Peng Ma.
On 07/31/2018 07:36 PM, Peng Ma wrote:
-----Original Message----- From: York Sun Sent: 2018年8月1日 1:38 To: Peng Ma peng.ma@nxp.com Cc: albert.u.boot@aribaud.net; Mingkai Hu mingkai.hu@nxp.com; Pankaj Bansal pankaj.bansal@nxp.com; Fabio Estevam fabio.estevam@nxp.com; Yinbo Zhu yinbo.zhu@nxp.com; sjg@chromium.org; bmeng.cn@gmail.com; michal.simek@xilinx.com; Andy Tang andy.tang@nxp.com; u-boot@lists.denx.de Subject: Re: [PATCH 2/3] scsi: ceva: add ls1043a soc support
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
Replay: In our internal review, you suggested to me that compatible should put before, so I did that.
Hmm, I don't remember that for this patch. Checking my emails, I commented on your internal patch set, but not on this change. Anyway, I see your reason.
York
Hi York:
It's My fault, I could misunderstood your suggest, I will send v2 patch to fix this issue.
Thanks Peng
-----Original Message----- From: York Sun Sent: 2018年8月1日 1:38 To: Peng Ma peng.ma@nxp.com Cc: albert.u.boot@aribaud.net; Mingkai Hu mingkai.hu@nxp.com; Pankaj Bansal pankaj.bansal@nxp.com; Fabio Estevam fabio.estevam@nxp.com; Yinbo Zhu yinbo.zhu@nxp.com; sjg@chromium.org; bmeng.cn@gmail.com; michal.simek@xilinx.com; Andy Tang andy.tang@nxp.com; u-boot@lists.denx.de Subject: Re: [PATCH 2/3] scsi: ceva: add ls1043a soc support
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
participants (3)
-
Peng Ma -
peng.ma＠nxp.com
-
York Sun