From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 158F9C433F5 for ; Tue, 9 Nov 2021 22:18:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC585619EA for ; Tue, 9 Nov 2021 22:18:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DC585619EA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JTgigNlJdkI6LUMn0c/xau0WjEhbEOQshJ5hjb/Qg7I=; b=brPUe4IQk4fM8u oTgbsw2oFYcKw2HRl1UEJmLEIdTrmF5PJEK3t2F2G0ZlXO/UGMMO6ko7u1wxF5y78GaYXSFHkjqyQ sLoAKlRY0R6YwfLHlhYD8/jn/6y8o+V09w6fGlLXQAWtEf/ZoSC8Fg77yR998UVDrpgWnsjCxKVjL 8hHcKyoYYSYNLYbbx2xrXz+5s5Ck3Cbu30NE4eUyjFyoHh2Ntk6sv7ZAGnhSbe5DLNAWsJEOAy/WD rZvSugyFSmTgIES/0U+Gu0bhdLhUzcR5Z+FQ9ghjOAhqrSW/hRZb+6ILkKGBhygm1YiQHcffLhtPO OTc3/bTkLOAcQyRETzqw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkZQJ-003LEr-5M; Tue, 09 Nov 2021 22:16:59 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkZQ6-003LCA-Sy for linux-arm-kernel@lists.infradead.org; Tue, 09 Nov 2021 22:16:48 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4767461221; Tue, 9 Nov 2021 22:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636496206; bh=kPxX8Ibz8j/DEU/LjYZR6lYgG89AyU+9mad55ZEPNCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E/jFls9qUZYnd3IUTQpNwNd4YH6JDHVlkj4M688cr4tVgT9nlgrusgbOAG8YRl23g ybeDYqbELeR1mLpb4Ct8h16AT6Y1AopDi9gZhb2yK+cahueuQxdQEMm0wTSlmzWkMH Uw1x5N4154TY3j5XSZlGloVj9Lu/eB4AhoMO2DJe7pqmPpBCSI4nCQRYUNYkr7BfXC Ev34Qq1U5YRCESZGva/AwviKe46aYmmAjUY2Fw4J0nTdUwy7DCkLZRzt3dlNmM9NXu 0Fq47Dzztmto6Ke78h6i1L+chFLLqi0QQ1waI1XiLF7ZAsjLLN/IlkcPCXcXXG/H8q 916Azc8eZulHA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michal Simek , Laurent Pinchart , Sasha Levin , 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.15 02/82] arm64: zynqmp: Fix serial compatible string Date: Tue, 9 Nov 2021 17:15:20 -0500 Message-Id: <20211109221641.1233217-2-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211109221641.1233217-1-sashal@kernel.org> References: <20211109221641.1233217-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211109_141646_975641_551D249A X-CRM114-Status: UNSURE ( 9.56 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Michal Simek [ 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 Reviewed-by: Laurent Pinchart Link: https://lore.kernel.org/r/89b36e0a6187cc6b05b27a035efdf79173bd4486.1628240307.git.michal.simek@xilinx.com Signed-off-by: Sasha Levin --- 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 28dccb891a535..8278876ad33fa 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -792,7 +792,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>; @@ -802,7 +802,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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel