From patchwork Mon Oct 24 11:30:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8780 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp430719wru; Mon, 24 Oct 2022 05:42:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5oYIwEGetQEUAyVR79OrQ+y2J6zPQwCTaLWukHMNZQcJiyvou9qWzQWhMLkftCuQVeLcR1 X-Received: by 2002:a17:902:d2d2:b0:182:a32f:5ba1 with SMTP id n18-20020a170902d2d200b00182a32f5ba1mr33441586plc.88.1666615329416; Mon, 24 Oct 2022 05:42:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615329; cv=none; d=google.com; s=arc-20160816; b=L1gMmYChYrnFXlrPfRvyyw7pA5KQdDULpO+wTFzfNorHPFqL6ycRhv92DX+TVvQXDn OPFsTJv8x/dGzkSduhSPuvmhj/XtxnjfiJTNhlPY+OaMkUH/GYQC5MFerdG8O5C6WLwx 9Glh/3gWCkVw/WgUxChBfoTMvhZLz+1mgFF10k676hvALwFdOv7n4Q18LIadZSymJgOQ 4o5Y6Ckw/xHe6QpLBbu/y9kMZzYrVOKQJW9+pTjN/oDmyRvcDRQrGoSjnBYVkO0ifnen /manxlze/2t9M/yL1WsblSrnZMWRbUzQzVnSaVFcSdpOkniEcjAn+OllvvQfjtrZJjPH wMGg== 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=eVdqb2R2TdPBBX5ap/wPEJ/2qjgYjC3Va0aegdZDNnAEhoO9EgNhm5xdldLxmcpMDR 67+Zh8CJI+sUBkc/b8yldyOq92nHHTfs58DA1B7CwljckK3eCy3tj+DEuaJ+XQT92cMV 6+k1/OPeYp6YkmldwUEqZJx6RERRGsC4cWX/vaaWIVd7gf+iBu98fQ4h+QNX2K53wuBe BEnLja5Kg8a2o2h3Xr8Uh6KB5PBbAImr8eWSkrXFA73BD7XEvevg1UerE1yUe4Uipwn7 tm7WL8zsSFhOVIb/y//DZxZPxbDjRFJR7zVrBMn0mcPlZLe0Sh/3tDStSlR6Phr2QSAm Ze1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Cha0JQR8; 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 nv8-20020a17090b1b4800b0020d3424d919si10671661pjb.97.2022.10.24.05.41.54; Mon, 24 Oct 2022 05:42:09 -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=Cha0JQR8; 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 S231765AbiJXMby (ORCPT + 99 others); Mon, 24 Oct 2022 08:31:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233780AbiJXM25 (ORCPT ); Mon, 24 Oct 2022 08:28:57 -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 A5D8A870A8; Mon, 24 Oct 2022 05:02:47 -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 B405EB811F5; Mon, 24 Oct 2022 11:59:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1544EC433D6; Mon, 24 Oct 2022 11:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612772; bh=BBEZSL/kEaLKT0nn3CDJDaoaCe8MaFX+1kU7JZ+z9Ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cha0JQR8eSlxHXQjsOYNiD2ONaTNod9hkwDoi9EIAAXp4MhTtVF4nFZHMUOwWyMNP 139bthBplrAjA5Xy9L8pn5Fl8eaOag9LlvZtPScqrC36TR0ncHVau3eSsw+v1RicZP 4H4Ga0eqq3hB3OI4/gl+e/Toin8YoMx+Wj+tnr3w= 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.19 112/229] ARM: dts: kirkwood: lsxl: fix serial line Date: Mon, 24 Oct 2022 13:30:31 +0200 Message-Id: <20221024113002.628237795@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747572835879115977?= X-GMAIL-MSGID: =?utf-8?q?1747572835879115977?= 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";