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: 13476958 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 D5F8AC4167B for ; Sat, 2 Dec 2023 13:05:44 +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=xx9598FRtwi269oaZkya6R6RZT+FTWSnG108/Yl7C7E=; b=Qky0kkqPZm8OvO 9RwsoCEhmKe7ZciiN2n+F86mA0PuoC3LOdlQE9ZlAZKeqBsTs0WH+S9YokUOiWhMqu7xgJy7uXYGO fzVCsmKbYitn9dYyGtmCpKxcArK5jU+nFfmKfoYhuc76imbxlr0gG9+m4NUl08EpX9qBU8JxmZ31R mR5WCn3FRRxAcID9w6aom9K7Dao9QXVpqWBTw+VwJmbp3D2ZK0W+W7cuaPZtq4EAwNy6WtpC+4F9U Dn0rdTQ9/ynLDwzk2pbQMYSk9KCf1cXu3pD30G0OoltG4psc5LhMvzBsNHDXZxwTCh12bt6xBfK+d QLzStnkpsiMox1dDxkew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r9PgR-00Fj6L-2y; Sat, 02 Dec 2023 13:05:23 +0000 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r9PgP-00Fj4z-2R; Sat, 02 Dec 2023 13:05:22 +0000 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a0029289b1bso405460366b.1; 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=lists.infradead.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=RHlSiFYoTybFsd+zAE1HtoHo3MGw/q6ajpRGnp4WWws980Nz0ClyLvsDsB6qGMHYzd Ay58lOoDlGeLo5OfupeQ1bYEhE/HHjkc/ixiH5EHu/2X3zNd3LQyrMTpWzzLNREBALRF fxltvswdpUbAg3bZfblCn4yhNJSs5KpAvXKwREAn+a/2fEhC3r+oQ4jeGS7wu46QINGN L6r0hjGpL0NoNkdlDfhonnEIJoMs+I4b2odspDfQNrjANMmCtBSAXrVkbEJ7/IKntffn SuWHHVUr25IHO3Q3/SBsHZ2iEwbZB6cKoQCByCXblVZOAJqmrsPuc/cTFaIRaa0YBxQd J3Nw== 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=LM1UTeq+oUh/HytCiufIkpeEYez+ya6vgfFqL3Mdg8Wa4EZaIi3klC+wP6gwG5CUyQ fu0hnfRni2Rv8jq/Di8iXsBgOzinWNCfeH9MYGnM3ZusErdol0s7iN0LP8AYi0H10lSz e8sNkMNREzODr6O4e3eYj6rI5rGBFQWx7LZQKllY/jiDwMnYMUJ+/XTQacJrL8h1akBd HRxKAYBaQEqTuWFYWCep/Kk9dkD/sxqdW0vUgVQqfeFz67AgwxL8+CMwrvtlEkiI+DHS +sdMAzG9y9OcnAPpUUF1NKCV6t4/MvFEnGe3zF7FDkXtDhT3s4hq5O08LvYSLHjcIgps Gx9A== X-Gm-Message-State: AOJu0Yy7toTG6/923AQf77W/3466OD+rFUoT4BjVQuoXIY0G8or5skb1 Ym88+gSgig0uhJSaVsb9kg== X-Google-Smtp-Source: AGHT+IEsK3ZmEBmQ1+32lw9/FPSyQI+Kuc9Fe6vbkulrwlm+Nrr0F16ntBuLvtXKiFW82/9kj74wXg== 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231202_050521_797288_DFABF758 X-CRM114-Status: GOOD ( 14.24 ) 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 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 { From patchwork Sat Dec 2 13:05:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 13476959 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 75B55C4167B for ; Sat, 2 Dec 2023 13:05:48 +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=aLExtPo1NcINy3t/HUZNElIq1WVlDmdy+KoRPSoNZls=; b=OsoPeDGWYBTLac sFzhf+x29DxZnI8EkfSaYceJf+5+PQyT8+jFvCj5AO9DaSmZXN4XaD6Yy2SkqWlElb7AeXYmOklTr brBdMfNKWRx/qXeKTJw83F/ZyJMZHrnolr59HdD2H/ZBxek2QMBeGG9JYBeGpAi9843ukZNhwjQFX qqqJ7GdL4nl5TeSgByX3uvOZ0Qz5OzgMLAHKX4HbHpwjHtiRd1tP9vJuevFHiXFGWvXjzgq/RXVBK d3M3Zg5TFlX3wNkcPTUJ8zbU2oLAyJrOAYGiyhd1ui3GcjBVSll2HmyP8VTUbiPyF/sWIJk3zr4ft ltDs87cbOozGkjy2o91g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r9PgX-00Fj9o-0y; Sat, 02 Dec 2023 13:05:29 +0000 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r9PgR-00Fj4u-0h; Sat, 02 Dec 2023 13:05:24 +0000 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a00cbb83c80so441682866b.0; Sat, 02 Dec 2023 05:05:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701522318; x=1702127118; darn=lists.infradead.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=BXnPXvkgEdAqlxa28rDWBIXJg5QYtD+xYZlakCzCIA0=; b=GhpdE61o6Xwp3IHyvdIL8w9cDHP2/1Bpl3unr/lTd8oWOr9OdjWt1KJ1ZCoqUqFCiK c5uiFijEJHimKpn9JIYSitGLsCigNzLYKAo0Kz8bT1tPNq1h0ewP5PkhLW7BrJm6xSsV /0XAimapM2oPNqHVQchAepfr3lv9ifv+BqUQKSw6Stf7LbfuEGPsYBMkX+jEDTI4rXd0 bi1V2g+ZJM12X6cZFMZWq+EBEeVuDjWtye9pIxQeITzXupd9zTnFgALv5rRmQPVrKSWu 1qtHu3gpyVl+9zLMe5r59MYRhXrkWmrHY/449mhFbnMnmuvQFFCCASxAOfteDxUMXw8u bCQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701522318; x=1702127118; 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=BXnPXvkgEdAqlxa28rDWBIXJg5QYtD+xYZlakCzCIA0=; b=C1So+Gr63n3StHbaQw4bygG0on1UMBJB8xbb1vXVna5kbLuW1PNDgJ3tgqgU/GKGlf Oaveio1q6pFDJHLFemYzQP+CYTgQtVYK7IjQxvAJy7pbrUjYda5yoxDFPK1y9ogkFvir wu5pNuv2bf1vTc3ET6vKrWDIuEnw59bC5WzBqdfSWAxh4RZLMwBE9s9sHH7kkpf6CBG9 gfq4ZOmlLb8qdasfkVXbfOiRwRKGXo1eas8Fgg3xEXX5IC6hJ8dNpid/HzqGB/jXzpC7 njDFaT1Y7Qqg/rMRFK+wVbowtr7Wj5QCxUW+aysqlLixMgx3fh9LdUakDwhk8qO8iCdY 558A== X-Gm-Message-State: AOJu0YwdXJPoddvgahav+SFLjZHFne6sHD86Jvce3Cu7oAfE6WuTPxce Cpvpp3AHTc/HPiKOruuC9A== X-Google-Smtp-Source: AGHT+IGoxNPqrzQnvQpxf09ljrKJcuFDtZ22xCNQN1xzBMU7KhiOpt13wtWf8ZZHmxNTvvRlv9Nqew== X-Received: by 2002:a17:906:28d:b0:a19:a19a:eaa1 with SMTP id 13-20020a170906028d00b00a19a19aeaa1mr1635582ejf.90.1701522318738; Sat, 02 Dec 2023 05:05:18 -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:18 -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 2/3] ARM: dts: rockchip: Move i2c aliases to SoC dtsi for RK3128 Date: Sat, 2 Dec 2023 14:05:06 +0100 Message-ID: <20231202130506.66738-4-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231202_050523_256052_465B9EEA X-CRM114-Status: GOOD ( 13.29 ) 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 SoC TRM, SoC datasheet and board schematics always refer to the same i2c 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-evb.dts | 1 - arch/arm/boot/dts/rockchip/rk3128.dtsi | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3128-evb.dts b/arch/arm/boot/dts/rockchip/rk3128-evb.dts index 776a483cc26b..c7ab7fcdb436 100644 --- a/arch/arm/boot/dts/rockchip/rk3128-evb.dts +++ b/arch/arm/boot/dts/rockchip/rk3128-evb.dts @@ -12,7 +12,6 @@ / { compatible = "rockchip,rk3128-evb", "rockchip,rk3128"; aliases { - i2c1 = &i2c1; mmc0 = &emmc; }; diff --git a/arch/arm/boot/dts/rockchip/rk3128.dtsi b/arch/arm/boot/dts/rockchip/rk3128.dtsi index 5b751284d6ca..dc149d98cf9e 100644 --- a/arch/arm/boot/dts/rockchip/rk3128.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3128.dtsi @@ -20,6 +20,10 @@ aliases { gpio1 = &gpio1; gpio2 = &gpio2; gpio3 = &gpio3; + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; }; arm-pmu {