From patchwork Wed Oct 19 08:28:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp214172wrs; Wed, 19 Oct 2022 02:12:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7c8Qpr8Et9hOuDYPC6yNdOVz3LHC73KgfHJg16U4YhFWWb08qfaOOTsI5t8NQu7by4CuRA X-Received: by 2002:a05:6402:1f06:b0:457:149d:beaa with SMTP id b6-20020a0564021f0600b00457149dbeaamr6386285edb.238.1666170724642; Wed, 19 Oct 2022 02:12:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666170724; cv=none; d=google.com; s=arc-20160816; b=I5rZTCXLzgSqtEooT4/KYAcgb9lZz227eNqOmOuC0xhbF13OxQSV0wEt/bxVh+J8yY UrXDTt5K6PK+AuBG6RjTZdHk1W5a5jXHHu9WPRd81XHzwGYjMR3VOk+dcyXbvyGkjZg/ cHJKmE3hUHY87fzuRk99n2H3maOKC6nJ05vkjv3HtXRWoZWPRIV9sDeVTo6GTkX/3gHV wW9qIM3ozBumwqC7M58AKKc5WTRTVlp3xDmA3KGQo0AfRmUADJAkjKtnKQBmU5kRUoM7 T5UQYnc+RR+DwatNmRIG/a4jtXPoRWAA0ggoZb851djBdukq7qFrPN5if1269SYOfDDE 62tA== 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=nuwVYcXmGPIjfSysa9t/u6UvjHWNjfr7Je0YlqmUENI2gMidSnBoswiIW9fTqu4ZZR Zu69OfHcaeOyJn8nR1MBFwfZYtaZVbA8mXLwzYYg7y6Vpdkd4iK+dLDUZNabYtmxJm8U xR5Afo1+3hxKSUoKpJ8GsabfC/wzZISeS1ahY5pI5sASm/QTEmqP/aOCcrucnaByzMMa HOZO5d49oVEUbO4a/W27KQmRhgqlGo0G/1qQ3zGvRZ8bpQMfKXM2b4YbViP7HtBrXaLT N8eBH5djdg2RD9rsBd3jReDvna4/+kNnJRHDQsmj73ev6h4bkuugcutK3qz8Ii7939n5 Ydyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=O410CZe0; 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 qa14-20020a170907868e00b0073d7ad9607bsi12948098ejc.551.2022.10.19.02.11.39; Wed, 19 Oct 2022 02:12:04 -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=O410CZe0; 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 S232693AbiJSJIu (ORCPT + 99 others); Wed, 19 Oct 2022 05:08:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232454AbiJSJGS (ORCPT ); Wed, 19 Oct 2022 05:06:18 -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 2DE05CE2C; Wed, 19 Oct 2022 01:59:34 -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 D1C49617F0; Wed, 19 Oct 2022 08:57:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECB20C433C1; Wed, 19 Oct 2022 08:57:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169858; bh=BBEZSL/kEaLKT0nn3CDJDaoaCe8MaFX+1kU7JZ+z9Ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O410CZe06OIXmwUzCDYg0VM2tlDDP1eCwhy6brQMXDxLOswsWhM4/bGokeQaDiwQK 5cYLhFy9JkXTDU8vhm+JR2uMTfppMA1yXCaUJMhHGs4MAm68XGCYB6jWBCnjadczQ6 /cs/+cpDfFfvKU08uKG0gksXNBfq9WwpHVSpYoJM= 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 6.0 435/862] ARM: dts: kirkwood: lsxl: fix serial line Date: Wed, 19 Oct 2022 10:28:42 +0200 Message-Id: <20221019083309.196961234@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747106633729066427?= X-GMAIL-MSGID: =?utf-8?q?1747106633729066427?= 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";