Message ID | 20230516203029.1031174-1-martin.blumenstingl@googlemail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp690495vqo; Tue, 16 May 2023 13:45:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5kbm+oI/mz/HlouPCpE/t123Eam3rDaYNgpRiGG/pm08uNcOCd8ke8QYAQw4+ue4udTBt5 X-Received: by 2002:a05:6a20:841b:b0:101:3046:8db3 with SMTP id c27-20020a056a20841b00b0010130468db3mr26437pzd.22.1684269942523; Tue, 16 May 2023 13:45:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684269942; cv=none; d=google.com; s=arc-20160816; b=RMWzRhgHfznpF6q23q5BXfVzZXRFIP/MjSS8A5rErx0TplRLYVq5weH8WKAa2NkgJ1 YRaroZyNJA8aykOVuTLxd25SaJAGaZ+wHWJ2dw+Q4Ov80sLH2Rpyoxqs9SP4ym0lZsRT gb65Da0kio88R+RsUs8DZv0w2bPmGczO3z3OUhICLW1ODjpsyraRVW9/q+gnNP8+I/pZ TpgNJ9M+j4ThjQXOsHGhoDIG6cmpD0yMDOpC1eAcCaNFNuih5wLXohclF/nMoOMKBGuM 7tPPwqmsw7ZQAPLZWT64d2KBxrxX6ZCjFSomul2HEDT7cecPuXykg9bz1H9t7oxzdVhr RaYQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=HRBhEUf7CYGryet9ZxbEaGtt6QxEKGJuiA85AVv0BIk=; b=umGPCHvqaXRYXAXQkY3aurZvruUSA5n1x/dhI0o/KyNA39BO8UWhKLbRSgtZii/zWJ c0Smd5JEFbGx2mBv7CWe7+GApLnGqCFTCIEFnlw/vPG+cd8XRqyazCrcE/mwUjBFpPQQ BFzDuVFtTKJrQpqMpKQRiwrSgQzbfWd5FrZazLM9DZGrmD9pY0k+gf5ghC5LLTZ7mRjR jV6STgNfyIKARGLCu1NrToRacJkubnyyRk0mf0CSU9CtRBsT/nA5KG0VvEqqCytDaN39 4Sll1pNWbxfCkssoLdP2c6k5ZWn7bEOk24g7pFS3EBaawhsODI0Kljw2VsveZ5hWki3y 7Hyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@googlemail.com header.s=20221208 header.b=sCapp58i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w8-20020a63f508000000b0052d7238ad55si19260054pgh.793.2023.05.16.13.45.29; Tue, 16 May 2023 13:45:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@googlemail.com header.s=20221208 header.b=sCapp58i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229867AbjEPUat (ORCPT <rfc822;peekingduck44@gmail.com> + 99 others); Tue, 16 May 2023 16:30:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229693AbjEPUaq (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 16 May 2023 16:30:46 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C559335A8 for <linux-kernel@vger.kernel.org>; Tue, 16 May 2023 13:30:45 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-96b4ed40d97so421467066b.0 for <linux-kernel@vger.kernel.org>; Tue, 16 May 2023 13:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1684269044; x=1686861044; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HRBhEUf7CYGryet9ZxbEaGtt6QxEKGJuiA85AVv0BIk=; b=sCapp58iRDrRq6V4PfWOO/Y/fTUFnOlRvbDiSpey+KtmAWkC9JFwJmBuDkfFylP8d6 otK/LRYiFKzgMrzWcjPRCgUs48TFvAbuXlm9p0KWQja1flK7g+C72QsTptxIsjifZsE1 aX71kT9Fdspb1EX2SKJpf9jgyfWQrJQ6uJXPbyjxqAfT4x5SWuf8NL3xO8IkFOFwiHX+ xrKcq1bhJ7OQ7WkgBoQrGtuW8+O3ZuK+eNuyNhQ9DIwQ7ATUhvstsU8DhyaJVgpKTN4p W/nYCXdaqf1ULP5VtwTpLDayN/9adJeSvlSZGVvhmMiWIttbM06X8/PNYad70pW5RwN9 MiUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684269044; x=1686861044; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HRBhEUf7CYGryet9ZxbEaGtt6QxEKGJuiA85AVv0BIk=; b=QuHgPuaO7H1qK+WprjSXBuDCKNbULTvamDhKB6IBmR1plq+a1omeuJKLL/ivhEEVzC uG/SHDxgOlewHOcZnU5Kj7vVwPY/tQmh2jo1mSofiZICUDBpWe8yocoYyawnIqV4MHHx 7Dp9vPS2u0pzm2RmXdn5D3hsF6bW2gwxnTDDBkQokVOKpO/NFsHW6NLFFnysDuLk73oh wgBP0pfKlfBMWGzp+iHy/9M9fiHb/GRnTKX12YOoxvaOAea7czkydrcpWIOXCZE73rvG pLqq3uGQqDRnSSUiSEn6Yd92Bnf20sgvKiXXILYDpjAhS6fXB/jfTnE/sW5+CsWJfozi K0iQ== X-Gm-Message-State: AC+VfDwqq8B9AhZRwnkIIxlRAr3JI2n5QwCPX/MzKrgkao9JfsXVA40T HaUaQvndth+qHWWme8Qy30v4EWP96BA= X-Received: by 2002:a17:907:928e:b0:96a:8412:a43d with SMTP id bw14-20020a170907928e00b0096a8412a43dmr16563797ejc.33.1684269043970; Tue, 16 May 2023 13:30:43 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a01-0c23-c47a-4900-0000-0000-0000-0e63.c23.pool.telefonica.de. [2a01:c23:c47a:4900::e63]) by smtp.googlemail.com with ESMTPSA id ci18-20020a170907267200b009659ecdf29fsm11304715ejc.1.2023.05.16.13.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 13:30:43 -0700 (PDT) From: Martin Blumenstingl <martin.blumenstingl@googlemail.com> To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, neil.armstrong@linaro.org, Martin Blumenstingl <martin.blumenstingl@googlemail.com>, Hans-Frieder Vogt <hfdevel@gmx.net> Subject: [PATCH v3] ARM: dts: meson8: correct uart_B and uart_C clock references Date: Tue, 16 May 2023 22:30:29 +0200 Message-Id: <20230516203029.1031174-1-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766085039131722264?= X-GMAIL-MSGID: =?utf-8?q?1766085039131722264?= |
Series |
[v3] ARM: dts: meson8: correct uart_B and uart_C clock references
|
|
Commit Message
Martin Blumenstingl
May 16, 2023, 8:30 p.m. UTC
On Meson8 uart_B and uart_C do not work, because they are relying on
incorrect clocks. Change the references of pclk to the correct CLKID
(UART1 for uart_B and UART2 for uart_C), to allow use of the two uarts.
This was originally reported by Hans-Frieder Vogt for Meson8b [0], but
the same bug is also present in meson8.dtsi
[0] https://lore.kernel.org/linux-amlogic/trinity-bf20bcb9-790b-4ab9-99e3-0831ef8257f4-1680878185420@3c-app-gmx-bap55/
Fixes: 57007bfb5469 ("ARM: dts: meson8: Fix the UART device-tree schema validation")
Reported-by: Hans-Frieder Vogt <hfdevel@gmx.net> # for meson8b.dtsi
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
Changes since v1:
- move the link to the original report for Meson8b to the description
Changes since v2:
- use CLKID_UART1 for &uart_B (thanks Hans-Frieder Vogt for spotting my
typo!)
arch/arm/boot/dts/meson8.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
Hi, On Tue, 16 May 2023 22:30:29 +0200, Martin Blumenstingl wrote: > On Meson8 uart_B and uart_C do not work, because they are relying on > incorrect clocks. Change the references of pclk to the correct CLKID > (UART1 for uart_B and UART2 for uart_C), to allow use of the two uarts. > > This was originally reported by Hans-Frieder Vogt for Meson8b [0], but > the same bug is also present in meson8.dtsi > > [...] Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.5/arm-dt) [1/1] ARM: dts: meson8: correct uart_B and uart_C clock references https://git.kernel.org/amlogic/c/98b503c7fb13a17a47d8ebf15fa8f7c10118e75c These changes has been applied on the intermediate git tree [1]. The v6.5/arm-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes. In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2]. The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists. If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset. [1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git [3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index 4f22ab451aae..59932fbfd5d5 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -769,13 +769,13 @@ &uart_A { &uart_B { compatible = "amlogic,meson8-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; }; &uart_C { compatible = "amlogic,meson8-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; };