From patchwork Tue Mar 28 15:37:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Caron X-Patchwork-Id: 13191305 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CF4DEC77B62 for ; Tue, 28 Mar 2023 15:38:51 +0000 (UTC) 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=+MWY68cQEiGfY2bgk/O/3Djsb/37QNbO/IZQwU/kstE=; b=m3qhCBhAHaWYRr mgdms31Y6bVdd+yOure5Re/6oOrTP40CkRd6KnVVuJOfZKxnlX7ipwMaFbvIoruIntL246JscyVvt OIex6qI8euSjuYI446obSxkaDt+leZuloB9Nncx7Q/g1lvE5IW1xEBBsLlHqsKBUA6iFXdNXx6SUp hfFbGVFIoCltiWZ1ZSESk1T1XkrjKOMKdEGxfjCX5qjAYSojJpV0lhbw5l4NGSFcrKASwWbhsESWK ivrTWz8GcH7f12efr1haZWC1n2RUoTwvixWfXz1SP2kOfzmRUiZHHt6IunVbDEQ8q8cZTwgUN5B4I 25PahMRLQQLMYsD1OcgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phBOc-00ExbM-2b; Tue, 28 Mar 2023 15:38:02 +0000 Received: from mx07-00178001.pphosted.com ([185.132.182.106]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1phBOQ-00ExWr-0i for linux-arm-kernel@lists.infradead.org; Tue, 28 Mar 2023 15:37:51 +0000 Received: from pps.filterd (m0241204.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32SE37H0016277; Tue, 28 Mar 2023 17:37:38 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=selector1; bh=+2s3HinxEFYlnrVOOc1wZG7xm3r63KTSzXlu+4OWoMY=; b=xOrIHT/yJ3WS5CO8Jip6a0ikT5GTWdQlmJUO+ykXn13kh6+Nl8vBnGc84vopsTxep3AM Qs/QnNOy7vuOY+hOTtW9Bcr/PlLUB3/FGTUM043Rapt/S1GC28DrbcqzWBCVbUF8k/e3 V0Mu/NMg7mWI2rxf8npzPL813ObFi7mX6Xs39wMw2CxGGlLzRJcxx7iQU0RUiv4h7agd zuiaf1GaguKpyunLhYV5xBNhXV5Wwye8UQAf6MdcPfTlZXLsxqYCm6CfvfF3SZOY8pFb H5uO91+n8nPq7way3Mfj3iraOC//wIdlPOqkmAIFezFrHr0mK2jGCilnhs4DWoLKbOZ/ YQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3pkwvsaamx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Mar 2023 17:37:38 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id DDDF410002A; Tue, 28 Mar 2023 17:37:37 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node1.st.com [10.75.129.69]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id D65462194F9; Tue, 28 Mar 2023 17:37:37 +0200 (CEST) Received: from localhost (10.201.20.168) by SHFDAG1NODE1.st.com (10.75.129.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Tue, 28 Mar 2023 17:37:37 +0200 From: Valentin Caron To: Alexandre Torgue CC: Rob Herring , Krzysztof Kozlowski , Maxime Coquelin , Valentin Caron , , , , Subject: [PATCH v2 2/6] ARM: dts: stm32: clean uart aliases on stm32mp15xx-dkx boards Date: Tue, 28 Mar 2023 17:37:19 +0200 Message-ID: <20230328153723.498672-3-valentin.caron@foss.st.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230328153723.498672-1-valentin.caron@foss.st.com> References: <20230328153723.498672-1-valentin.caron@foss.st.com> MIME-Version: 1.0 X-Originating-IP: [10.201.20.168] X-ClientProxiedBy: EQNCAS1NODE3.st.com (10.75.129.80) To SHFDAG1NODE1.st.com (10.75.129.69) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-28_02,2023-02-09_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230328_083750_554793_DCD26D46 X-CRM114-Status: GOOD ( 16.97 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remove duplicates and clean uart aliases. Uart aliases and uart pins should be declared and associated to uart instance at the same time. Signed-off-by: Valentin Caron --- arch/arm/boot/dts/stm32mp157a-dk1.dts | 3 --- arch/arm/boot/dts/stm32mp157c-dk2.dts | 3 --- arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 6 ++++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/stm32mp157a-dk1.dts b/arch/arm/boot/dts/stm32mp157a-dk1.dts index 4c8be9c8eb20..0da3667ab1e0 100644 --- a/arch/arm/boot/dts/stm32mp157a-dk1.dts +++ b/arch/arm/boot/dts/stm32mp157a-dk1.dts @@ -17,9 +17,6 @@ / { aliases { ethernet0 = ðernet0; - serial0 = &uart4; - serial1 = &usart3; - serial2 = &uart7; }; chosen { diff --git a/arch/arm/boot/dts/stm32mp157c-dk2.dts b/arch/arm/boot/dts/stm32mp157c-dk2.dts index 2bc92ef3aeb9..ab13e340f4ef 100644 --- a/arch/arm/boot/dts/stm32mp157c-dk2.dts +++ b/arch/arm/boot/dts/stm32mp157c-dk2.dts @@ -18,9 +18,6 @@ / { aliases { ethernet0 = ðernet0; - serial0 = &uart4; - serial1 = &usart3; - serial2 = &uart7; serial3 = &usart2; }; diff --git a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi index 11370ae0d868..ded5ab9a4798 100644 --- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi +++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi @@ -8,6 +8,12 @@ #include / { + aliases { + serial0 = &uart4; + serial1 = &usart3; + serial2 = &uart7; + }; + memory@c0000000 { device_type = "memory"; reg = <0xc0000000 0x20000000>;