From patchwork Sat Dec 2 13:05:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 172838 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1748187vqy; Sat, 2 Dec 2023 05:06:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IFgPNzfVrwHNzXHz/d8wz2f/kUGzRs3ARyjDkB4AEGQxJGq4uBGj4je8pt0MXXe8ngO1zWI X-Received: by 2002:a05:6a00:21d2:b0:68e:3772:4e40 with SMTP id t18-20020a056a0021d200b0068e37724e40mr315823pfj.3.1701522374052; Sat, 02 Dec 2023 05:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701522374; cv=none; d=google.com; s=arc-20160816; b=cOpgwf513XPKEbKzS1z4cstQc/g8ou9iBD/aPSmt5RvPvBH1F3Csb8R/vgxLJKxZJf ZgArUC48jOs4IJ4xiTcyIHaEk4W0H8Vjdf0C52IFjwb30DtADqQ5dAtxuLh7rjrgDBUz e00qXqgfY+EkCVXErDdnbxEDdEgi7/n8IFEgB+UcTbwElPwoV4rHSkBQ3fG/R9nsvEN6 jw5Nr/iCfzeU8M1wuzdGHVqO/fflGTCUrqYvcwbrB42CiFoyp/7mMeIs3VMToYIvB2Xv RUZ2KICCaLMjWP5Rl4fandUB/KRopgh5fn3OuT87bTdxsoWQ9bdorSmjYCV1UOBueQVA /SRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LlYAxixn2/bVhOT7Rvb2SZjbGsVONErr2mUXn3POHYo=; fh=ZUK/zovZ3p9QBGC2x61y1qv8IqfQDcV6nzwDU9avA3I=; b=sPQPxL5kOq3JFh9Kep97fBhNcFcktVZEBoMRsiD4+RObNAkYYWZJrYfh8UyTePOb5A rUvDJduNuSIXFPHlmyli6uTuBDrUEdlQy1AdH3r1QvXBA9va+M7lE4rA1mKEY8TyLNlo aVBoJSrPb4MG+nieSITGYLmheHpVkVHveECVPpYwpGN2jKg4o7r6TEBPBJfVeFzVj9r0 TYSB3C104vQW4xBHsy1rmD6dFzuMvx9sNoJVNJH+EGKqOVYJ/ucQV7cDm4QcnWUiiqyo XYBbFwM/vNYY7iT3cYfAzmr0Xh5EMRHtg5mcBGfeEQl28Pb5Vnvf7Pb4aBiQOccaZHWF GiUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PsClP+U7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id d22-20020a056a00199600b006be55174f3fsi4973352pfl.28.2023.12.02.05.05.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 05:06:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PsClP+U7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6027F80A91BF; Sat, 2 Dec 2023 05:05:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232808AbjLBNFU (ORCPT + 99 others); Sat, 2 Dec 2023 08:05:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbjLBNFO (ORCPT ); Sat, 2 Dec 2023 08:05:14 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C93813A; Sat, 2 Dec 2023 05:05:21 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a1a0bc1e415so195317066b.0; Sat, 02 Dec 2023 05:05:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701522319; x=1702127119; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LlYAxixn2/bVhOT7Rvb2SZjbGsVONErr2mUXn3POHYo=; b=PsClP+U7gJAPLTPbErUnB+Z9Gi7ZgmU5splFXUdAkdr4h8Pn0Rkg4+8z1Gp7//zCDO hzMVaQ40i2fyWmMSBpFePOhYPXGL/KH+1fshzA/cobQNTxLn3kge/DRKQ2wqn8O3sx5U 1KCrCUbIkXXwV3eboRvusbraFeTFeN8d11xAACXYJ3Axy4dFESltMpi4yqU02Ov7dtER aF4Xm3cquRUBnnD0srWl7Q6Xvnna2zxp29fsCqLssETY4PWASxqrshL/6bvmPY347G0p 9xHOXF0aoN+1asKW+ctea9EWx/uJmTUR1v0My7R3xdOq/77bHXUr17d2wUnSDiAQxh6D ubIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701522319; x=1702127119; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LlYAxixn2/bVhOT7Rvb2SZjbGsVONErr2mUXn3POHYo=; b=jIxjtpvE3tlGPw80tOlo5XhO5JTeLGo+0UdVncCUdKRWFHQJmLdIMnB9wKy8RneJlT oTpJ8IUF9pkOVNn2epFFajVtR11odD37hYhaBKqwjx0zqrPyaMisZ/HtH3zZ4VqARkGJ qVO6eaOA3ffyilG7Ba7f+OVutXlnOfyj0EL1zdySJO00hW9Fl/vghgc/G6tWkN26nG/5 0nSA5Eq1ZIGK+njzVoOR0aQiwkbR1jmLjqR5oXM1vpc15sWSmF23Dv2Sd8/e7vDHQiZQ VPbwShrqGRvaYbaMd+W/+ji1for8Y/yPQkOxtA9qTV8KEAYj1HntjLU831+ZpZX8W9OQ VUlA== X-Gm-Message-State: AOJu0Yygv3WaItVhuPHpz4tB4HP6Z/nhAV7JowCahtA6UnbuySH5ouUY u2/KHQW9qJQLB0nEpZiwqNOhg56f/A== X-Received: by 2002:a17:906:eb18:b0:a19:3c48:4f7 with SMTP id mb24-20020a170906eb1800b00a193c4804f7mr1764291ejb.60.1701522319446; Sat, 02 Dec 2023 05:05:19 -0800 (PST) Received: from U4.lan ([2a02:810b:f40:4300:908e:b829:354b:f8ee]) by smtp.gmail.com with ESMTPSA id bs5-20020a170906d1c500b00a0bf09c9483sm3045324ejb.35.2023.12.02.05.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 05:05:19 -0800 (PST) From: Alex Bee To: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Alex Bee Subject: [PATCH] ARM: dts: rockchip: Move uart aliases to SoC dtsi for RK3128 Date: Sat, 2 Dec 2023 14:05:07 +0100 Message-ID: <20231202130506.66738-5-knaerzche@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231202130506.66738-2-knaerzche@gmail.com> References: <20231202130506.66738-2-knaerzche@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 02 Dec 2023 05:05:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784175524782870865 X-GMAIL-MSGID: 1784175524782870865 SoC TRM, SoC datasheet and board schematics always refer to the same uart numbers - even if not all are used for a specific board. In order to not have to re-define them for every board move the aliases to SoC dtsi for RK3128 like it's being done for all other Rockchip ARM SoCs. Signed-off-by: Alex Bee --- arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts | 3 +-- arch/arm/boot/dts/rockchip/rk3128.dtsi | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts b/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts index b448e2b96e08..6e46e839de39 100644 --- a/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts +++ b/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts @@ -13,7 +13,6 @@ / { aliases { mmc0 = &emmc; mmc1 = &sdmmc; - serial0 = &uart1; }; memory@60000000 { @@ -22,7 +21,7 @@ memory@60000000 { }; chosen { - stdout-path = "serial0:115200n8"; + stdout-path = &uart1; }; adc-keys { diff --git a/arch/arm/boot/dts/rockchip/rk3128.dtsi b/arch/arm/boot/dts/rockchip/rk3128.dtsi index dc149d98cf9e..edf90ebd7ff9 100644 --- a/arch/arm/boot/dts/rockchip/rk3128.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3128.dtsi @@ -24,6 +24,9 @@ aliases { i2c1 = &i2c1; i2c2 = &i2c2; i2c3 = &i2c3; + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; }; arm-pmu {