From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Michal Simek <michal.simek@xilinx.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Sasha Levin <sashal@kernel.org>,
robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
ijc+devicetree@hellion.org.uk, galak@codeaurora.org,
catalin.marinas@arm.com, will.deacon@arm.com,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 5.4 02/30] arm64: zynqmp: Fix serial compatible string
Date: Tue, 9 Nov 2021 17:21:56 -0500 [thread overview]
Message-ID: <20211109222224.1235388-2-sashal@kernel.org> (raw)
In-Reply-To: <20211109222224.1235388-1-sashal@kernel.org>
From: Michal Simek <michal.simek@xilinx.com>
[ Upstream commit 812fa2f0e9d33564bd0131a69750e0d165f4c82a ]
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>
Link: https://lore.kernel.org/r/89b36e0a6187cc6b05b27a035efdf79173bd4486.1628240307.git.michal.simek@xilinx.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 a2645262f8623..b92549fb32400 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -582,7 +582,7 @@
};
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>;
@@ -591,7 +591,7 @@
};
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.33.0
next prev parent reply other threads:[~2021-11-09 22:36 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-09 22:21 [PATCH AUTOSEL 5.4 01/30] arm64: zynqmp: Do not duplicate flash partition label property Sasha Levin
2021-11-09 22:21 ` Sasha Levin [this message]
2021-11-09 22:21 ` [PATCH AUTOSEL 5.4 03/30] ARM: dts: NSP: Fix mpcore, mmc node names Sasha Levin
2021-11-09 22:21 ` [PATCH AUTOSEL 5.4 04/30] scsi: lpfc: Fix list_add() corruption in lpfc_drain_txq() Sasha Levin
2021-11-09 22:21 ` [PATCH AUTOSEL 5.4 05/30] arm64: dts: hisilicon: fix arm,sp805 compatible string Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 06/30] arm64: dts: rockchip: add Coresight debug range for RK3399 Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 07/30] RDMA/bnxt_re: Check if the vlan is valid before reporting Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 08/30] usb: musb: tusb6010: check return value after calling platform_get_resource() Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 09/30] usb: typec: tipd: Remove WARN_ON in tps6598x_block_read Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 10/30] arm64: dts: qcom: msm8998: Fix CPU/L2 idle state latency and residency Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 11/30] arm64: dts: qcom: msm8916: Add unit name for /soc node Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 12/30] arm64: dts: freescale: fix arm,sp805 compatible string Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 13/30] ASoC: SOF: Intel: hda-dai: fix potential locking issue Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 14/30] clk: imx: imx6ul: Move csi_sel mux to correct base register Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 15/30] ASoC: nau8824: Add DMI quirk mechanism for active-high jack-detect Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 16/30] scsi: advansys: Fix kernel pointer leak Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 17/30] firmware_loader: fix pre-allocated buf built-in firmware use Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 18/30] ARM: dts: omap: fix gpmc,mux-add-data type Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 19/30] usb: host: ohci-tmio: check return value after calling platform_get_resource() Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 20/30] ARM: dts: ls1021a: move thermal-zones node out of soc/ Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 21/30] ARM: dts: ls1021a-tsn: use generic "jedec,spi-nor" compatible for flash Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 22/30] ALSA: ISA: not for M68K Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 23/30] tty: tty_buffer: Fix the softlockup issue in flush_to_ldisc Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 24/30] MIPS: sni: Fix the build Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 25/30] scsi: target: Fix ordered tag handling Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 26/30] scsi: target: Fix alua_tg_pt_gps_count tracking Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 27/30] iio: imu: st_lsm6dsx: Avoid potential array overflow in st_lsm6dsx_set_odr() Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 28/30] powerpc/5200: dts: fix memory node unit name Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 29/30] ALSA: gus: fix null pointer dereference on pointer block Sasha Levin
2021-11-09 22:22 ` [PATCH AUTOSEL 5.4 30/30] powerpc/dcr: Use cmplwi instead of 3-argument cmpli Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211109222224.1235388-2-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=michal.simek@xilinx.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=stable@vger.kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).