From patchwork Wed Jan 10 10:00:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13515884 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 84E4CC3DA6E for ; Wed, 10 Jan 2024 10:01:25 +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=ym7D8i1MysE/iBJOZ7DlS91vmZxkS6pte343brATxe4=; b=TzsJ+rx53PeUIj hRcZfmqvMu7t/SRmzWdq7gDL4QXhpuqg3I4xwZ94Uva88wjlz6E2SOu8nHi5rGKVer3DOfDe97PKw OFd/hPdTSHDGcBbdlfaXM1335i2Y0tL63AtdhctdY/l/dNBW6Wa+h4F/h+yd3CfXUdrlPo7JXHXi5 +ORDbYYykOaEsfZ7MkrlMg6DUUEFF9KkmnoGj8c9c5HWYrtI/wEmAnBiWml7fM2NHyIt5fXW9WTNH c7RTtembahgL44cn7L5ng+DtiWFHmNEu1UAvfPVPWBc8Cmw4H/8YX9DXkm0HPOKJOEyRW2/fqQP1y y8TKnq+b3heDd8+P/gYA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rNVOL-00Ax1x-1X; Wed, 10 Jan 2024 10:00:57 +0000 Received: from mx1.tq-group.com ([93.104.207.81]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rNVOI-00Ax1W-0c for linux-arm-kernel@lists.infradead.org; Wed, 10 Jan 2024 10:00:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1704880854; x=1736416854; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=OLyp1ICWd0G/YPF8zkEl5A+hQlhmDxp0FKlzwStg3RA=; b=iPFUFPMWFsY5jaLaPq+HlnGaUVwYvSgHoLStnl54dURgKt1ahavZns5k gUuiXjuGKEOO5UVHz/gDUEHHIDwRkFh3GOtyqj/3oMozm47jTkL21B9X0 6NiFOzEcULu/fOQCPZPVHPmlKEWi2E9OeSdtx+F4OkqwY4J6rSmDK/ZpY Vflj+lbLP5csY7AE/amRju/tax3ipP0+ftYkS92CHE1OKwsoD0Vr/H5nm JxEJwXIPGEcOodYNO6ouhsDtbLsBGS7ytIRVClV5cSK4J8C1fqRXz2KOK QfPHZDJqOjGwdpbrq/Cu3v0we8Y9ynn+1L1yNwx5mnbOLvAejVSqUybH9 w==; X-IronPort-AV: E=Sophos;i="6.04,184,1695679200"; d="scan'208";a="34825035" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 10 Jan 2024 11:00:51 +0100 Received: from steina-w.tq-net.de (steina-w.tq-net.de [10.123.53.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 97FCC280075; Wed, 10 Jan 2024 11:00:51 +0100 (CET) From: Alexander Stein To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Alexander Stein , Pengutronix Kernel Team , NXP Linux Team , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/1] arm64: dts: imx8mp: reparent MEDIA_MIPI_PHY1_REF to CLK_24M Date: Wed, 10 Jan 2024 11:00:48 +0100 Message-Id: <20240110100048.478001-1-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240110_020054_622338_11F29042 X-CRM114-Status: GOOD ( 11.98 ) 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 This is already done in dsi node, introduced in commit eda09fe149df4 ("arm64: dts: imx8mp: Add display pipeline components"). This needs to be applied to csi nodes as well or the clock might be busy if both csi and dsi nodes are enabled. Fixes error: clk: failed to reparent media_mipi_phy1_ref to osc_24m: -16 Signed-off-by: Alexander Stein --- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index 76c73daf546bd..9ab9c057f41ea 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -1636,8 +1636,10 @@ mipi_csi_0: csi@32e40000 { <&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF_ROOT>, <&clk IMX8MP_CLK_MEDIA_AXI_ROOT>; clock-names = "pclk", "wrap", "phy", "axi"; - assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM1_PIX>; - assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_1000M>; + assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM1_PIX>, + <&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_1000M>, + <&clk IMX8MP_CLK_24M>; assigned-clock-rates = <500000000>; power-domains = <&media_blk_ctrl IMX8MP_MEDIABLK_PD_MIPI_CSI2_1>; status = "disabled"; @@ -1670,8 +1672,10 @@ mipi_csi_1: csi@32e50000 { <&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF_ROOT>, <&clk IMX8MP_CLK_MEDIA_AXI_ROOT>; clock-names = "pclk", "wrap", "phy", "axi"; - assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM2_PIX>; - assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_1000M>; + assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM1_PIX>, + <&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_1000M>, + <&clk IMX8MP_CLK_24M>; assigned-clock-rates = <266000000>; power-domains = <&media_blk_ctrl IMX8MP_MEDIABLK_PD_MIPI_CSI2_2>; status = "disabled";