From patchwork Fri Jun 9 03:12:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 13273217 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9042CC7EE23 for ; Fri, 9 Jun 2023 03:13:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229445AbjFIDNE (ORCPT ); Thu, 8 Jun 2023 23:13:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229520AbjFIDNC (ORCPT ); Thu, 8 Jun 2023 23:13:02 -0400 Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EE4430E7 for ; Thu, 8 Jun 2023 20:13:00 -0700 (PDT) Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-19f84b396b4so283601fac.0 for ; Thu, 08 Jun 2023 20:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686280379; x=1688872379; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ONtBub6zTiGILsFXcr0jpjnAmwxvEv6wu11A7UAraNI=; b=B4nvrHXK0cAyGJjc2LNvkucxGZZAODju1NqbN+tckhBktUlwq/S3Y1q9feNKei9fhX ZjZF6NPbxCNbs+4vufNM5dDylrddi9gFYb3fWQoLjWHycDGFRHGX9ls+y2uKBRxXd70M 7IuVG76cS0nskRksP1Bb+kdtF3s9heKPtChnBxDTuKGps0c+PX/qS78uvL8orphlDI/N qxXkj9zmvfDdTwDwbtatXbLWpwRbQT2z9nmqkX0zOrmzi03/UMWCdzv6wxQ3zYhT8uN6 6SF6RX0lA1FF59FjtK8AKb95rcoVAR9cPlTlhEbFl5agH+3sdQ9J/z5Mzmjbmtb4B/BO 3GMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686280379; x=1688872379; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ONtBub6zTiGILsFXcr0jpjnAmwxvEv6wu11A7UAraNI=; b=gxUb5WPHLLwMC4C9+Ef8nTtbzvon4NPkUN6kBURX2j3W8Vxa4dILrqUQYKQAhhuC9Z m3zQzNMrJ+sXEpvN7cGPzGBOhsWQYxinOl+NDYYRvTptuEFeHfjEBT7kkXTNZzyxk745 smfRWLv7fzFgmUm1tWYG3rfNI8q2sXxIU+6x2DYWVWT/VtSZTCCec15oDXjuxw/Xwfip lEKILotSupMJZX8TUsMy7DXOB3hQvIXtBl5997wTQatfBJS/UyNOCaOtrGJw/9Fu+cvs zZbIdRpBjURenHT6+jn/tX7USzawQ6Enx3AHU9gQ6gqGH5kDKtV1EM7d4aOUF/pVxJ7m 67AQ== X-Gm-Message-State: AC+VfDwiuTLuHgGK2zQzjDCPK46HErHLHT8XwzVBQvIMN7MBZ58l4qrL ZhTQxXv8azaMz/eqEh7KO3t9B6Zsw2E= X-Google-Smtp-Source: ACHHUZ41TMdV0Tfhj5Yxysosp4JSH70wcUCY+rg5Yb3fLSqQ2c8Mqvz0ynPU20LxfJGzm2gEl/gWUw== X-Received: by 2002:aca:3d83:0:b0:39a:17c1:97ed with SMTP id k125-20020aca3d83000000b0039a17c197edmr191847oia.4.1686280377926; Thu, 08 Jun 2023 20:12:57 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:8c46:67c3:a757:2399]) by smtp.gmail.com with ESMTPSA id r3-20020acac103000000b00395f5cd1a0dsm1047493oif.9.2023.06.08.20.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 20:12:57 -0700 (PDT) From: Fabio Estevam To: shawnguo@kernel.org Cc: sboyd@kernel.org, abelvesa@kernel.org, hs@denx.de, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Fabio Estevam Subject: [PATCH v2 1/3] ARM: dts: imx6sx: Remove LDB endpoint Date: Fri, 9 Jun 2023 00:12:47 -0300 Message-Id: <20230609031249.3692841-1-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Fabio Estevam Remove the LDB endpoint description from the common imx6sx.dtsi as it causes regression for boards that has the LCDIF connected directly to a parallel display. Let the LDB endpoint be described in the board devicetree file instead. Fixes: b74edf626c4f ("ARM: dts: imx6sx: Add LDB support") Signed-off-by: Fabio Estevam --- Changes since v1: - None arch/arm/boot/dts/imx6sx.dtsi | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 3a4308666552..41c900929758 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -863,7 +863,6 @@ port@0 { reg = <0>; ldb_from_lcdif1: endpoint { - remote-endpoint = <&lcdif1_to_ldb>; }; }; @@ -1309,11 +1308,8 @@ lcdif1: lcdif@2220000 { power-domains = <&pd_disp>; status = "disabled"; - ports { - port { - lcdif1_to_ldb: endpoint { - remote-endpoint = <&ldb_from_lcdif1>; - }; + port { + lcdif1_to_ldb: endpoint { }; }; }; From patchwork Fri Jun 9 03:12:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 13273218 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D572C7EE2E for ; Fri, 9 Jun 2023 03:13:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229520AbjFIDNG (ORCPT ); Thu, 8 Jun 2023 23:13:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231547AbjFIDNE (ORCPT ); Thu, 8 Jun 2023 23:13:04 -0400 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC91330E6 for ; Thu, 8 Jun 2023 20:13:03 -0700 (PDT) Received: by mail-oi1-x231.google.com with SMTP id 5614622812f47-39c40b94fedso109252b6e.0 for ; Thu, 08 Jun 2023 20:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686280383; x=1688872383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pdcoXrVKUjNxK20AUGxUd3nCpXpvG2ISuks4CEzgCZ4=; b=IRmsHH3e0y2zI1SQsQA6zlPQ0K8S8eLRrtrwTtJyRvBDJMAqpe/p1912uqZDFFVBye NgGw/+FSzebELnvVkLMtNTL0rTYhaxpyakqMAfY45gZsgtR63rLky/IjtvwkV7oRNMst 5b1GBxWmYiCfeR58IuQVgOZp5mVZIEi5Uu2X+80YC90qZlUkHjF33KyWmEuRB+QLhkD8 KLzrPAzHdOSDJRx0XQuh2sqsI2zp9NFVKRfc5gvUERBI/Pw970Uj6fpXFQRht0i93A7m RFWkLcNp5uBZwENNxO5VK5UGEw7TJ1RSsOF0eRaUgeXos1gRL0v4BOD2/pZmYf9QLmSu YuCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686280383; x=1688872383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pdcoXrVKUjNxK20AUGxUd3nCpXpvG2ISuks4CEzgCZ4=; b=BB8h9n7dfpwMvTKAdzOf/hgsfVJBspxhvO3FFoG6PgAGBIJ+Nl4UyXbMx4yvyG3udM Md9eIFWmtMuGOEXxSt6MUpVFcVxX5ZZXeaTw8m3RPu2ReKvqFip4Vm2jZfetb24geifY J5xLBMJRlKXfhKNaJHK5oD2gl77PgJn8xUydVXz5r2pjiZln0hA2cnlulJP2xLw5Wz9f DpM6KAGfGQTdmXOM2QhtDG0bcTwU81HZ9G238juZT/VdYnWg9ChFMznZ+0vi1exwy+KP Gd1dL8iRWEzF4U09qnLkLAMWp4YTGBEIzyhx5XSOfynpbepyhLhD7xnXRKXBPlkifV6p VnJA== X-Gm-Message-State: AC+VfDyUcVhD2FKiQ5fbExnz1Vx/1qYBWvzGXwlB+4Qf9k6Vy8Rv0ysq rwpB5VuizJQtun5n+bgOJMY= X-Google-Smtp-Source: ACHHUZ7aV6JiIRnVdy3z9BctAAbLJ0NFniFjkGmZHcvZWsFw5zrbszYlMUB7vZObABURZ3Rai9IihA== X-Received: by 2002:aca:ef06:0:b0:394:b8:cb8b with SMTP id n6-20020acaef06000000b0039400b8cb8bmr198478oih.5.1686280383022; Thu, 08 Jun 2023 20:13:03 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:8c46:67c3:a757:2399]) by smtp.gmail.com with ESMTPSA id r3-20020acac103000000b00395f5cd1a0dsm1047493oif.9.2023.06.08.20.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 20:13:02 -0700 (PDT) From: Fabio Estevam To: shawnguo@kernel.org Cc: sboyd@kernel.org, abelvesa@kernel.org, hs@denx.de, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Fabio Estevam Subject: [PATCH v2 2/3] ARM: dts: imx6sx: Describe the default LCDIF1 parent Date: Fri, 9 Jun 2023 00:12:48 -0300 Message-Id: <20230609031249.3692841-2-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230609031249.3692841-1-festevam@gmail.com> References: <20230609031249.3692841-1-festevam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Fabio Estevam A suitable default for the LCDIF parent is the PLL5 clock, so describe it in the device tree. The imx6sx clock driver harcodes PLL5 as the LCDIF1 parent, but in preparation for removing such hardcoding, describe the parent relationship via devicetree. There are some boards that may want to use a different parent for the LCDIF due to EMI reasons, for example. With this approch, the user can change the LCDIF parent in the board devicetree if needed. Signed-off-by: Fabio Estevam --- Changes since v1: - None arch/arm/boot/dts/imx6sx.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 41c900929758..0d549e1f3ced 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -1305,6 +1305,10 @@ lcdif1: lcdif@2220000 { <&clks IMX6SX_CLK_LCDIF_APB>, <&clks IMX6SX_CLK_DISPLAY_AXI>; clock-names = "pix", "axi", "disp_axi"; + assigned-clocks = <&clks IMX6SX_CLK_LCDIF1_PRE_SEL>, + <&clks IMX6SX_CLK_LCDIF1_SEL>; + assigned-clock-parents = <&clks IMX6SX_CLK_PLL5_VIDEO_DIV>, + <&clks IMX6SX_CLK_LCDIF1_PODF>; power-domains = <&pd_disp>; status = "disabled"; From patchwork Fri Jun 9 03:12:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 13273219 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B08B4C7EE23 for ; Fri, 9 Jun 2023 03:13:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231182AbjFIDNJ (ORCPT ); Thu, 8 Jun 2023 23:13:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231985AbjFIDNI (ORCPT ); Thu, 8 Jun 2023 23:13:08 -0400 Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2397430E7 for ; Thu, 8 Jun 2023 20:13:07 -0700 (PDT) Received: by mail-oi1-x22b.google.com with SMTP id 5614622812f47-39aab5cf7baso122312b6e.1 for ; Thu, 08 Jun 2023 20:13:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686280386; x=1688872386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uq0koP/F2W4q5CpX2VXG7fhsAJ76lOHszEn4twrgKgY=; b=l02oS5A6QcTVuBMCjzp3Lj1Ngky5CIFaI8PYcUQNvTMhFkjzm7Wn+71/l8h5TZsTD9 bjZpPD0pBXnR0XAntQ9qwfuQXMd0ZYWfMHrNoJljHntafFMd1fxaHwQ01kKy8KPtYHWW CcxPDjGsejxP+FQYv8u2LuWBIGQIWz6W5xyYG5JUCG/PW3OGMxXPHmuJMYbaXNvQgKVN bgH42nInQ0d0lpsUI+WE6LAqrocvrn/9gqTyuxOb/ZKMnIemVAhNUnXlcGDnow/83IJO bCDcCun72x8fzyn5BXPB6GjDepK1z3jrPPkh6wUkV71f8/N196kO9u7B4ukn6nO8oTrW otXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686280386; x=1688872386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uq0koP/F2W4q5CpX2VXG7fhsAJ76lOHszEn4twrgKgY=; b=U/RZtFjstYaHDhsCMeWAHCsgtBXXGqA6e3BD+faZInBPGb3AXi/J2UBj/sezJP5wun xsJHNz0Yrw0zcIpPR0rHZSIACW/6aSaw/yhMd897XSPV/XR3qPQY6iutyvV3Kj5AtHDN kpvCmEtXHqYPt+JroFKMHe/oGk6IV140wk4lhYW8lAcwQnaDBPDFAmMsd5kSp9AhsQnm vyya2HJR2Q2RJipThZJA6rdunlj159zYWC/2xls0Ns9BLCNeuQNsSYySARlrkL74koBu FSDeCzX9treYeIsvZvimjxmcBM6yRCx0qOdvQt4guPb9T+P5E4h6amEUYXsAkpISZL0J VNag== X-Gm-Message-State: AC+VfDyJZ5e72fnjNnwvegzO9qTMYJaKcDMM02FdCHo9b3TZaLz4lUH/ Ls+sxXoA8bvWDc11/fK19L8= X-Google-Smtp-Source: ACHHUZ6nCO5DhkRn4gaNK0wK0bjSafxQDqfOgLlFFPtBHdOr2gfZ2FZ6Y5HXYbjgrTY6pvYMDlaWtQ== X-Received: by 2002:aca:3d82:0:b0:39a:9e76:ea3c with SMTP id k124-20020aca3d82000000b0039a9e76ea3cmr268736oia.2.1686280386402; Thu, 08 Jun 2023 20:13:06 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:8c46:67c3:a757:2399]) by smtp.gmail.com with ESMTPSA id r3-20020acac103000000b00395f5cd1a0dsm1047493oif.9.2023.06.08.20.13.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 20:13:06 -0700 (PDT) From: Fabio Estevam To: shawnguo@kernel.org Cc: sboyd@kernel.org, abelvesa@kernel.org, hs@denx.de, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Fabio Estevam Subject: [PATCH v2 3/3] clk: imx: imx6sx: Allow passing the LCDIF1 parent via DT Date: Fri, 9 Jun 2023 00:12:49 -0300 Message-Id: <20230609031249.3692841-3-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230609031249.3692841-1-festevam@gmail.com> References: <20230609031249.3692841-1-festevam@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org It is not a good idea to hardcode the LCDIF1 parent inside the clock driver because some users may want to use a different clock parent for LCDIF1. One of the reasons could be related to EMI tests. Remove the harcoded LCDIF1 parent when the LCDIF1 parent is described via devicetree. Old dtb's that do not describe the LCDIF1 parent via devicetree will use the same PLL5 clock as parent to keep the same behavior. Signed-off-by: Fabio Estevam --- Changes since v1: - Check for the presence of 'assigned-clock-parents'. (Stephen) drivers/clk/imx/clk-imx6sx.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c index 3f1502933e59..69f8f6f9ca49 100644 --- a/drivers/clk/imx/clk-imx6sx.c +++ b/drivers/clk/imx/clk-imx6sx.c @@ -121,6 +121,7 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) { struct device_node *np; void __iomem *base; + bool lcdif1_assigned_clk; clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, IMX6SX_CLK_CLK_END), GFP_KERNEL); @@ -498,9 +499,16 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) clk_set_parent(hws[IMX6SX_CLK_EIM_SLOW_SEL]->clk, hws[IMX6SX_CLK_PLL2_PFD2]->clk); clk_set_rate(hws[IMX6SX_CLK_EIM_SLOW]->clk, 132000000); - /* set parent clock for LCDIF1 pixel clock */ - clk_set_parent(hws[IMX6SX_CLK_LCDIF1_PRE_SEL]->clk, hws[IMX6SX_CLK_PLL5_VIDEO_DIV]->clk); - clk_set_parent(hws[IMX6SX_CLK_LCDIF1_SEL]->clk, hws[IMX6SX_CLK_LCDIF1_PODF]->clk); + np = of_find_node_by_path("/soc/bus@2200000/spba-bus@2240000/lcdif@2220000"); + lcdif1_assigned_clk = of_find_property(np, "assigned-clock-parents", NULL); + + /* Set parent clock for LCDIF1 pixel clock if not done via devicetree */ + if (!lcdif1_assigned_clk) { + clk_set_parent(hws[IMX6SX_CLK_LCDIF1_PRE_SEL]->clk, + hws[IMX6SX_CLK_PLL5_VIDEO_DIV]->clk); + clk_set_parent(hws[IMX6SX_CLK_LCDIF1_SEL]->clk, + hws[IMX6SX_CLK_LCDIF1_PODF]->clk); + } /* Set the parent clks of PCIe lvds1 and pcie_axi to be pcie ref, axi */ if (clk_set_parent(hws[IMX6SX_CLK_LVDS1_SEL]->clk, hws[IMX6SX_CLK_PCIE_REF_125M]->clk))