Skip to content

Commit

Permalink
ARM: DT: imx53: fix lvds channel 1 port
Browse files Browse the repository at this point in the history
using LVDS channel 1 on an i.MX53 leads to following error:

imx-ldb 53fa8008.ldb: unable to set di0 parent clock to ldb_di1

This comes from imx_ldb_set_clock with mux = 0. Mux parameter must be "1" for
reparenting di1 clock to ldb_di1. The value of the mux param comes from device
tree port settings.

On i.MX5, the internal two-input-multiplexer is used. Due to hardware limitations,
only one port (port@[0,1]) can be used for each channel (lvds-channel@[0,1],
respectively)

Documentation update suggested by Philipp Zabel <p.zabel@pengutronix.de>

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
Fixes: e05c8c9 ("ARM: dts: imx53: Add IPU DI ports and endpoints, move imx-drm node to dtsi")
Cc: <stable@vger.kernel.org>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Markus Niebel authored and Arnd Bergmann committed Sep 11, 2014
1 parent 3d3c6a5 commit 1b134c9
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
15 changes: 13 additions & 2 deletions Documentation/devicetree/bindings/staging/imx-drm/ldb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ Required properties:
- fsl,data-width : should be <18> or <24>
- port: A port node with endpoint definitions as defined in
Documentation/devicetree/bindings/media/video-interfaces.txt.
On i.MX5, the internal two-input-multiplexer is used.
Due to hardware limitations, only one port (port@[0,1])
can be used for each channel (lvds-channel@[0,1], respectively)
On i.MX6, there should be four ports (port@[0-3]) that correspond
to the four LVDS multiplexer inputs.

Expand All @@ -78,6 +81,8 @@ ldb: ldb@53fa8008 {
"di0", "di1";

lvds-channel@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
fsl,data-mapping = "spwg";
fsl,data-width = <24>;
Expand All @@ -86,14 +91,18 @@ ldb: ldb@53fa8008 {
/* ... */
};

port {
port@0 {
reg = <0>;

lvds0_in: endpoint {
remote-endpoint = <&ipu_di0_lvds0>;
};
};
};

lvds-channel@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
fsl,data-mapping = "spwg";
fsl,data-width = <24>;
Expand All @@ -102,7 +111,9 @@ ldb: ldb@53fa8008 {
/* ... */
};

port {
port@1 {
reg = <1>;

lvds1_in: endpoint {
remote-endpoint = <&ipu_di1_lvds1>;
};
Expand Down
12 changes: 10 additions & 2 deletions arch/arm/boot/dts/imx53.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -423,21 +423,29 @@
status = "disabled";

lvds-channel@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
status = "disabled";

port {
port@0 {
reg = <0>;

lvds0_in: endpoint {
remote-endpoint = <&ipu_di0_lvds0>;
};
};
};

lvds-channel@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
status = "disabled";

port {
port@1 {
reg = <1>;

lvds1_in: endpoint {
remote-endpoint = <&ipu_di1_lvds1>;
};
Expand Down

0 comments on commit 1b134c9

Please sign in to comment.