From patchwork Sat Jan 15 21:09:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 12714424 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 B01BCC433EF for ; Sat, 15 Jan 2022 21:10:35 +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=LAybBscO7l3tfbH+GT8lA24FhBzaOJSitHVTA9IhoZw=; b=DPESb8NEPI3UU2 IB4ONz/WeP4qCp9X73VqWUKwyTbt0mpfslWclZhvRufziTQnJkygcWSAK8eDvD6ysxNI0K6sRsrY3 eqJQzUohc5viwwzDrQ1mY+pZLcwlKDnlp3LUL/OPZo10zYQV9YJlyBAK/tqcRV/VOdxaCaz1Eh2R0 rOZgPaK44GKKHn5qVU0k+E1PKiuPthDmoui9PTpWDWdAPzXSrfNtF+2fuo9S0Oq227jZm/FP6wO/1 zevlYsUm8sr3IhvuMUPV4foBTdx9mw0CieHUZhpL0O/RuzoHTXeHnvA1fLjsbKzCL7aIB+Q/BP84g d6WBaKOfiSU0e6X4MH8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8qIY-00BZhn-0f; Sat, 15 Jan 2022 21:09:18 +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 1n8qIT-00BZgt-U1 for linux-arm-kernel@lists.infradead.org; Sat, 15 Jan 2022 21:09:15 +0000 Received: from apollo.. (unknown [IPv6:2a02:810b:4340:43bf: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 E400622246; Sat, 15 Jan 2022 22:09:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1642280952; 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=E3bZN+tCtpj0s3950gxxED/Fb6Z7y2Jy3Qm5SKVqIzg=; b=UF4nZDHiJBnqMHdC9AvR6yxp1ztp46Rh3sMFLLOamRtkhhEeNEAr9GAGgo3pearaoN0LMT gRwZ35I3NqDnHiMq/E0mk2GZxFxWAceppO5G1p0SRqoWrJpZodV8+jMpAhhTdZyRVNiVQI mYbxlsm1uH0qppFQJva6HEY2XLhmIlI= From: Michael Walle To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Shawn Guo , Li Yang , Rob Herring , Biwen Li , Michael Walle Subject: [PATCH 1/2] Revert "arm64: dts: ls1028a-rdb: enable pwm0" Date: Sat, 15 Jan 2022 22:09:06 +0100 Message-Id: <20220115210907.451189-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-20220115_130914_140647_EEE0C7A8 X-CRM114-Status: UNSURE ( 8.66 ) X-CRM114-Notice: Please train this message. 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 We need to revert commit 71799672ea24d ("arm64: dts: ls1028a: add flextimer based pwm nodes"). To not break the LS1028A-RDB board dts, we also need to revert this commit. This reverts commit b2e2d3e02fb60f4d45843ceebef0465c59c8d392. Fixes: b2e2d3e02fb6 ("arm64: dts: ls1028a-rdb: enable pwm0") Signed-off-by: Michael Walle --- arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts index 68c31cb8eead..6d26b010187c 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts @@ -286,10 +286,6 @@ &optee { status = "okay"; }; -&pwm0 { - status = "okay"; -}; - &sai4 { status = "okay"; }; From patchwork Sat Jan 15 21:09:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 12714425 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 8FD62C433EF for ; Sat, 15 Jan 2022 21:10:44 +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=pzy919kMxWOPtptP2GOPGMLauRu7oJ05C/0SWLuYuNE=; b=O8/y9aBiylZ8aW mVbmrxZ2voeGS1Cvems6adeVT9LvqBOC+3l0Bna3w/qFjKz873IO/cRiZrbFLvkEP8Pqjt+Fti3mD 0hZlZm8FZxOTFabi1mWsmtEL7lnWPJJztZ0RhSfUrd+8SWe7yqPSCMHFhpUXHwCN5RUt6KlE2t5/C IzBlxTdSO5/xs7ggHAuTKgmoNH0zvn09EfQ5PmBDw79Upf1MTwhkAjzStzjqYNeuM8ETHHO/QxYmf jycJZ6LYTi4XyBRNxczWkAZCdVlqDeECDAyFffefdqLFuoTdYO3vOUnoiIKUH2jIYZgmyBsSh8b/K qPmQmcooLqP4ebyN8Qxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8qIh-00BZjx-PW; Sat, 15 Jan 2022 21:09:27 +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 1n8qIW-00BZgw-7O for linux-arm-kernel@lists.infradead.org; Sat, 15 Jan 2022 21:09:18 +0000 Received: from apollo.. (unknown [IPv6:2a02:810b:4340:43bf: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 C4728223EA; Sat, 15 Jan 2022 22:09:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1642280953; 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=k5tn68llnv3Y3QD1FEMzUGnRcOKYr1qqq3usYUvxU2k=; b=fHwyiNWeiVEP7yxZ7+GMJh8yNjX2WdU9oFL8ZAOJtpziKQd7IqpsYoDtRQ0ZuSBLKUOlbH xG4nRyB4d1mDAb2a0srTGYTSWgosk3UhUkQbMJXT38MjOyqXEdzQ6vJ5zewAZmVL9M85Z0 77zTAz5+mf8hZhuXU+aZ1serg6Symbg= From: Michael Walle To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Shawn Guo , Li Yang , Rob Herring , Biwen Li , Michael Walle Subject: [PATCH 2/2] Revert "arm64: dts: ls1028a: add flextimer based pwm nodes" Date: Sat, 15 Jan 2022 22:09:07 +0100 Message-Id: <20220115210907.451189-2-michael@walle.cc> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115210907.451189-1-michael@walle.cc> References: <20220115210907.451189-1-michael@walle.cc> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220115_130916_609933_45F785E6 X-CRM114-Status: GOOD ( 12.12 ) 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 The changes to the device tree look very wrong. There are now two devices with the same base address: pwm0 and ftm_alarm0. Both are using the Flex Timer Module. It seems like this should either be one driver or and MFD driver. Either way, there should only be one node in the device tree. Revert the offending changes to avoid getting a broken device tree in circulation. This reverts commit 71799672ea24d2935322d655d2407c1ccd7db9ff. Fixes: 71799672ea24 ("arm64: dts: ls1028a: add flextimer based pwm nodes") Signed-off-by: Michael Walle --- Btw, the nodes are also not sorted by the address. Otherwise it should have been spotted easily. .../arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 95 ------------------- 1 file changed, 95 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index 1ef26cbc79cb..d3cc8cbaf768 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi @@ -66,13 +66,6 @@ CPU_PW20: cpu-pw20 { }; }; - rtc_clk: rtc-clk { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <32768>; - clock-output-names = "rtc_clk"; - }; - sysclk: sysclk { compatible = "fixed-clock"; #clock-cells = <0>; @@ -1245,94 +1238,6 @@ ierb@1f0800000 { reg = <0x01 0xf0800000 0x0 0x10000>; }; - pwm0: pwm@2800000 { - compatible = "fsl,vf610-ftm-pwm"; - #pwm-cells = <3>; - reg = <0x0 0x2800000 0x0 0x10000>; - clock-names = "ftm_sys", "ftm_ext", - "ftm_fix", "ftm_cnt_clk_en"; - clocks = <&clockgen 4 1>, <&clockgen 4 1>, - <&rtc_clk>, <&clockgen 4 1>; - status = "disabled"; - }; - - pwm1: pwm@2810000 { - compatible = "fsl,vf610-ftm-pwm"; - #pwm-cells = <3>; - reg = <0x0 0x2810000 0x0 0x10000>; - clock-names = "ftm_sys", "ftm_ext", - "ftm_fix", "ftm_cnt_clk_en"; - clocks = <&clockgen 4 1>, <&clockgen 4 1>, - <&rtc_clk>, <&clockgen 4 1>; - status = "disabled"; - }; - - pwm2: pwm@2820000 { - compatible = "fsl,vf610-ftm-pwm"; - #pwm-cells = <3>; - reg = <0x0 0x2820000 0x0 0x10000>; - clock-names = "ftm_sys", "ftm_ext", - "ftm_fix", "ftm_cnt_clk_en"; - clocks = <&clockgen 4 1>, <&clockgen 4 1>, - <&rtc_clk>, <&clockgen 4 1>; - status = "disabled"; - }; - - pwm3: pwm@2830000 { - compatible = "fsl,vf610-ftm-pwm"; - #pwm-cells = <3>; - reg = <0x0 0x2830000 0x0 0x10000>; - clock-names = "ftm_sys", "ftm_ext", - "ftm_fix", "ftm_cnt_clk_en"; - clocks = <&clockgen 4 1>, <&clockgen 4 1>, - <&rtc_clk>, <&clockgen 4 1>; - status = "disabled"; - }; - - pwm4: pwm@2840000 { - compatible = "fsl,vf610-ftm-pwm"; - #pwm-cells = <3>; - reg = <0x0 0x2840000 0x0 0x10000>; - clock-names = "ftm_sys", "ftm_ext", - "ftm_fix", "ftm_cnt_clk_en"; - clocks = <&clockgen 4 1>, <&clockgen 4 1>, - <&rtc_clk>, <&clockgen 4 1>; - status = "disabled"; - }; - - pwm5: pwm@2850000 { - compatible = "fsl,vf610-ftm-pwm"; - #pwm-cells = <3>; - reg = <0x0 0x2850000 0x0 0x10000>; - clock-names = "ftm_sys", "ftm_ext", - "ftm_fix", "ftm_cnt_clk_en"; - clocks = <&clockgen 4 1>, <&clockgen 4 1>, - <&rtc_clk>, <&clockgen 4 1>; - status = "disabled"; - }; - - pwm6: pwm@2860000 { - compatible = "fsl,vf610-ftm-pwm"; - #pwm-cells = <3>; - reg = <0x0 0x2860000 0x0 0x10000>; - clock-names = "ftm_sys", "ftm_ext", - "ftm_fix", "ftm_cnt_clk_en"; - clocks = <&clockgen 4 1>, <&clockgen 4 1>, - <&rtc_clk>, <&clockgen 4 1>; - status = "disabled"; - }; - - pwm7: pwm@2870000 { - compatible = "fsl,vf610-ftm-pwm"; - #pwm-cells = <3>; - reg = <0x0 0x2870000 0x0 0x10000>; - clock-names = "ftm_sys", "ftm_ext", - "ftm_fix", "ftm_cnt_clk_en"; - clocks = <&clockgen 4 1>, <&clockgen 4 1>, - <&rtc_clk>, <&clockgen 4 1>; - status = "disabled"; - }; - rcpm: power-controller@1e34040 { compatible = "fsl,ls1028a-rcpm", "fsl,qoriq-rcpm-2.1+"; reg = <0x0 0x1e34040 0x0 0x1c>;