From patchwork Wed Nov 2 21:22:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 13029008 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 BF994C4332F for ; Wed, 2 Nov 2022 21:24:07 +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=WDps+Hjyqg47oF6PoypAIQ1VeHkdH8HJ9liE/wwU7Kc=; b=A49nUcK5E+Cc6r yVjwB4KY50/UJaIg36dqpCHN5BhmBrr9F4H8F+O48RMTtYeAacvFCcnSWwdFmKJPYzkkKG+QdXVP4 WPj3/DeSBX7JHl0qpERBqU6oPs22faJFrWxMzf7ygvGnUoVV65pth7deX1H64OXSKYecrOZkHv/4a ZtlEzyawJ0BeJZVP/eJOATDZI5vD3Mlfgcya/FStpgCw0RimUSnrchaQcb7YrmTFQj0hHf0+srMqb 6Tu5ZYRg8bbmBWga7rAc+Vj+2m2+3FpittyPhMaDSVheuex/PZLUD7dIsQpf/dQYiKe9BA8vO7G0/ cP2SI7ofnBguPs51fgbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oqLCZ-00ETjh-6E; Wed, 02 Nov 2022 21:23:11 +0000 Received: from phobos.denx.de ([85.214.62.61]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oqLCN-00ETfo-56 for linux-arm-kernel@lists.infradead.org; Wed, 02 Nov 2022 21:23:02 +0000 Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 83E68850A5; Wed, 2 Nov 2022 22:22:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1667424177; bh=DzA9AAySm+tp91jJiJvwLCBIv95cG2fDI5ygX8879A8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lASDO+xG/nGZLulHKZEKRAM8RT/4V45fOJNzmWSvwnxLf7mFzlVV3h7gKAg4zyVac EQkc7z1hBftGL3RJpJ4/pQX/7nsov8zoM2wC+IF6AOnZvmlu+WFWnjk/GfUMnR+r6e rAFHlRDoMM0g7G8pCr9mXumD+q5pmdj5FLwc3R732t+GXG2Y5MOOXxsw7R/4h+Wlte eGHqcWPYzz5QM15UvOigbScoOYIBJuldLhi+12hUkcd229feNkgYAUAiutJ1J8rhiF 1QYxkJc2NbL8trfGAlVwryaXeZZWDZ9HLzWTXmVwFoMm7ahsW8O5lMZ2/iwNO2yc4B JrPe4v84iMFfw== From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Cc: Marek Vasut , Fabio Estevam , Peng Fan , Richard Zhu , Shawn Guo , NXP Linux Team Subject: [PATCH 2/3] arm64: dts: imx8mp: Deduplicate PCIe clock-names property Date: Wed, 2 Nov 2022 22:22:47 +0100 Message-Id: <20221102212248.138284-2-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221102212248.138284-1-marex@denx.de> References: <20221102212248.138284-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221102_142259_515326_EC90138A X-CRM114-Status: GOOD ( 12.99 ) 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 Move the PCIe clock-names property from various DTs into SoC dtsi to reduce duplication. In case of a couple of boards, reorder the clock so they match the order in yaml DT bindings. Signed-off-by: Marek Vasut Reviewed-by: Alexander Stein --- Cc: Fabio Estevam Cc: Peng Fan Cc: Richard Zhu Cc: Shawn Guo Cc: NXP Linux Team To: linux-arm-kernel@lists.infradead.org --- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 5 ++--- arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts | 5 ++--- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts index 9f1469db554d3..aa1cfa337c1ac 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts @@ -380,9 +380,8 @@ &pcie { pinctrl-0 = <&pinctrl_pcie0>; reset-gpio = <&gpio2 7 GPIO_ACTIVE_LOW>; clocks = <&clk IMX8MP_CLK_HSIO_ROOT>, - <&clk IMX8MP_CLK_PCIE_ROOT>, - <&clk IMX8MP_CLK_HSIO_AXI>; - clock-names = "pcie", "pcie_aux", "pcie_bus"; + <&clk IMX8MP_CLK_HSIO_AXI>, + <&clk IMX8MP_CLK_PCIE_ROOT>; assigned-clocks = <&clk IMX8MP_CLK_PCIE_AUX>; assigned-clock-rates = <10000000>; assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_50M>; diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts index ceeca4966fc5c..8a8f2a7b7a5e8 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts @@ -594,9 +594,8 @@ &pcie { pinctrl-0 = <&pinctrl_pcie0>; reset-gpio = <&gpio2 17 GPIO_ACTIVE_LOW>; clocks = <&clk IMX8MP_CLK_HSIO_ROOT>, - <&clk IMX8MP_CLK_PCIE_ROOT>, - <&clk IMX8MP_CLK_HSIO_AXI>; - clock-names = "pcie", "pcie_aux", "pcie_bus"; + <&clk IMX8MP_CLK_HSIO_AXI>, + <&clk IMX8MP_CLK_PCIE_ROOT>; assigned-clocks = <&clk IMX8MP_CLK_PCIE_AUX>; assigned-clock-rates = <10000000>; assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_50M>; diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index d7039d9fe61ad..69f8b2a42528a 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -1192,6 +1192,7 @@ pcie: pcie@33800000 { <0 0 0 4 &gic GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; fsl,max-link-speed = <3>; linux,pci-domain = <0>; + clock-names = "pcie", "pcie_bus", "pcie_aux"; power-domains = <&hsio_blk_ctrl IMX8MP_HSIOBLK_PD_PCIE>; resets = <&src IMX8MP_RESET_PCIE_CTRL_APPS_EN>, <&src IMX8MP_RESET_PCIE_CTRL_APPS_TURNOFF>;