From patchwork Tue Aug 16 00:10:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 12944134 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B899C00140 for ; Tue, 16 Aug 2022 00:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=paXDOm8ker27t+XBMTENiLJr+aRF34nYu32/FubUASI=; b=Xv+7QGxbbqd+Ss fIel1qqaNi8eKKGALxu9i1mLiiHAbmz0CRInVNFvhVzr3AI15NajrpsB/j9Sisq3GcDdlpJGtX8nd nKStJCkclDG3olefmPoV91N7OjHSxAgdPqh6iBk9HGjnfLGwX3LZU5cVAr8grbgDjaBHJLtE6w0yp QTvsVHtACIKVSb/kpDIZh+eTbeP5zXmYbx7ceKqYbzeT/GNhNkwz6AahxVcJ8V4uOCwkQnIFHwlob dpnJLQ6v4XvJPIJQ5cI4kJTTo4PPabj5s6y28OGV5KcCYcd65pioBg/tKcUQPKwEz2gPgPCBdh/xc oxbmBZtr3McLmVbaoDFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNkAX-007pZq-V4; Tue, 16 Aug 2022 00:10:54 +0000 Received: from ssl.serverraum.org ([2a01:4f8:151:8464::1:2]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNkAU-007pVK-Ol for linux-arm-kernel@lists.infradead.org; Tue, 16 Aug 2022 00:10:52 +0000 Received: from apollo.. (unknown [IPv6:2a02:810b:4340:4c9d:4685:ff:fe12:5967]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 904202223D; Tue, 16 Aug 2022 02:10:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1660608636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=STGQVtq+8nAltSBU+rS2THY1t5PQzKni78N07VtqrIo=; b=pcpfs6feB0d74oUYscLlGC7rPvebScaU5X/vU2igcJGXqqcjnnZcQ0HcrvXtI4TRgdI6yh VLXnVmMpcMtXFOjfR7kOd56RZsKvThKfyr0Li6nLsHQXH41Ke4MBxBLqU5YB11ZoIHTqWr vZ0tB14U1R95+a1luL3sUt+fRBJjn88= From: Michael Walle To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Cc: Rob Herring , Krzysztof Kozlowski , Jason Cooper , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Walle Subject: [PATCH 1/2] ARM: dts: kirkwood: lsxl: fix serial line Date: Tue, 16 Aug 2022 02:10:24 +0200 Message-Id: <20220816001026.830127-1-michael@walle.cc> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220815_171051_050846_136A7742 X-CRM114-Status: GOOD ( 12.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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 @@ chosen { 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"; From patchwork Tue Aug 16 00:10:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 12944135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AA2C3C00140 for ; Tue, 16 Aug 2022 00:12:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KsJzH2TpPAKnvTj3Q+KU3v3vx+cwxNiE5fH42hIHlhg=; b=Wk5YSU2n3nqrKg zhu+npk3MjHbdbdkKpRVx0NZ4gib2zTBSIHOR5uVgiJy0Y4uSxEFhbinHllybANZa0NolOOpGKgyx FfnGYJvXUQRCaTDcvDaAX073wOIvYg0OXaXyhqM1TLMP5FD67D3FU8bzeg3Q5QbOCgCPBosg6D4d2 5qe3dy6a4YwLDI2nWxx97qagOF6aVeVPwnBPGZ3LIQGN8x+dHr/cWH0K15KmUFn/AOxwZa3145WUe OLHTR02EwjYZSPlG+saA0G9oCcO4eBnVmZl4UOvSa8keyoeLFGwef1bF9gHQlAUTB6cEUCOnOx3ZM xQMUjrcoNA0L1rterErg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNkAi-007pdx-A8; Tue, 16 Aug 2022 00:11:04 +0000 Received: from ssl.serverraum.org ([176.9.125.105]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNkAV-007pVe-5x for linux-arm-kernel@lists.infradead.org; Tue, 16 Aug 2022 00:10:52 +0000 Received: from apollo.. (unknown [IPv6:2a02:810b:4340:4c9d:4685:ff:fe12:5967]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 5EB4022246; Tue, 16 Aug 2022 02:10:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1660608637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s6sfL/IpHCO5ayLJarfEJ6CHqefLnUieEgUWu11IwfQ=; b=rIcIEwe1mpCVf2/+sAmGDcCp6x1VeLKUN8ghoq7EKgTXAG7gY+IzsqePBF/kHiHPUDQRaU DMfQjfw22XLplvxGUgT0mgCifGlMPP+XIaw8oEc0hUOd05LC1lhzKV137xT0Z4GekTI636 BK0zPI/Gc3L5fnKlGCDwZZhVcGNVS+M= From: Michael Walle To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Cc: Rob Herring , Krzysztof Kozlowski , Jason Cooper , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Walle Subject: [PATCH 2/2] ARM: dts: kirkwood: lsxl: remove first ethernet port Date: Tue, 16 Aug 2022 02:10:25 +0200 Message-Id: <20220816001026.830127-2-michael@walle.cc> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220816001026.830127-1-michael@walle.cc> References: <20220816001026.830127-1-michael@walle.cc> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220815_171051_410924_353AAF13 X-CRM114-Status: GOOD ( 10.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Both the Linkstation LS-CHLv2 and the LS-XHL have only one ethernet port. This has always been wrong, i.e. the board code used to set up both ports, but the driver will play nice and return -ENODEV if the assiciated PHY is not found. Nevertheless, it is wrong. Remove it. Fixes: 876e23333511 ("ARM: kirkwood: add gigabit ethernet and mvmdio device tree nodes") Signed-off-by: Michael Walle Reviewed-by: Andrew Lunn --- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index 321a40a98ed2..88b70ba1c8fe 100644 --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi @@ -218,22 +218,11 @@ hdd_power: regulator@2 { &mdio { status = "okay"; - ethphy0: ethernet-phy@0 { - reg = <0>; - }; - ethphy1: ethernet-phy@8 { reg = <8>; }; }; -ð0 { - status = "okay"; - ethernet0-port@0 { - phy-handle = <ðphy0>; - }; -}; - ð1 { status = "okay"; ethernet1-port@0 {