From patchwork Mon Oct 24 11:30:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8975 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp438152wru; Mon, 24 Oct 2022 06:00:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7z4QCA3Df4+UrAQWpQmdJ1N0PDukjiQwomjl+5Lpk+lGfCetGUkwzgtvAEftz9trNlKIEe X-Received: by 2002:a17:90b:2248:b0:210:10dc:a314 with SMTP id hk8-20020a17090b224800b0021010dca314mr30122356pjb.15.1666616457071; Mon, 24 Oct 2022 06:00:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616457; cv=none; d=google.com; s=arc-20160816; b=nf3JMXFVTXFTQNxtvBS8TdQCABMCdl7WdaQWuP3/W2jjD+qpBD0qt4R9hvVp4e/6Xi arvfJG0F2PLXRMcUgVU8rLhCJJJzIT6Y3xbDwLZgQPcLp9jkDNxbxmiGIqM7pyAXs/zp EXp3Dk9lQsqtJxBVKCE2DDgVJ+miSl63H66Y7yIMY8iGxHalLJgPVrAaSDLZbydHMrob mxi9LIdozXMvA8kYyKU2jtsjJSE/hASet7Z2a9qpx+Qyp2LQOYVqxU1kc9/+mWiNy7dS kA4Iu2Wxt2XrUH/PJgL6T4SZXGho+v/VA3LIKO020Eu+su0PoN1eMQdgmVLGY97zdrTL iiew== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RHN2Ske92yvWhsHoCz4tAmIpOnu73nVOxi2Cc3hoDoI=; b=HEYFnb4jmmBlHHPld7Mrt+zE273hHYRc9I2wQx6w5ecb0XN9OehDVOpiz8HgbPrqa4 W61F6O4vE7Q6urOUUMoGwYZ7Y1JgtspnNtgMGED3kgLJ5KXCZiviZ533r4sPLfIw2LLM LO5Ag6/WQMVc29R4xXR7Qb9XnZ8JrPgMW3RozVho6e13U+EE66mTNZbKQDAvQqYiPZfd EgMehtrG3MNBFa5fnsF8yHLh+SVivo3r5WIcgsXJ3z5WihGi1IO5S5mDJVYPng1p/Akv qvu4crrfOysKKYEnlJogoLsZR9VkKwlItI5FGKhL3egsjgjEn7ck6hsmB1AdPN7YOwJS 0TnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QotdaSOM; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r192-20020a632bc9000000b0044e466f478dsi6907531pgr.204.2022.10.24.06.00.40; Mon, 24 Oct 2022 06:00:57 -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=@linuxfoundation.org header.s=korg header.b=QotdaSOM; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234833AbiJXNA0 (ORCPT + 99 others); Mon, 24 Oct 2022 09:00:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232122AbiJXM63 (ORCPT ); Mon, 24 Oct 2022 08:58:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4296981CF; Mon, 24 Oct 2022 05:17:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DDDB761286; Mon, 24 Oct 2022 11:50:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFB4BC433D6; Mon, 24 Oct 2022 11:50:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612205; bh=BBEZSL/kEaLKT0nn3CDJDaoaCe8MaFX+1kU7JZ+z9Ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QotdaSOMakNZsKCppLdr+ert4ConasfJd2QUp599h1aygca2noXAgy9bgvhvYkTyB vn6NxbQL5t7m3AMrF5IXufw7TVs9k2BgIkzITXIUS1WJg+vf/r7TtuvhcwqNKZmUPv k7Bqc2PneutNz67IhDTlqp3ATM/a4rE2P2CHzmgQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Walle , Andrew Lunn , Gregory CLEMENT , Sasha Levin Subject: [PATCH 4.14 110/210] ARM: dts: kirkwood: lsxl: fix serial line Date: Mon, 24 Oct 2022 13:30:27 +0200 Message-Id: <20221024113000.576191265@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747574018037181989?= X-GMAIL-MSGID: =?utf-8?q?1747574018037181989?= From: Michael Walle [ Upstream commit 04eabc6ac10fda9424606d9a7ab6ab9a5d95350a ] Commit 327e15428977 ("ARM: dts: kirkwood: consolidate common pinctrl settings") unknowingly broke the serial output on this board. Before this commit, the pinmux was still configured by the bootloader and the kernel didn't reconfigured it again. This was an oversight by the initial board support where the pinmux for the serial line was never configured by the kernel. But with this commit, the serial line will be reconfigured to the wrong pins. This is especially confusing, because the output still works, but the input doesn't. Presumingly, the input is reconfigured to MPP10, but the output is connected to both MPP11 and MPP5. Override the pinmux in the board device tree. Fixes: 327e15428977 ("ARM: dts: kirkwood: consolidate common pinctrl settings") Signed-off-by: Michael Walle Reviewed-by: Andrew Lunn Signed-off-by: Gregory CLEMENT Signed-off-by: Sasha Levin --- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index 7b151acb9984..321a40a98ed2 100644 --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi @@ -10,6 +10,11 @@ ocp@f1000000 { pinctrl: pin-controller@10000 { + /* Non-default UART pins */ + pmx_uart0: pmx-uart0 { + marvell,pins = "mpp4", "mpp5"; + }; + pmx_power_hdd: pmx-power-hdd { marvell,pins = "mpp10"; marvell,function = "gpo";