* [PATCHv2 1/2] PCI: layerscape: Add support for ls2088a
2017-08-04 6:41 [PATCHv2 0/2] PCI: add ls2088a and ls1088a support Zhiqiang Hou
@ 2017-08-04 6:41 ` Zhiqiang Hou
2017-08-04 6:41 ` [PATCHv2 2/2] PCI: layerscape: Add support for ls1088a Zhiqiang Hou
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Zhiqiang Hou @ 2017-08-04 6:41 UTC (permalink / raw)
To: linux-pci, linux-arm-kernel, bhelgaas, robh+dt
Cc: shawnguo, minghuan.lian, Hou Zhiqiang
From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
The ls2088a pcie controller's some registers address are different
from ls2080a, so add a match entry to identify ls2088a pcie.
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
V2:
- Removed "fsl,ls1088a-pcie" from the layerscape-pci binding doc.
Documentation/devicetree/bindings/pci/layerscape-pci.txt | 1 +
drivers/pci/dwc/pci-layerscape.c | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
index ee1c72d5..2057b00 100644
--- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
+++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
@@ -15,6 +15,7 @@ Required properties:
- compatible: should contain the platform identifier such as:
"fsl,ls1021a-pcie", "snps,dw-pcie"
"fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
+ "fsl,ls2088a-pcie"
"fsl,ls1046a-pcie"
- reg: base addresses and lengths of the PCIe controller
- interrupts: A list of interrupt outputs of the controller. Must contain an
diff --git a/drivers/pci/dwc/pci-layerscape.c b/drivers/pci/dwc/pci-layerscape.c
index bf52825..5989ae1 100644
--- a/drivers/pci/dwc/pci-layerscape.c
+++ b/drivers/pci/dwc/pci-layerscape.c
@@ -240,12 +240,21 @@ static struct ls_pcie_drvdata ls2080_drvdata = {
.dw_pcie_ops = &dw_ls_pcie_ops,
};
+static struct ls_pcie_drvdata ls2088_drvdata = {
+ .lut_offset = 0x80000,
+ .ltssm_shift = 0,
+ .lut_dbg = 0x407fc,
+ .ops = &ls_pcie_host_ops,
+ .dw_pcie_ops = &dw_ls_pcie_ops,
+};
+
static const struct of_device_id ls_pcie_of_match[] = {
{ .compatible = "fsl,ls1021a-pcie", .data = &ls1021_drvdata },
{ .compatible = "fsl,ls1043a-pcie", .data = &ls1043_drvdata },
{ .compatible = "fsl,ls1046a-pcie", .data = &ls1046_drvdata },
{ .compatible = "fsl,ls2080a-pcie", .data = &ls2080_drvdata },
{ .compatible = "fsl,ls2085a-pcie", .data = &ls2080_drvdata },
+ { .compatible = "fsl,ls2088a-pcie", .data = &ls2088_drvdata },
{ },
};
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCHv2 2/2] PCI: layerscape: Add support for ls1088a
2017-08-04 6:41 [PATCHv2 0/2] PCI: add ls2088a and ls1088a support Zhiqiang Hou
2017-08-04 6:41 ` [PATCHv2 1/2] PCI: layerscape: Add support for ls2088a Zhiqiang Hou
@ 2017-08-04 6:41 ` Zhiqiang Hou
2017-08-15 22:58 ` [PATCHv2 0/2] PCI: add ls2088a and ls1088a support Bjorn Helgaas
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Zhiqiang Hou @ 2017-08-04 6:41 UTC (permalink / raw)
To: linux-pci, linux-arm-kernel, bhelgaas, robh+dt
Cc: shawnguo, minghuan.lian, Hou Zhiqiang
From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
V2:
- New patch
Documentation/devicetree/bindings/pci/layerscape-pci.txt | 1 +
drivers/pci/dwc/pci-layerscape.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
index 2057b00..ebf3fef 100644
--- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
+++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
@@ -16,6 +16,7 @@ Required properties:
"fsl,ls1021a-pcie", "snps,dw-pcie"
"fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
"fsl,ls2088a-pcie"
+ "fsl,ls1088a-pcie"
"fsl,ls1046a-pcie"
- reg: base addresses and lengths of the PCIe controller
- interrupts: A list of interrupt outputs of the controller. Must contain an
diff --git a/drivers/pci/dwc/pci-layerscape.c b/drivers/pci/dwc/pci-layerscape.c
index 5989ae1..cdb9800 100644
--- a/drivers/pci/dwc/pci-layerscape.c
+++ b/drivers/pci/dwc/pci-layerscape.c
@@ -255,6 +255,7 @@ static const struct of_device_id ls_pcie_of_match[] = {
{ .compatible = "fsl,ls2080a-pcie", .data = &ls2080_drvdata },
{ .compatible = "fsl,ls2085a-pcie", .data = &ls2080_drvdata },
{ .compatible = "fsl,ls2088a-pcie", .data = &ls2088_drvdata },
+ { .compatible = "fsl,ls1088a-pcie", .data = &ls2088_drvdata },
{ },
};
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCHv2 0/2] PCI: add ls2088a and ls1088a support
2017-08-04 6:41 [PATCHv2 0/2] PCI: add ls2088a and ls1088a support Zhiqiang Hou
2017-08-04 6:41 ` [PATCHv2 1/2] PCI: layerscape: Add support for ls2088a Zhiqiang Hou
2017-08-04 6:41 ` [PATCHv2 2/2] PCI: layerscape: Add support for ls1088a Zhiqiang Hou
@ 2017-08-15 22:58 ` Bjorn Helgaas
2017-08-29 22:19 ` Bjorn Helgaas
2017-08-30 2:57 ` Bjorn Helgaas
4 siblings, 0 replies; 7+ messages in thread
From: Bjorn Helgaas @ 2017-08-15 22:58 UTC (permalink / raw)
To: Zhiqiang Hou
Cc: linux-pci, Roy Zang, minghuan.lian, robh+dt, bhelgaas, Mingkai Hu,
shawnguo, linux-arm-kernel
[+cc Mingkai, Roy]
On Fri, Aug 04, 2017 at 02:41:32PM +0800, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
>
> Hou Zhiqiang (2):
> PCI: layerscape: Add support for ls2088a
> PCI: layerscape: Add support for ls1088a
>
> Documentation/devicetree/bindings/pci/layerscape-pci.txt | 2 ++
> drivers/pci/dwc/pci-layerscape.c | 10 ++++++++++
> 2 files changed, 12 insertions(+)
I'll wait to apply this until we get the other series (with the class
code fixes and the layerscape host_init functions) merged. We also
need an ack from Minghuan, Mingkai, or Roy.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2 0/2] PCI: add ls2088a and ls1088a support
2017-08-04 6:41 [PATCHv2 0/2] PCI: add ls2088a and ls1088a support Zhiqiang Hou
` (2 preceding siblings ...)
2017-08-15 22:58 ` [PATCHv2 0/2] PCI: add ls2088a and ls1088a support Bjorn Helgaas
@ 2017-08-29 22:19 ` Bjorn Helgaas
2017-08-30 1:37 ` M.h. Lian
2017-08-30 2:57 ` Bjorn Helgaas
4 siblings, 1 reply; 7+ messages in thread
From: Bjorn Helgaas @ 2017-08-29 22:19 UTC (permalink / raw)
To: Zhiqiang Hou
Cc: Minghuan Lian, linux-pci, Roy Zang, minghuan.lian, robh+dt,
bhelgaas, Mingkai Hu, shawnguo, linux-arm-kernel
[+cc Minghuan, Mingkai, Roy]
On Fri, Aug 04, 2017 at 02:41:32PM +0800, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
>
> Hou Zhiqiang (2):
> PCI: layerscape: Add support for ls2088a
> PCI: layerscape: Add support for ls1088a
>
> Documentation/devicetree/bindings/pci/layerscape-pci.txt | 2 ++
> drivers/pci/dwc/pci-layerscape.c | 10 ++++++++++
> 2 files changed, 12 insertions(+)
These still apply cleanly, but I haven't seen an ack from the driver
maintainers.
Bjorn
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread* RE: [PATCHv2 0/2] PCI: add ls2088a and ls1088a support
2017-08-29 22:19 ` Bjorn Helgaas
@ 2017-08-30 1:37 ` M.h. Lian
0 siblings, 0 replies; 7+ messages in thread
From: M.h. Lian @ 2017-08-30 1:37 UTC (permalink / raw)
To: Bjorn Helgaas, Z.q. Hou
Cc: M.h. Lian, linux-pci@vger.kernel.org, Roy Zang,
robh+dt@kernel.org, bhelgaas@google.com, Mingkai Hu,
shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org
Hi Bjorn,
Thanks a lot.
Acked-by: Minghuan Lian <minghuan.Lian@nxp.com>
Thanks,
Minghuan
> -----Original Message-----
> From: Bjorn Helgaas [mailto:helgaas@kernel.org]
> Sent: Wednesday, August 30, 2017 6:20 AM
> To: Z.q. Hou <zhiqiang.hou@nxp.com>
> Cc: linux-pci@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> bhelgaas@google.com; robh+dt@kernel.org; M.h. Lian
> <minghuan.lian@nxp.com>; shawnguo@kernel.org; Minghuan Lian
> <minghuan.Lian@freescale.com>; Mingkai Hu <mingkai.hu@freescale.com>;
> Roy Zang <tie-fei.zang@freescale.com>
> Subject: Re: [PATCHv2 0/2] PCI: add ls2088a and ls1088a support
>
> [+cc Minghuan, Mingkai, Roy]
>
> On Fri, Aug 04, 2017 at 02:41:32PM +0800, Zhiqiang Hou wrote:
> > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> >
> > Hou Zhiqiang (2):
> > PCI: layerscape: Add support for ls2088a
> > PCI: layerscape: Add support for ls1088a
> >
> > Documentation/devicetree/bindings/pci/layerscape-pci.txt | 2 ++
> > drivers/pci/dwc/pci-layerscape.c | 10 ++++++++++
> > 2 files changed, 12 insertions(+)
>
> These still apply cleanly, but I haven't seen an ack from the driver maintainers.
>
> Bjorn
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2 0/2] PCI: add ls2088a and ls1088a support
2017-08-04 6:41 [PATCHv2 0/2] PCI: add ls2088a and ls1088a support Zhiqiang Hou
` (3 preceding siblings ...)
2017-08-29 22:19 ` Bjorn Helgaas
@ 2017-08-30 2:57 ` Bjorn Helgaas
4 siblings, 0 replies; 7+ messages in thread
From: Bjorn Helgaas @ 2017-08-30 2:57 UTC (permalink / raw)
To: Zhiqiang Hou
Cc: linux-pci, linux-arm-kernel, bhelgaas, robh+dt, minghuan.lian,
shawnguo
On Fri, Aug 04, 2017 at 02:41:32PM +0800, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
>
> Hou Zhiqiang (2):
> PCI: layerscape: Add support for ls2088a
> PCI: layerscape: Add support for ls1088a
>
> Documentation/devicetree/bindings/pci/layerscape-pci.txt | 2 ++
> drivers/pci/dwc/pci-layerscape.c | 10 ++++++++++
> 2 files changed, 12 insertions(+)
Applied with Minghuan's ack to pci/host-layerscape for v4.14, thanks!
^ permalink raw reply [flat|nested] 7+ messages in thread