From patchwork Mon Nov 27 16:05:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Hieber X-Patchwork-Id: 170260 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3247777vqx; Mon, 27 Nov 2023 08:07:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IHp85Q4aAewoHhFbYsQ/A/SKg5GCW07TFEQpFQzmw/6K2GfVUTHGwfmrYLTQfnhAxrgvVP+ X-Received: by 2002:a17:902:7483:b0:1cf:7df0:667f with SMTP id h3-20020a170902748300b001cf7df0667fmr13561295pll.44.1701101267889; Mon, 27 Nov 2023 08:07:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701101267; cv=none; d=google.com; s=arc-20160816; b=qBld9zI8PnGkbY2HmtfOK4PKlII48nD4+Z0waIDZ1/exS6Jgl5nEdbDc+lb3AuKmZ5 5+ess+w1okXxjwAdpDKg5YWOxCmF4Kr+cpKObkWSjSL+785QsvZxgFh3L8iVT75mgwRN VziVrfdRJMxDT4ufZhJXPV7N6+7oGylcENK3bjCMUsP33xzUHZOtLysYm2MPa1i0BRJO 40Hc0cCc3F0FEg6OMeVXZSATO+ltkvthvr0inFT3EDf7aN5TE73/vZqFnjRa/V6Qn5So iGQNt5B4IESb1u/zh2TZ7x4DfO07gAcBo6+Ha0auQwkWULSJH4O6rrvY2tMUlYU81ev0 yVgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from; bh=K9cBBAd4lJNQ1cLaWCmQxWToGbITsfxexEWSu+H2JYg=; fh=4Cem8u6No5jj/QsJ+KiB9tEdCNXVXqK7H0f171iWtUo=; b=a811GdpLdRD/yx9yUPC9ojHpQRyZz69HqlhgKzkzLtQ+WU5OdYyhNgRYxOr3aI7q2N UUeptukRpJduER8l0c7E1peAtK1U9l/2zuUEo5S9JLB4I/61SZuDCLZcDKKECe1rTbiw WdF+DnfY1b2Wvuad155+lyzTroaLRv7pIhHSwgV0/SE1P0nExVh6ljjJP8oSnuG7ud3X AuWu1riXXbj3eof8LMGJF1NcJntxbhg5l1iON/H1bp9GS987W6Zrx0n70GptEkJXFO77 +0mhYpyun/gbKCGAIUf1sWuX8kTNxomL82iFikylYa038Xcbmtrl4KjPFtRv4gllXMSI ZDjw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id o9-20020a170902d4c900b001cfc3295702si4134769plg.109.2023.11.27.08.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:07:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 00AE080782B5; Mon, 27 Nov 2023 08:07:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234305AbjK0QHe (ORCPT + 99 others); Mon, 27 Nov 2023 11:07:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234293AbjK0QHd (ORCPT ); Mon, 27 Nov 2023 11:07:33 -0500 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA8FBCE for ; Mon, 27 Nov 2023 08:07:39 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r7e6u-00009E-Dr; Mon, 27 Nov 2023 17:05:24 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r7e6t-00Bz08-Ny; Mon, 27 Nov 2023 17:05:23 +0100 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1r7e6t-00D6SA-2B; Mon, 27 Nov 2023 17:05:23 +0100 From: Roland Hieber Date: Mon, 27 Nov 2023 17:05:01 +0100 Subject: [PATCH] ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt MIME-Version: 1.0 Message-Id: <20231127-b4-imx7-dt-v1-1-6ecbd0471cc4@pengutronix.de> X-B4-Tracking: v=1; b=H4sIACy+ZGUC/x2NywqDMBAAf0X27IKbRgL+ivSQx7YuaCyJloD47 116nIFhLqhchCtM3QWFv1JlzwrUdxAXn9+MkpTBDOZBZBwGi7I1h+lAl2h0bDlSMqBB8JUxFJ/ jokk+11Xlp/BL2v8wP+/7Bwty/vFxAAAA To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Frank Li , Anson Huang Cc: Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Philipp Zabel , Roland Hieber X-Mailer: b4 0.12.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: auto@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:07:43 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783733963121077044 X-GMAIL-MSGID: 1783733963121077044 From: Philipp Zabel The timer nodes declare compatibility with "fsl,imx6sx-gpt", which itself is compatible with "fsl,imx6dl-gpt". Switch the fallback compatible from "fsl,imx6sx-gpt" to "fsl,imx6dl-gpt". Fixes: 949673450291 ("ARM: dts: add imx7d soc dtsi file") Signed-off-by: Philipp Zabel Signed-off-by: Roland Hieber --- arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- base-commit: 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab change-id: 20231127-b4-imx7-dt-7d157e4ec1d2 Best regards, diff --git a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi index 29b8fd03567a..5387da8a2a0a 100644 --- a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi @@ -454,7 +454,7 @@ iomuxc_lpsr: pinctrl@302c0000 { }; gpt1: timer@302d0000 { - compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt"; + compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt"; reg = <0x302d0000 0x10000>; interrupts = ; clocks = <&clks IMX7D_GPT1_ROOT_CLK>, @@ -463,7 +463,7 @@ gpt1: timer@302d0000 { }; gpt2: timer@302e0000 { - compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt"; + compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt"; reg = <0x302e0000 0x10000>; interrupts = ; clocks = <&clks IMX7D_GPT2_ROOT_CLK>, @@ -473,7 +473,7 @@ gpt2: timer@302e0000 { }; gpt3: timer@302f0000 { - compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt"; + compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt"; reg = <0x302f0000 0x10000>; interrupts = ; clocks = <&clks IMX7D_GPT3_ROOT_CLK>, @@ -483,7 +483,7 @@ gpt3: timer@302f0000 { }; gpt4: timer@30300000 { - compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt"; + compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt"; reg = <0x30300000 0x10000>; interrupts = ; clocks = <&clks IMX7D_GPT4_ROOT_CLK>,