From patchwork Mon Oct 24 11:30:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8462 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp402873wru; Mon, 24 Oct 2022 04:50:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4DOCqH4fYxvrkq7zIiCyQ0T2NDg8nhT/dpQHRk33CmvZ41ixGfiJ26B2G7T/X9rpl/ZEpz X-Received: by 2002:a17:902:be03:b0:178:6f5d:e979 with SMTP id r3-20020a170902be0300b001786f5de979mr32875682pls.163.1666612250944; Mon, 24 Oct 2022 04:50:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612250; cv=none; d=google.com; s=arc-20160816; b=BsvoWsG0qYyxGM7TW0/EW47jEZkLBLWnKPpN++JXiZhnnEHfhTkMSVBSo+fbbf1QHk agh1gdLheD1u/cLkzoiCPMqR9ou8FJRu03i/m36gYXh+sgVqaH840HIWM5f0CD+zO1Fc qrI4o5GPJXduMH8lzUc4GeFLUdq9xgy2zroGMGiuPmLdQIWgqhyWOH86DELmJ8tr0KiF AjxnsjVHxlChitkWJVKhY6hlYWQp9yuSvX/MgN+FF5cizKtrVWtCoR9eW71SGu3whbt8 nZPNzo5wYAdhIkh6TMiOozi83w1VM6uCw/TDxy58FXjIyeGA/36WU37YDMhB0K9Av8Yn uzhQ== 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=y+oCtFtFi0WzhYihPK0aU0nNhMIOz+FOn6RL+8dSlk8=; b=Rd54knhfo8GhlqGKB+4NNR2a8IAZkvKlegm74akGWKUps1AKy08IjWER8H17mtumKE AM6rVoqErUXe0/CuLVzHX/uaR2HFUsKc6Cbb2Q4tE79f+991+wUoP7NK0rI9kg1MF+Ww UvABNpFZDtX0bd3cV7D0Xe4yxVCysCsOYY2AJ4DZNWMRccaHSjvVlfFFaODwvhG6UCC9 jZWCu77gI4pVpBehcCOsDn2K4c6eXiRd09PIVqAsN+DCefhn901gkFh5dqDzrbzi1m1c 1tsAlLijbPiniqPKvVajs9lITziJKkcEK+Ii3BFLfNM9abPCmsU3zGgDlXAhw3rS/NDR X4Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Zy68kJf2; 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 ck21-20020a17090afe1500b001fb1bec57casi7367991pjb.61.2022.10.24.04.50.37; Mon, 24 Oct 2022 04:50:50 -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=Zy68kJf2; 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 S231820AbiJXLuM (ORCPT + 99 others); Mon, 24 Oct 2022 07:50:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231741AbiJXLsL (ORCPT ); Mon, 24 Oct 2022 07:48:11 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4A2B4F399; Mon, 24 Oct 2022 04:43:26 -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 ams.source.kernel.org (Postfix) with ESMTPS id CD51BB8118A; Mon, 24 Oct 2022 11:43:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26B36C433D6; Mon, 24 Oct 2022 11:43:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611799; bh=GYFw6f2lMLECNn5wQrg+c930rEEm1x0EpVlhsWmYeKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zy68kJf2nC95F97D0CDaEuN6srxS/J5HS5ynapjH2b1P+RhqBN8QBM7pS1BpK2XAm s/Z8xos+KvS7VuMhK0cLnbJV5abtXj5T7prTPZyQFT9HnITd9sO6UPerpqxXP1NG5q ziIO9KjazSezbq9xsbuiSuYfTh0hnbomYydpw7t0= 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.9 085/159] ARM: dts: kirkwood: lsxl: fix serial line Date: Mon, 24 Oct 2022 13:30:39 +0200 Message-Id: <20221024112952.525032769@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747569607553140697?= X-GMAIL-MSGID: =?utf-8?q?1747569607553140697?= 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 8b7c6ce79a41..c330d96cc023 100644 --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi @@ -9,6 +9,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";