From patchwork Mon Oct 24 11:30:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9751 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp549291wru; Mon, 24 Oct 2022 09:43:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4TbuwOydHeyv2k57jbIrS/aCcYrq77cooUrXGiTQ2/9qLJq8ZdrWxZpRoTA4k0iqp90Eyx X-Received: by 2002:aa7:92c8:0:b0:56b:d0b8:10f0 with SMTP id k8-20020aa792c8000000b0056bd0b810f0mr6079985pfa.46.1666629821338; Mon, 24 Oct 2022 09:43:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666629821; cv=none; d=google.com; s=arc-20160816; b=ovtWAa+frOo40f7+Vb/mp/e1Q6/aeXGh1QfKCkyaUxTjLra9k+rW8F1zyuFuZ5r6CE pz+EKh/fk7AexRGRoj5odQ5urnqgLi/zouOypRvwEnSdXFl6zOjrgwjqs6MRcORdmfQr K08JfAX/cH8E4Qw2kYkK+kFs5XBHY3xSJnnTe5K4sYnJfNTbQ5e5IRk8B1fuS6Z9+TLl SGL0tC5k+keACyxRAWcnEpke+1q8bwXWO4E3wK/OwL42x24VYjKCVP4Ly6jL0T6RyPCz AtzjzsPtGJZObJEteUNzTFwFo/LgZTL+L+PMAjZDiydrfRuAkDRMV7d7J0hc1zsj/rIQ jObQ== 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=a8L8uZVxUbp5VmUqJjNyXcu5XUljDWKqV9SAp5a5QUT9IhTtjmmD6PFPIgGkS57bkV 3LBOTpY9rYkDhx9pBwXHocIJ1Mxf52yWY+AHU3y+sd5e2M3Qv+vMd/5aAeqBtsfEk6Ca kPr2wwiqYD/bG4mzwhEsYTVScG7osKzyN8eSskFyXBGa4Lyo+uJhl/35SxbLni23CLhR eqcByAxSB5nyW5b2qXrdbXtXPAgsP08NcBP4HNYvgoyKJCxLoxAx7Ctv9x8mf5aOqlKf 3dFKD75CmAH0x5yggUfGcnXUCPBigB2dfiBVKby4mtlFjqMTWvwjx5o+wc/FgVicx2dz wcEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aAwRrwiu; 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 194-20020a6300cb000000b00457dced8b7dsi31544728pga.588.2022.10.24.09.43.28; Mon, 24 Oct 2022 09:43:41 -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=aAwRrwiu; 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 S234601AbiJXQnH (ORCPT + 99 others); Mon, 24 Oct 2022 12:43:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234533AbiJXQmH (ORCPT ); Mon, 24 Oct 2022 12:42:07 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26E142D1ED; Mon, 24 Oct 2022 08:29:05 -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 6CDB7B8133A; Mon, 24 Oct 2022 12:09:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2FC5C433C1; Mon, 24 Oct 2022 12:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613377; bh=BBEZSL/kEaLKT0nn3CDJDaoaCe8MaFX+1kU7JZ+z9Ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aAwRrwiukzch5kKrN8kbXcQjEEE8d+/hej6mX5TllsIoibDhpVlhW3CNYpq2i0W47 DxTfPJXVyDorvdo/NtucvxfjpjWdk4wqQxcwFJn/iDnifS56HlUwVky2GUJaETq6oS 5+8TyMzY6xlceeLsnBROq16s2fX8Oc74NSBT4ARs= 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 5.4 113/255] ARM: dts: kirkwood: lsxl: fix serial line Date: Mon, 24 Oct 2022 13:30:23 +0200 Message-Id: <20221024113006.244007192@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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?1747588031391002291?= X-GMAIL-MSGID: =?utf-8?q?1747588031391002291?= 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";