dt-bindings: ahci-fsl-qoriq: add lx2160a chip name to the list
Subsystems (3)
PATCH v6 1/3 dt-bindings: ahci-fsl-qoriq: add lx2160a chip name to the list
Add lx2160a compatible to bindings documentation.
---
changed for V6:
- no changed
.../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt +1 -1
@@ -3,7 +3,7 @@ Binding for Freescale QorIQ AHCI SATA Controller Required properties: - reg: Physical base address and size of the controller's register area. - compatible: Compatibility string. Must be 'fsl,<chip>-ahci', where - chip could be ls1021a, ls1043a, ls1046a, ls1088a, ls2080a etc. + chip could be ls1021a, ls1043a, ls1046a, ls1088a, ls2080a, lx2160a, etc. - clocks: Input clock specifier. Refer to common clock bindings. - interrupts: Interrupt specifier. Refer to interrupt binding.
Signature · 1 line
1.7.1
PATCH v6 2/3 arm64: dts: lx2160a: add sata node support
Add SATA device nodes for fsl-lx2160a and enable support for QDS and RDB boards.
---
changed for V6:
- no change
arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 16 +++++++ arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 16 +++++++ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 44 +++++++++++++++++++++ 3 files changed, 76 insertions(+), 0 deletions(-)
arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts +16 -0
@@ -95,6 +95,22 @@ }; }; +&sata0 { + status = "okay"; +}; + +&sata1 { + status = "okay"; +}; + +&sata2 { + status = "okay"; +}; + +&sata3 { + status = "okay"; +}; + &uart0 { status = "okay"; };
arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts +16 -0
@@ -102,6 +102,22 @@ }; }; +&sata0 { + status = "okay"; +}; + +&sata1 { + status = "okay"; +}; + +&sata2 { + status = "okay"; +}; + +&sata3 { + status = "okay"; +}; + &uart0 { status = "okay"; };
arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +44 -0
50 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v6 3/3 ahci: qoriq: add lx2160 platforms support
In reply to Peng MaLx2160a is a new introduced soc which supports ATA3.0
---
changed for V6:
- Add ecc_initialized to ensure set sata bit once of ECC error register
- Recovery AHCI_LS2088A platform
drivers/ata/ahci_qoriq.c | 52 +++++++++++++++++++++++++++++++--------------- 1 files changed, 35 insertions(+), 17 deletions(-)
drivers/ata/ahci_qoriq.c +35 -17
@@ -58,6 +58,7 @@ enum ahci_qoriq_type {AHCI_LS1046A ,AHCI_LS1088A ,AHCI_LS2088A , + AHCI_LX2160A, }; struct ahci_qoriq_priv {
@@ -67,6 +68,8 @@ struct ahci_qoriq_priv {bool is_dmacoherent; }; +static bool ecc_initialized; +static const struct of_device_id ahci_qoriq_of_match[] = { { .compatible ="fsl,ls1021a-ahci" , .data = (void *)AHCI_LS1021A }, { .compatible ="fsl,ls1043a-ahci" , .data = (void *)AHCI_LS1043A },
@@ -74,6 +77,7 @@ struct ahci_qoriq_priv { { .compatible = "fsl,ls1046a-ahci", .data = (void *)AHCI_LS1046A}, { .compatible = "fsl,ls1088a-ahci", .data = (void *)AHCI_LS1088A}, { .compatible = "fsl,ls2088a-ahci", .data = (void *)AHCI_LS2088A}, + { .compatible = "fsl,lx2160a-ahci", .data = (void *)AHCI_LX2160A}, {}, };MODULE_DEVICE_TABLE (of, ahci_qoriq_of_match);
@@ -165,9 +169,10 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)switch (qpriv->type) {case AHCI_LS1021A : -if (!qpriv->ecc_addr) +if (!(qpriv->ecc_addr || ecc_initialized))return -EINVAL ; -writel (SATA_ECC_DISABLE , qpriv->ecc_addr); +else if (qpriv->ecc_addr && !ecc_initialized) +writel (SATA_ECC_DISABLE , qpriv->ecc_addr);writel (AHCI_PORT_PHY_1_CFG , reg_base +PORT_PHY1 );writel (LS1021A_PORT_PHY2 , reg_base +PORT_PHY2 );writel (LS1021A_PORT_PHY3 , reg_base +PORT_PHY3 );
@@ -180,10 +185,12 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)break ;case AHCI_LS1043A : -if (!qpriv->ecc_addr) +if (!(qpriv->ecc_addr || ecc_initialized))return -EINVAL ; -writel (readl (qpriv->ecc_addr) |ECC_DIS_ARMV8_CH2 , - qpriv->ecc_addr); +else if (qpriv->ecc_addr && !ecc_initialized) +writel (readl (qpriv->ecc_addr) | +ECC_DIS_ARMV8_CH2 , + qpriv->ecc_addr);writel (AHCI_PORT_PHY_1_CFG , reg_base +PORT_PHY1 );writel (AHCI_PORT_PHY2_CFG , reg_base +PORT_PHY2 );writel (AHCI_PORT_PHY3_CFG , reg_base +PORT_PHY3 );
@@ -202,10 +209,12 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)break ;case AHCI_LS1046A : -if (!qpriv->ecc_addr) +if (!(qpriv->ecc_addr || ecc_initialized))return -EINVAL ; -writel (readl (qpriv->ecc_addr) |ECC_DIS_ARMV8_CH2 , - qpriv->ecc_addr); +else if (qpriv->ecc_addr && !ecc_initialized) +writel (readl (qpriv->ecc_addr) | +ECC_DIS_ARMV8_CH2 , + qpriv->ecc_addr);writel (AHCI_PORT_PHY_1_CFG , reg_base +PORT_PHY1 );writel (AHCI_PORT_PHY2_CFG , reg_base +PORT_PHY2 );writel (AHCI_PORT_PHY3_CFG , reg_base +PORT_PHY3 );
@@ -215,10 +224,13 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)break ;case AHCI_LS1088A : -if (!qpriv->ecc_addr) +case AHCI_LX2160A : +if (!(qpriv->ecc_addr || ecc_initialized))return -EINVAL ; -writel (readl (qpriv->ecc_addr) |ECC_DIS_LS1088A , - qpriv->ecc_addr); +else if (qpriv->ecc_addr && !ecc_initialized) +writel (readl (qpriv->ecc_addr) | +ECC_DIS_LS1088A , + qpriv->ecc_addr);writel (AHCI_PORT_PHY_1_CFG , reg_base +PORT_PHY1 );writel (AHCI_PORT_PHY2_CFG , reg_base +PORT_PHY2 );writel (AHCI_PORT_PHY3_CFG , reg_base +PORT_PHY3 );
@@ -237,6 +249,7 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)break ; } + ecc_initialized = true;return 0 ; }
@@ -264,13 +277,18 @@ static int ahci_qoriq_probe(struct platform_device *pdev) qoriq_priv->type = (enum ahci_qoriq_type )of_id->data; - res =platform_get_resource_byname (pdev,IORESOURCE_MEM , -"sata-ecc" ); -if (res) { - qoriq_priv->ecc_addr =devm_ioremap_resource (dev, res); -if (IS_ERR (qoriq_priv->ecc_addr)) -return PTR_ERR (qoriq_priv->ecc_addr); +if (unlikely (!ecc_initialized)) { + res =platform_get_resource_byname (pdev, +IORESOURCE_MEM , +"sata-ecc" ); +if (res) { + qoriq_priv->ecc_addr = +devm_ioremap_resource (dev, res); +if (IS_ERR (qoriq_priv->ecc_addr)) +return PTR_ERR (qoriq_priv->ecc_addr); + } } + qoriq_priv->is_dmacoherent =of_dma_is_coherent (np); rc =ahci_platform_enable_resources (hpriv);
Signature · 1 line
1.7.1
Rob Herring
maintainerQuoted 10 lines · Peng Ma
Add lx2160a compatible to bindings documentation.
Signed-off-by Peng Ma <[email protected]>---
changed for V6:
- no changed.../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Please add Acked-by/Reviewed-by tags when posting new versions. However, there's no need to repost patches *only* to add the tags. The upstream maintainer will do that for acks received on the version they apply.
If a tag was not added on purpose, please state why and what changed.
Hi Rob,
Thanks for your comments, I don't understand what you said.
This patch is one of the series patchs(http://patchwork.ozlabs.org/project/linux-ide/list/?series=93099&archive=both&state=*) for review. There is not changed for 6th version of this patch.
Best Regards,
Peng
Quoted 24 lines
-----Original Message-----
From: Rob Herring <[email protected]>
Sent: 2019年2月22日 22:40
To: Peng Ma <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Leo Li <[email protected]>; Andy Tang <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Mian Yousaf Kaukab <[email protected]>; Peng Ma <[email protected]>
Subject: Re: [v6 1/3] dt-bindings: ahci-fsl-qoriq: add lx2160a chip name to the listQuoted 10 lines · Peng Ma
Add lx2160a compatible to bindings documentation.
Signed-off-by Peng Ma <[email protected]>---
changed for V6:
- no changed.../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Quoted 5 lines
Please add Acked-by/Reviewed-by tags when posting new versions. However, there's no need to repost patches *only* to add the tags. The upstream maintainer will do that for acks received on the version they apply.
If a tag was not added on purpose, please state why and what changed.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Rob Herring
maintainerQuoted 2 lines · Peng Ma
Hi Rob,
Please don't top post to mail lists.
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?
Quoted 4 lines
Thanks for your comments, I don't understand what you said.
This patch is one of the series patchs(http://patchwork.ozlabs.org/project/linux-ide/list/?series=93099&archive=both&state=*) for review. There is not changed for 6th version of this patch.
I reviewed v5 and gave my Reviewed-by. When you posted v6, you should have added the tag so the maintainer applying this series doesn't have to look at prior versions to collect tags and so I don't have to review this again and can ignore it.
Rob