ARM: dts: imx6sx: Remove LDB endpoint
Fabio Estevam
reviewerPATCH v2 1/3 ARM: dts: imx6sx: Remove LDB endpoint
From: Fabio Estevam <[email protected]>
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.
---
Changes since v1:
- None
arch/arm/boot/dts/imx6sx.dtsi | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/boot/dts/imx6sx.dtsi +2 -6
@@ -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 { }; }; };
Signature · 1 line
2.34.1
Fabio Estevam
reviewerPATCH v2 2/3 ARM: dts: imx6sx: Describe the default LCDIF1 parent
From: Fabio Estevam <[email protected]>
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.
---
Changes since v1:
- None
arch/arm/boot/dts/imx6sx.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/imx6sx.dtsi +4 -0
@@ -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";
Signature · 1 line
2.34.1
Fabio Estevam
reviewerPATCH v2 3/3 clk: imx: imx6sx: Allow passing the LCDIF1 parent via DT
In reply to Fabio EstevamIt 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.
---
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(-)
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