clk: imx: imx6sx: Allow a different LCDIF1 clock parent
Subsystems (3)
Fabio Estevam
reviewerPATCH RESEND v4 1/1 clk: imx: imx6sx: Allow a different LCDIF1 clock parent
From: Fabio Estevam <[email protected]>
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 original behavior.
---
Changes since v3:
- Check for the presence of 'assigned-clock-parents'. (Stephen)
drivers/clk/imx/clk-imx6sx.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/clk/imx/clk-imx6sx.c +11 -3
@@ -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))
Signature · 1 line
2.34.1
Quoted 6 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
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.
Quoted 8 lines
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 original behavior.
Signed-off-by Fabio Estevam <[email protected]>Reviewed-by Abel Vesa <[email protected]>
I applied already the first v4 you sent.
https://lore.kernel.org/all/[email protected]/
Thanks.
Quoted 42 lines
---
Changes since v3:
- Check for the presence of 'assigned-clock-parents'. (Stephen)drivers/clk/imx/clk-imx6sx.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/clk/imx/clk-imx6sx.c +11
-3@@ -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))Signature · 1 line
2.34.1