RE: [PATCH v2 4/4] dts/arm64/layerscape: Clean PCIe controller compatible strings
From: Z.q. Hou
Date: Tue Nov 06 2018 - 23:30:35 EST
Hi Leo,
Thanks a lot for your comments!
> -----Original Message-----
> From: Li Yang <leoyang.li@xxxxxxx>
> Sent: 2018å10æ27æ 5:01
> To: Z.q. Hou <zhiqiang.hou@xxxxxxx>
> Cc: moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
> <linux-arm-kernel@xxxxxxxxxxxxxxxxxxx>; lkml <linux-kernel@xxxxxxxxxxxxxxx>;
> linux-pci@xxxxxxxxxxxxxxx; open list:OPEN FIRMWARE AND FLATTENED
> DEVICE TREE BINDINGS <devicetree@xxxxxxxxxxxxxxx>; Rob Herring
> <robh+dt@xxxxxxxxxx>; Shawn Guo <shawnguo@xxxxxxxxxx>; Mark Rutland
> <mark.rutland@xxxxxxx>; Bjorn Helgaas <bhelgaas@xxxxxxxxxx>; Mingkai
> Hu <mingkai.hu@xxxxxxx>; M.h. Lian <minghuan.lian@xxxxxxx>
> Subject: Re: [PATCH v2 4/4] dts/arm64/layerscape: Clean PCIe controller
> compatible strings
>
> On Thu, Oct 25, 2018 at 4:53 AM Z.q. Hou <zhiqiang.hou@xxxxxxx> wrote:
>
> The correct prefix for arm64 dts patches should be: "arm64: dts:
> layerscape: ...", and it should be better to mention the string removed in the
> title too.
Will fix it in v3.
>
> >
> > From: Hou Zhiqiang <Zhiqiang.Hou@xxxxxxx>
> >
> > Removed the wrong compatible string "snps,dw-pcie", in case match
> > incorrect driver.
> >
> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@xxxxxxx>
> > ---
> > V2:
> > - no change
> >
> > arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +-
> > arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +++---
> > arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 +++---
> > arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 6 +++---
> > arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 8 ++++----
> > arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 12 ++++--------
> > 6 files changed, 18 insertions(+), 22 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> > b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> > index 5da732f82fa0..028a6daa5597 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
> > @@ -475,7 +475,7 @@
> > };
> >
> > pcie@3400000 {
> > - compatible = "fsl,ls1012a-pcie",
> "snps,dw-pcie";
> > + compatible = "fsl,ls1012a-pcie";
> > reg = <0x00 0x03400000 0x0 0x00100000
> /* controller registers */
> > 0x40 0x00000000 0x0 0x00002000>;
> /* configuration space */
> > reg-names = "regs", "config"; diff --git
> > a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> > b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> > index 3fed504b5381..5480d6c4c548 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> > @@ -661,7 +661,7 @@
> > };
> >
> > pcie@3400000 {
> > - compatible = "fsl,ls1043a-pcie",
> "snps,dw-pcie";
> > + compatible = "fsl,ls1043a-pcie";
> > reg = <0x00 0x03400000 0x0 0x00100000
> /* controller registers */
> > 0x40 0x00000000 0x0 0x00002000>;
> /* configuration space */
> > reg-names = "regs", "config"; @@ -686,7
> +686,7
> > @@
> > };
> >
> > pcie@3500000 {
> > - compatible = "fsl,ls1043a-pcie",
> "snps,dw-pcie";
> > + compatible = "fsl,ls1043a-pcie";
> > reg = <0x00 0x03500000 0x0 0x00100000
> /* controller registers */
> > 0x48 0x00000000 0x0 0x00002000>;
> /* configuration space */
> > reg-names = "regs", "config"; @@ -711,7
> +711,7
> > @@
> > };
> >
> > pcie@3600000 {
> > - compatible = "fsl,ls1043a-pcie",
> "snps,dw-pcie";
> > + compatible = "fsl,ls1043a-pcie";
> > reg = <0x00 0x03600000 0x0 0x00100000
> /* controller registers */
> > 0x50 0x00000000 0x0 0x00002000>;
> /* configuration space */
> > reg-names = "regs", "config"; diff --git
> > a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> > b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> > index 51cbd50012d6..519315c5d507 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
> > @@ -630,7 +630,7 @@
> > };
> >
> > pcie@3400000 {
> > - compatible = "fsl,ls1046a-pcie",
> "snps,dw-pcie";
> > + compatible = "fsl,ls1046a-pcie";
> > reg = <0x00 0x03400000 0x0 0x00100000
> /* controller registers */
> > 0x40 0x00000000 0x0 0x00002000>;
> /* configuration space */
> > reg-names = "regs", "config"; @@ -655,7
> +655,7
> > @@
> > };
> >
> > pcie@3500000 {
> > - compatible = "fsl,ls1046a-pcie",
> "snps,dw-pcie";
> > + compatible = "fsl,ls1046a-pcie";
> > reg = <0x00 0x03500000 0x0 0x00100000
> /* controller registers */
> > 0x48 0x00000000 0x0 0x00002000>;
> /* configuration space */
> > reg-names = "regs", "config"; @@ -680,7
> +680,7
> > @@
> > };
> >
> > pcie@3600000 {
> > - compatible = "fsl,ls1046a-pcie",
> "snps,dw-pcie";
> > + compatible = "fsl,ls1046a-pcie";
> > reg = <0x00 0x03600000 0x0 0x00100000
> /* controller registers */
> > 0x50 0x00000000 0x0 0x00002000>;
> /* configuration space */
> > reg-names = "regs", "config"; diff --git
> > a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
> > b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
> > index a07f612ab56b..10b253c88a16 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
> > @@ -512,7 +512,7 @@
> > };
> >
> > pcie@3400000 {
> > - compatible = "fsl,ls1088a-pcie",
> "snps,dw-pcie";
> > + compatible = "fsl,ls1088a-pcie";
> > reg = <0x00 0x03400000 0x0 0x00100000
> /* controller registers */
> > 0x20 0x00000000 0x0 0x00002000>;
> /* configuration space */
> > reg-names = "regs", "config"; @@ -536,7
> +536,7
> > @@
> > };
> >
> > pcie@3500000 {
> > - compatible = "fsl,ls1088a-pcie",
> "snps,dw-pcie";
> > + compatible = "fsl,ls1088a-pcie";
> > reg = <0x00 0x03500000 0x0 0x00100000
> /* controller registers */
> > 0x28 0x00000000 0x0 0x00002000>;
> /* configuration space */
> > reg-names = "regs", "config"; @@ -560,7
> +560,7
> > @@
> > };
> >
> > pcie@3600000 {
> > - compatible = "fsl,ls1088a-pcie",
> "snps,dw-pcie";
> > + compatible = "fsl,ls1088a-pcie";
> > reg = <0x00 0x03600000 0x0 0x00100000
> /* controller registers */
> > 0x30 0x00000000 0x0 0x00002000>;
> /* configuration space */
> > reg-names = "regs", "config"; diff --git
> > a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
> > b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
> > index 7c882da3f6b0..a5f668d786b8 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
> > @@ -119,7 +119,7 @@
> > };
> >
> > &pcie1 {
> > - compatible = "fsl,ls2088a-pcie", "snps,dw-pcie";
> > + compatible = "fsl,ls2088a-pcie";
> > reg = <0x00 0x03400000 0x0 0x00100000 /* controller
> registers */
> > 0x20 0x00000000 0x0 0x00002000>; /* configuration
> space
> > */
> >
> > @@ -128,7 +128,7 @@
> > };
> >
> > &pcie2 {
> > - compatible = "fsl,ls2088a-pcie", "snps,dw-pcie";
> > + compatible = "fsl,ls2088a-pcie";
> > reg = <0x00 0x03500000 0x0 0x00100000 /* controller
> registers */
> > 0x28 0x00000000 0x0 0x00002000>; /* configuration
> space
> > */
> >
> > @@ -137,7 +137,7 @@
> > };
> >
> > &pcie3 {
> > - compatible = "fsl,ls2088a-pcie", "snps,dw-pcie";
> > + compatible = "fsl,ls2088a-pcie";
> > reg = <0x00 0x03600000 0x0 0x00100000 /* controller
> registers */
> > 0x30 0x00000000 0x0 0x00002000>; /* configuration
> space
> > */
> >
> > @@ -146,7 +146,7 @@
> > };
> >
> > &pcie4 {
> > - compatible = "fsl,ls2088a-pcie", "snps,dw-pcie";
> > + compatible = "fsl,ls2088a-pcie";
> > reg = <0x00 0x03700000 0x0 0x00100000 /* controller
> registers */
> > 0x38 0x00000000 0x0 0x00002000>; /* configuration
> space
> > */
> >
> > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
> > b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
> > index d188774a36e8..80cc40f76a4a 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
> > @@ -630,8 +630,7 @@
> > };
> >
> > pcie1: pcie@3400000 {
> > - compatible = "fsl,ls2080a-pcie",
> "fsl,ls2085a-pcie",
> > - "snps,dw-pcie";
> > + compatible = "fsl,ls2080a-pcie",
> > + "fsl,ls2085a-pcie";
> > reg-names = "regs", "config";
> > interrupts = <0 108 0x4>; /* Level high type
> */
> > interrupt-names = "intr"; @@ -651,8 +650,7
> @@
> > };
> >
> > pcie2: pcie@3500000 {
> > - compatible = "fsl,ls2080a-pcie",
> "fsl,ls2085a-pcie",
> > - "snps,dw-pcie";
> > + compatible = "fsl,ls2080a-pcie",
> > + "fsl,ls2085a-pcie";
> > reg-names = "regs", "config";
> > interrupts = <0 113 0x4>; /* Level high type
> */
> > interrupt-names = "intr"; @@ -672,8 +670,7
> @@
> > };
> >
> > pcie3: pcie@3600000 {
> > - compatible = "fsl,ls2080a-pcie",
> "fsl,ls2085a-pcie",
> > - "snps,dw-pcie";
> > + compatible = "fsl,ls2080a-pcie",
> > + "fsl,ls2085a-pcie";
> > reg-names = "regs", "config";
> > interrupts = <0 118 0x4>; /* Level high type
> */
> > interrupt-names = "intr"; @@ -693,8 +690,7
> @@
> > };
> >
> > pcie4: pcie@3700000 {
> > - compatible = "fsl,ls2080a-pcie",
> "fsl,ls2085a-pcie",
> > - "snps,dw-pcie";
> > + compatible = "fsl,ls2080a-pcie",
> > + "fsl,ls2085a-pcie";
> > reg-names = "regs", "config";
> > interrupts = <0 123 0x4>; /* Level high type
> */
> > interrupt-names = "intr";
> > --
> > 2.17.1
> >
Thanks,
Zhiqiang