From patchwork Tue Mar 28 15:37:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Caron X-Patchwork-Id: 13191306 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 8FBC1C76196 for ; Tue, 28 Mar 2023 15:38:53 +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=H+j7BoOTIWkGP79XgOSWLFJZ7dj5aej13fCujy2gfCM=; b=IgBWeic/O+QiIH ivVnMeMo6zhAcnn4pfywgqyfiF8cbjG9DdTtj9mLX3Tfiu3Uuo2In6m3mnKP2O46hKVs6KI3OWSZs EqfS+zwD0KM9BCpBFm8/eHw1UrJQxgQzWskJuakxHU/aZoIv0Ji6B5bZ4QFgQ0CiSlddM7MXfZ4mS WMmehpZc4WHDD3xtVUIpwio7BYCcbctUvor7lytlu4IddRfZdHQaTzImH5e5pCfayM2wOYajc/+0Z +HN1eyKtmsFyBEwSFLCRU82B3IEk3WA1rWZn6tXanspVLyB1JylF2t06Xpdx/fe2ywUiFG3vGjkws 8bEVZ5bGJq78yp3eAjcw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phBOd-00Exbp-2m; Tue, 28 Mar 2023 15:38:03 +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-00ExWy-0i for linux-arm-kernel@lists.infradead.org; Tue, 28 Mar 2023 15:37:52 +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 32SE1oum016476; Tue, 28 Mar 2023 17:37:39 +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=FKaGslI7jPasSK/fcfNSrjsxE74p6Mh867fEXA6JvJs=; b=AdWQXBLTWZSdXDXIAG9Ib96Yh7EelNZbeFOAb43REPs3YuGEVaxl5mPlF2lkxmq1yP5+ VgcvWtDdNS9ghtS0b1lA9hgRdkis3SvgAR4esk7wEW4KNB/0eBd5ayZnev5j3KambqCn RWgA4QNXZY3HoTGQ63rnYrQJBmxksO9KDwluh/8Lfeg+wLIQ+Oye3LERQT7RdqUjFRL8 5x8nVxpc4CnATQWs58CBDCnGC5k1wO8chV+fbEKNTd/v3+HV6xyjhaLFu2IUFjueNt8s VB+shaWu+4TBkte7dM9AHi1aZUC7RdGHSfObMfYcTlI9T4QOD2vDo+3zwcHuyMD5DpX+ CA== 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 3pkwvsaamy-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 7FBAF100034; Tue, 28 Mar 2023 17:37:38 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node1.st.com [10.75.129.69]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 79DBE2194F9; Tue, 28 Mar 2023 17:37:38 +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:38 +0200 From: Valentin Caron To: Alexandre Torgue CC: Rob Herring , Krzysztof Kozlowski , Maxime Coquelin , Valentin Caron , , , , Subject: [PATCH v2 3/6] ARM: dts: stm32: clean uart aliases on stm32mp15xx-exx boards Date: Tue, 28 Mar 2023 17:37:20 +0200 Message-ID: <20230328153723.498672-4-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_554120_CBC741BE X-CRM114-Status: GOOD ( 16.94 ) 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. Put also aliases node above chosen node as same as stm32mp157c-dk2.dts. Signed-off-by: Valentin Caron --- arch/arm/boot/dts/stm32mp157c-ed1.dts | 8 ++++---- arch/arm/boot/dts/stm32mp157c-ev1.dts | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts index b1eb688a278a..2dfde6292668 100644 --- a/arch/arm/boot/dts/stm32mp157c-ed1.dts +++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts @@ -16,6 +16,10 @@ / { model = "STMicroelectronics STM32MP157C eval daughter"; compatible = "st,stm32mp157c-ed1", "st,stm32mp157"; + aliases { + serial0 = &uart4; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -72,10 +76,6 @@ gpu_reserved: gpu@e8000000 { }; }; - aliases { - serial0 = &uart4; - }; - sd_switch: regulator-sd_switch { compatible = "regulator-gpio"; regulator-name = "sd_switch"; diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts index 542226cfcfdf..ba8e9d9a42fa 100644 --- a/arch/arm/boot/dts/stm32mp157c-ev1.dts +++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts @@ -14,16 +14,15 @@ / { model = "STMicroelectronics STM32MP157C eval daughter on eval mother"; compatible = "st,stm32mp157c-ev1", "st,stm32mp157c-ed1", "st,stm32mp157"; - chosen { - stdout-path = "serial0:115200n8"; - }; - aliases { - serial0 = &uart4; serial1 = &usart3; ethernet0 = ðernet0; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + clocks { clk_ext_camera: clk-ext-camera { #clock-cells = <0>;