| Message ID | 89b36e0a6187cc6b05b27a035efdf79173bd4486.1628240307.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 812fa2f0e9d33564bd0131a69750e0d165f4c82a |
| Headers | show |
| Series | arm64: zynqmp: Fix serial compatible string | expand |
Hi Michal, Thank you for the patch. On Fri, Aug 06, 2021 at 10:58:29AM +0200, Michal Simek wrote: > Based on commit 65a2c14d4f00 ("dt-bindings: serial: convert Cadence UART > bindings to YAML") compatible string should look like differently that's > why fix it to be aligned with dt binding. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > > arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > index 6f0fcec28ae2..b5fde9dddca5 100644 > --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > @@ -786,7 +786,7 @@ ttc3: timer@ff140000 { > }; > > uart0: serial@ff000000 { > - compatible = "cdns,uart-r1p12", "xlnx,xuartps"; > + compatible = "xlnx,zynqmp-uart", "cdns,uart-r1p12"; > status = "disabled"; > interrupt-parent = <&gic>; > interrupts = <0 21 4>; > @@ -796,7 +796,7 @@ uart0: serial@ff000000 { > }; > > uart1: serial@ff010000 { > - compatible = "cdns,uart-r1p12", "xlnx,xuartps"; > + compatible = "xlnx,zynqmp-uart", "cdns,uart-r1p12"; > status = "disabled"; > interrupt-parent = <&gic>; > interrupts = <0 22 4>; -- Regards, Laurent Pinchart
pá 6. 8. 2021 v 10:58 odesílatel Michal Simek <michal.simek@xilinx.com> napsal: > > Based on commit 65a2c14d4f00 ("dt-bindings: serial: convert Cadence UART > bindings to YAML") compatible string should look like differently that's > why fix it to be aligned with dt binding. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > index 6f0fcec28ae2..b5fde9dddca5 100644 > --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > @@ -786,7 +786,7 @@ ttc3: timer@ff140000 { > }; > > uart0: serial@ff000000 { > - compatible = "cdns,uart-r1p12", "xlnx,xuartps"; > + compatible = "xlnx,zynqmp-uart", "cdns,uart-r1p12"; > status = "disabled"; > interrupt-parent = <&gic>; > interrupts = <0 21 4>; > @@ -796,7 +796,7 @@ uart0: serial@ff000000 { > }; > > uart1: serial@ff010000 { > - compatible = "cdns,uart-r1p12", "xlnx,xuartps"; > + compatible = "xlnx,zynqmp-uart", "cdns,uart-r1p12"; > status = "disabled"; > interrupt-parent = <&gic>; > interrupts = <0 22 4>; > -- > 2.32.0 > Applied. M -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 6f0fcec28ae2..b5fde9dddca5 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -786,7 +786,7 @@ ttc3: timer@ff140000 { }; uart0: serial@ff000000 { - compatible = "cdns,uart-r1p12", "xlnx,xuartps"; + compatible = "xlnx,zynqmp-uart", "cdns,uart-r1p12"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 21 4>; @@ -796,7 +796,7 @@ uart0: serial@ff000000 { }; uart1: serial@ff010000 { - compatible = "cdns,uart-r1p12", "xlnx,xuartps"; + compatible = "xlnx,zynqmp-uart", "cdns,uart-r1p12"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 22 4>;
Based on commit 65a2c14d4f00 ("dt-bindings: serial: convert Cadence UART bindings to YAML") compatible string should look like differently that's why fix it to be aligned with dt binding. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)