2021-08-06 14:12:06

by Michal Simek

Subject: [PATCH] arm64: zynqmp: Fix serial compatible string

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 <[email protected]>
---

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

2021-08-09 02:03:15

by Laurent Pinchart

Subject: Re: [PATCH] arm64: zynqmp: Fix serial compatible string

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 <[email protected]>

Reviewed-by: Laurent Pinchart <[email protected]>

> ---
>
> 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

2021-08-25 06:23:20

by Michal Simek

Subject: Re: [PATCH] arm64: zynqmp: Fix serial compatible string

pá 6. 8. 2021 v 10:58 odesílatel Michal Simek <[email protected]> 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 <[email protected]>
> ---
>
> 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: http://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