[U-Boot] [PATCH 1/4] scsi: ceva: add ls1046a soc support
Add ahci compatible support for ls1046a soc.
Signed-off-by: Peng Ma peng.ma@nxp.com --- drivers/ata/sata_ceva.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c index 65896d1..a2d21d9 100644 --- a/drivers/ata/sata_ceva.c +++ b/drivers/ata/sata_ceva.c @@ -99,6 +99,7 @@ enum ceva_soc { CEVA_LS1012A, CEVA_LS1021A, CEVA_LS1043A, + CEVA_LS1046A, };
struct ceva_sata_priv { @@ -138,6 +139,7 @@ static int ceva_init_sata(struct ceva_sata_priv *priv)
case CEVA_LS1012A: case CEVA_LS1043A: + case CEVA_LS1046A: 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); @@ -170,6 +172,7 @@ static const struct udevice_id sata_ceva_ids[] = { { .compatible = "fsl,ls1012a-ahci", .data = CEVA_LS1012A }, { .compatible = "fsl,ls1021a-ahci", .data = CEVA_LS1021A }, { .compatible = "fsl,ls1043a-ahci", .data = CEVA_LS1043A }, + { .compatible = "fsl,ls1046a-ahci", .data = CEVA_LS1046A }, { } };
One ls1046a, there is one SATA 3.0 advanced host controller interface which is a high-performance SATA solution that delivers comprehensive and fully-compliant generation 3 (1.5 Gb/s - 6.0 Gb/s) serial ATA capabilities, in accordance with the serial ATA revision 3.0 of Serial ATA International Organization. Add sata node to support this feature.
Signed-off-by: Peng Ma peng.ma@nxp.com --- arch/arm/dts/fsl-ls1046a-qds.dtsi | 4 ++++ arch/arm/dts/fsl-ls1046a-rdb.dts | 4 ++++ arch/arm/dts/fsl-ls1046a.dtsi | 8 ++++++++ 3 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi index ba36853..ada8a85 100644 --- a/arch/arm/dts/fsl-ls1046a-qds.dtsi +++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi @@ -76,3 +76,7 @@ &lpuart0 { status = "okay"; }; + +&sata { + status = "okay"; +}; diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts index 136de24..ba30fd2 100644 --- a/arch/arm/dts/fsl-ls1046a-rdb.dts +++ b/arch/arm/dts/fsl-ls1046a-rdb.dts @@ -39,3 +39,7 @@ reg = <1>; }; }; + +&sata { + status = "okay"; +}; diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi index 7687d12..5ac10e0 100644 --- a/arch/arm/dts/fsl-ls1046a.dtsi +++ b/arch/arm/dts/fsl-ls1046a.dtsi @@ -291,5 +291,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,ls1046a-ahci"; + reg = <0x0 0x3200000 0x0 0x10000>; + interrupts = <0 69 4>; + clocks = <&clockgen 4 1>; + status = "disabled"; + }; }; };
Enable related configs to support sata DM feature.
Signed-off-by: Peng Ma peng.ma@nxp.com --- configs/ls1046ardb_qspi_defconfig | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig index f9660c0..ea2cbb3 100644 --- a/configs/ls1046ardb_qspi_defconfig +++ b/configs/ls1046ardb_qspi_defconfig @@ -48,3 +48,8 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_BLK=y CONFIG_DM_MMC=y +CONFIG_DM_SCSI=y +CONFIG_SATA_CEVA=y +CONFIG_SCSI_AHCI=y +CONFIG_SCSI=y +CONFIG_AHCI=y
Enable related configs to support sata DM feature.
Signed-off-by: Peng Ma peng.ma@nxp.com --- configs/ls1046aqds_defconfig | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig index fad2eed..b09fc88 100644 --- a/configs/ls1046aqds_defconfig +++ b/configs/ls1046aqds_defconfig @@ -51,3 +51,8 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_BLK=y CONFIG_DM_MMC=y +CONFIG_DM_SCSI=y +CONFIG_SATA_CEVA=y +CONFIG_SCSI_AHCI=y +CONFIG_SCSI=y +CONFIG_AHCI=y
On 10/11/18 3:38 AM, Peng Ma wrote:
Add ahci compatible support for ls1046a soc.
Signed-off-by: Peng Ma peng.ma@nxp.com
Please remember to sort defconfig using moveconfig.py in the future. This set is applied to fsl-qoriq master, awaiting upstream. Thanks.
York
Hi York,
got it, thanks.
Best Regards, Peng
-----Original Message----- From: York Sun Sent: 2018年12月11日 5:10 To: Peng Ma peng.ma@nxp.com; u-boot@lists.denx.de Cc: albert.u.boot@aribaud.net; Mingkai Hu mingkai.hu@nxp.com; sumit.garg@nxp.com; Pankaj Bansal pankaj.bansal@nxp.com; Fabio Estevam fabio.estevam@nxp.com; Yinbo Zhu yinbo.zhu@nxp.com; michal.simek@xilinx.com; sjg@chromium.org; Andy Tang andy.tang@nxp.com Subject: Re: [PATCH 1/4] scsi: ceva: add ls1046a soc support
On 10/11/18 3:38 AM, Peng Ma wrote:
Add ahci compatible support for ls1046a soc.
Signed-off-by: Peng Ma peng.ma@nxp.com
Please remember to sort defconfig using moveconfig.py in the future. This set is applied to fsl-qoriq master, awaiting upstream. Thanks.
York
participants (2)
-
Peng Ma -
York Sun