LVDS Display Bridge support for i.MX
Subsystems (5)
cover LVDS Display Bridge support for i.MX
Hi,
the following patches add support for LVDS displays on i.MX53 and i.MX6q boards.
The clock patches are needed because the LVDS serial clock has to be in lockstep with the IPU display interface clock providing the pixel data. A fixed factor of 7:1 (or 3.5:1 in dual link mode) needs to be maintained. This is achieved on i.MX by clocking the LDB interface clock directly from a PLL, and manually setting the 3.5/7:1 divider depending on dual/single link mode. The IPU display interface clock is then sourced from the divided LDB clock.
regards
Philipp
--- arch/arm/boot/dts/imx51.dtsi | 2 + arch/arm/boot/dts/imx53.dtsi | 34 ++ arch/arm/boot/dts/imx6q.dtsi | 17 + arch/arm/boot/dts/imx6qdl.dtsi | 26 ++ arch/arm/mach-imx/clk-imx51-imx53.c | 19 +- arch/arm/mach-imx/clk-imx6q.c | 43 ++- arch/arm/mach-imx/clk.h | 17 + arch/arm/mach-imx/common.h | 1 + arch/arm/mach-imx/mach-imx6q.c | 2 +- drivers/staging/imx-drm/Kconfig | 7 + drivers/staging/imx-drm/Makefile | 1 + drivers/staging/imx-drm/imx-ldb.c | 614 ++++++++++++++++++++++++++++++++++++ 12 files changed, 758 insertions(+), 25 deletions(-)
PATCH 1/11 staging: drm/imx: Add LDB support
From: Sascha Hauer <[email protected]>
This adds support for the LVDS Display Bridge contained in i.MX5 and i.MX6 SoCs.
Bit mapping, data width, and video timings are configurable via device tree. Dual-channel mode is supported for a single high-resolution source.
--- drivers/staging/imx-drm/Kconfig | 7 + drivers/staging/imx-drm/Makefile | 1 + drivers/staging/imx-drm/imx-ldb.c | 614 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 622 insertions(+) create mode 100644 drivers/staging/imx-drm/imx-ldb.c
drivers/staging/imx-drm/Kconfig +7 -0
@@ -20,6 +20,13 @@ config DRM_IMX_PARALLEL_DISPLAY tristate "Support for parallel displays" depends on DRM_IMX +config DRM_IMX_LDB + tristate "Support for LVDS displays" + help + Choose this to enable the internal LVDS Display Bridge (LDB) + found on i.MX53 and i.MX6 processors. + depends on DRM_IMX + config DRM_IMX_IPUV3_CORE tristate "IPUv3 core support" depends on DRM_IMX
drivers/staging/imx-drm/Makefile +1 -0
@@ -4,6 +4,7 @@ imxdrm-objs := imx-drm-core.o imx-fb.o obj-$(CONFIG_DRM_IMX) += imxdrm.o obj-$(CONFIG_DRM_IMX_PARALLEL_DISPLAY) += parallel-display.o +obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o obj-$(CONFIG_DRM_IMX_FB_HELPER) += imx-fbdev.o obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/ obj-$(CONFIG_DRM_IMX_IPUV3) += ipuv3-crtc.o
drivers/staging/imx-drm/imx-ldb.c new file +614 -0
614 lines not on this page · raw message
Signature · 1 line
1.8.2.rc2
PATCH 1/11 staging: drm/imx: Add LDB support
Dear Philipp Zabel,
drivers/staging/imx-drm/imx-ldb.c line 451
Quoted 11 lines · Philipp Zabel
drivers/staging/imx-drm/imx-ldb.c new file +11
-0+/* +* For a device declaring compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb", +* of_match_device will walk through this list and take the first entry +* matching any of its compatible values. Therefore, the more generic +* entries (in this case fsl,imx53-ldb) need to be ordered last. +*/ +static const struct of_device_id imx_ldb_dt_ids[] = { + { .compatible ="fsl,imx6q-ldb" , .data = imx6q_lvds_mux, }, + { .compatible ="fsl,imx53-ldb" , .data =NULL , }, + { } +};
You probably want a new DT binding documentation in Documentation/devicetree/bindings/.
Best regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 1/11 staging: drm/imx: Add LDB support
Hi Thomas,
Am Dienstag, den 26.03.2013, 15:34 +0100 schrieb Thomas Petazzoni:
Quoted 4 lines
Dear Philipp Zabel,
On Tue, 26 Mar 2013 15:13:56 +0100, Philipp Zabel wrote:
Quoted 14 lines
drivers/staging/imx-drm/imx-ldb.c line 451
Quoted 11 lines
drivers/staging/imx-drm/imx-ldb.c new file +11
-0+/* +* For a device declaring compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb", +* of_match_device will walk through this list and take the first entry +* matching any of its compatible values. Therefore, the more generic +* entries (in this case fsl,imx53-ldb) need to be ordered last. +*/ +static const struct of_device_id imx_ldb_dt_ids[] = { + { .compatible ="fsl,imx6q-ldb" , .data = imx6q_lvds_mux, }, + { .compatible ="fsl,imx53-ldb" , .data =NULL , }, + { } +};You probably want a new DT binding documentation in
Documentation/devicetree/bindings/.
Yes, this could be something along the lines of:
Device-Tree bindings for LVDS Display Bridge (ldb)
LVDS Display Bridge
===================
The LVDS Display Bridge device tree node contains up to two lvds-channel nodes describing each of the two LVDS encoder channels of the bridge.
Required properties:
- #address-cells : should be <1>
- #size-cells : should be <0>
- compatible : should be "fsl,imx53-ldb" or "fsl,imx6q-ldb".
Both LDB versions are similar, but i.MX6 has an additional multiplexer in the front to select any of the four IPU display interfaces as input.
- gpr : should be <&gpr> on i.MX53 and i.MX6q.
The phandle points to the iomuxc-gpr region containing the LVDS control register.
- clocks : phandles pointing to the LDB display interface clocks, LDB source selector clocks
- clocks, clock-names : phandles to the LDB divider and selector clocks and to the display interface selector clocks, as described in Documentation/devicetree/bindings/clock/clock-bindings.txt The following clocks are expected on i.MX53:
"di0_pll" - LDB LVDS channel 0 mux
"di1_pll" - LDB LVDS channel 1 mux
"di0" - LDB LVDS channel 0 gate
"di1" - LDB LVDS channel 1 gate
"di0_sel" - IPU1 DI0 mux
"di1_sel" - IPU1 DI1 mux
On i.MX6q the following additional clocks are needed:
"di2_sel" - IPU2 DI0 mux
"di3_sel" - IPU2 DI1 mux
The needed clock numbers for each are documented in Documentation/devicetree/bindings/clock/imx5-clock.txt, and in Documentation/devicetree/bindings/clock/imx6q-clock.txt.
Optional properties:
- pinctrl-names : should be "default" on i.MX53, not used on i.MX6q
- pinctrl-0 : should be <&pinctrl_lvds1_1> on i.MX53, not used on i.MX6q
- fsl,dual-channel : boolean. if it exists, only LVDS channel 0 should be configured - one input will be distributed on both outputs in dual channel mode
LVDS Channel
============
Each LVDS Channel has to contain a display-timings node that describes the video timings for the connected LVDS display. For detailed information, have a look at Documentation/devicetree/bindings/video/display-timing.txt.
Required properties:
- reg : should be <0> or <1>
- crtcs : a list of phandles with index pointing to the IPU display interfaces that can be used as video source for this channel.
- fsl,data-mapping : should be "spwg" or "jeida"
This describes how the color bits are laid out in the serialized LVDS signal.
- fsl,data-width : should be <18> or <24>
Example:
gpr: iomuxc-gpr at 53fa8000 {
/* ... */
};
ldb: ldb at 53fa8008 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "fsl,imx53-ldb";
gpr = <&gpr>;
clocks = <&clks 122>, <&clks 120>,
<&clks 115>, <&clks 116>,
<&clks 123>, <&clks 85>;
clock-names = "di0_pll", "di1_pll",
"di0_sel", "di1_sel",
"di0", "di1";
lvds-channel at 0 {
reg = <0>;
crtcs = <&ipu 0>;
fsl,data-mapping = "spwg";
fsl,data-width = <24>;
display-timings {
/* ... */
};
};
lvds-channel at 1 {
reg = <1>;
crtcs = <&ipu 1>;
fsl,data-mapping = "spwg";
fsl,data-width = <24>;
display-timings {
/* ... */
};
};
};thanks
Philipp
PATCH 1/11 staging: drm/imx: Add LDB support
In reply to Philipp ZabelHi Philipp,
drivers/staging/imx-drm/imx-ldb.c line 284
Quoted 8 lines · Philipp Zabel
drivers/staging/imx-drm/imx-ldb.c new file +7
-0+static void imx_ldb_encoder_disable (struct drm_encoder *encoder) +{ +struct imx_ldb_channel *imx_ldb_ch =enc_to_imx_ldb_ch (encoder); +struct imx_ldb *ldb = imx_ldb_ch->ldb; + +if (gpio_is_valid (imx_ldb_ch->enable_gpio)) +gpio_set_value (imx_ldb_ch->enable_gpio,0 );
I get a compile error here:drivers/staging/imx-drm/imx-ldb.c: In function ?imx_ldb_encoder_disable?:drivers/staging/imx-drm/imx-ldb.c:283:2: error: implicit declaration of function ?gpio_is_valid? [-Werror=implicit-function-declaration] drivers/staging/imx-drm/imx-ldb.c:283:30: error: ?struct imx_ldb_channel? has no member named ?enable_gpio? drivers/staging/imx-drm/imx-ldb.c:284:3: error: implicit declaration of function ?gpio_set_value? [-Werror=implicit-function-declaration] drivers/staging/imx-drm/imx-ldb.c:284:28: error: ?struct imx_ldb_channel? has no member named ?enable_gpio?
Adding #include <linux/gpio.h> fixes that but gives another error:drivers/staging/imx-drm/imx-ldb.c: In function ?imx_ldb_encoder_disable?:drivers/staging/imx-drm/imx-ldb.c:284:30: error: ?struct imx_ldb_channel? has no member named ?enable_gpio? drivers/staging/imx-drm/imx-ldb.c:285:28: error: ?struct imx_ldb_channel? has no member named ?enable_gpio?
Commenting out the block gives a working driver.
Regards,
Martin
PATCH 1/11 staging: drm/imx: Add LDB support
Hi Martin,
Am Mittwoch, den 27.03.2013, 12:54 +0100 schrieb Martin Fuzzey:
Quoted 23 lines
Hi Philipp,
drivers/staging/imx-drm/imx-ldb.c line 284
Quoted 8 lines · Philipp Zabel
drivers/staging/imx-drm/imx-ldb.c new file +7
-0+static void imx_ldb_encoder_disable (struct drm_encoder *encoder) +{ +struct imx_ldb_channel *imx_ldb_ch =enc_to_imx_ldb_ch (encoder); +struct imx_ldb *ldb = imx_ldb_ch->ldb; + +if (gpio_is_valid (imx_ldb_ch->enable_gpio)) +gpio_set_value (imx_ldb_ch->enable_gpio,0 );I get a compile error here:
drivers/staging/imx-drm/imx-ldb.c: In function ?imx_ldb_encoder_disable?:drivers/staging/imx-drm/imx-ldb.c:283:2: error: implicit declaration of function ?gpio_is_valid? [-Werror=implicit-function-declaration]drivers/staging/imx-drm/imx-ldb.c:283:30: error: ?structimx_ldb_channel? has no member named ?enable_gpio?drivers/staging/imx-drm/imx-ldb.c:284:3: error: implicit declaration of function ?gpio_set_value? [-Werror=implicit-function-declaration]drivers/staging/imx-drm/imx-ldb.c:284:28: error: ?structimx_ldb_channel? has no member named ?enable_gpio?
Quoted 8 lines
Adding #include <
linux/gpio.h> fixes that but gives another error:drivers/staging/imx-drm/imx-ldb.c: In function ?imx_ldb_encoder_disable?:drivers/staging/imx-drm/imx-ldb.c:284:30: error: ?structimx_ldb_channel? has no member named ?enable_gpio?drivers/staging/imx-drm/imx-ldb.c:285:28: error: ?structimx_ldb_channel? has no member named ?enable_gpio?Commenting out the block gives a working driver.
thank you for pointing this out, the GPIO handling shouldn't have leaked into this patch series.
regards
Philipp
PATCH 2/11 ARM i.MX5: Move IPU clock lookups into device tree
In reply to Philipp Zabel--- arch/arm/boot/dts/imx51.dtsi | 2 ++ arch/arm/boot/dts/imx53.dtsi | 2 ++ arch/arm/mach-imx/clk-imx51-imx53.c | 7 ------- 3 files changed, 4 insertions(+), 7 deletions(-)
arch/arm/boot/dts/imx51.dtsi +2 -0
@@ -67,6 +67,8 @@ compatible = "fsl,imx51-ipu"; reg = <0x40000000 0x20000000>; interrupts = <11 10>; + clocks = <&clks 59>, <&clks 110>, <&clks 61>; + clock-names = "bus", "di0", "di1"; }; aips at 70000000 { /* AIPS1 */
arch/arm/boot/dts/imx53.dtsi +2 -0
@@ -72,6 +72,8 @@ compatible = "fsl,imx53-ipu"; reg = <0x18000000 0x080000000>; interrupts = <11 10>; + clocks = <&clks 59>, <&clks 110>, <&clks 61>; + clock-names = "bus", "di0", "di1"; }; aips at 50000000 { /* AIPS1 */
arch/arm/mach-imx/clk-imx51-imx53.c +0 -7
@@ -362,9 +362,6 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,clk_register_clkdev (clk[mx51_mipi],"mipi_hsp" ,NULL );clk_register_clkdev (clk[vpu_gate],NULL ,"imx51-vpu.0" );clk_register_clkdev (clk[fec_gate],NULL ,"imx27-fec.0" ); -clk_register_clkdev (clk[ipu_gate],"bus" ,"40000000.ipu" ); -clk_register_clkdev (clk[ipu_di0_gate],"di0" ,"40000000.ipu" ); -clk_register_clkdev (clk[ipu_di1_gate],"di1" ,"40000000.ipu" );clk_register_clkdev (clk[usb_phy_gate],"phy" ,"mxc-ehci.0" );clk_register_clkdev (clk[esdhc1_ipg_gate],"ipg" ,"sdhci-esdhc-imx51.0" );clk_register_clkdev (clk[dummy],"ahb" ,"sdhci-esdhc-imx51.0" );
@@ -471,10 +468,6 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,clk_register_clkdev (clk[vpu_gate],NULL ,"imx53-vpu.0" );clk_register_clkdev (clk[i2c3_gate],NULL ,"imx21-i2c.2" );clk_register_clkdev (clk[fec_gate],NULL ,"imx25-fec.0" ); -clk_register_clkdev (clk[ipu_gate],"bus" ,"18000000.ipu" ); -clk_register_clkdev (clk[ipu_di0_gate],"di0" ,"18000000.ipu" ); -clk_register_clkdev (clk[ipu_di1_gate],"di1" ,"18000000.ipu" ); -clk_register_clkdev (clk[ipu_gate],"hsp" ,"18000000.ipu" );clk_register_clkdev (clk[usb_phy1_gate],"usb_phy1" ,"mxc-ehci.0" );clk_register_clkdev (clk[esdhc1_ipg_gate],"ipg" ,"sdhci-esdhc-imx53.0" );clk_register_clkdev (clk[dummy],"ahb" ,"sdhci-esdhc-imx53.0" );
Signature · 1 line
1.8.2.rc2
PATCH 3/11 ARM i.MX6q: export imx6q_revision
In reply to Philipp ZabelSo it can be used in clk-imx6q.c for revision dependent clock tree setup.
--- arch/arm/mach-imx/common.h | 1 + arch/arm/mach-imx/mach-imx6q.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-imx/common.h +1 -0
@@ -74,6 +74,7 @@ extern void mxc_set_cpu_type(unsigned int type);extern void mxc_restart (char ,const char *);extern void mxc_arch_reset_init (void __iomem *);extern int mx53_revision (void ); +extern int imx6q_revision (void );extern int mx53_display_revision (void );extern void imx_set_aips (void __iomem *);extern int mxc_device_init (void );
arch/arm/mach-imx/mach-imx6q.c +1 -1
@@ -41,7 +41,7 @@#define IMX6Q_ANALOG_DIGPROG 0x260 -static int imx6q_revision (void ) +int imx6q_revision (void ) {struct device_node *np;void __iomem *base;
Signature · 1 line
1.8.2.rc2
PATCH 4/11 ARM i.MX6q: Add audio/video PLL post dividers for i.MX6q rev 1.1
In reply to Philipp ZabelQuery silicon revision to determine clock tree and add post dividers for newer revisions.
--- arch/arm/mach-imx/clk-imx6q.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
arch/arm/mach-imx/clk-imx6q.c +23 -7
@@ -22,6 +22,7 @@#include "clk.h" #include "common.h" +#include "hardware.h" #define CCGR0 0x68#define CCGR1 0x6c
@@ -109,29 +110,32 @@ static const char *periph_clk2_sels[] = { "pll3_usb_otg", "osc", };static const char *periph_sels[] = {"periph_pre" ,"periph_clk2" , };static const char *periph2_sels[] = {"periph2_pre" ,"periph2_clk2" , };static const char *axi_sels[] = {"periph" ,"pll2_pfd2_396m" ,"pll3_pfd1_540m" , }; -static const char *audio_sels[] = {"pll4_audio" ,"pll3_pfd2_508m" ,"pll3_pfd3_454m" ,"pll3_usb_otg" , }; +static const char *audio_sels[] = {"pll4_test_div" ,"pll3_pfd2_508m" ,"pll3_pfd3_454m" ,"pll3_usb_otg" , };static const char *gpu_axi_sels[] = {"axi" ,"ahb" , };static const char *gpu2d_core_sels[] = {"axi" ,"pll3_usb_otg" ,"pll2_pfd0_352m" ,"pll2_pfd2_396m" , };static const char *gpu3d_core_sels[] = {"mmdc_ch0_axi" ,"pll3_usb_otg" ,"pll2_pfd1_594m" ,"pll2_pfd2_396m" , };static const char *gpu3d_shader_sels[] = {"mmdc_ch0_axi" ,"pll3_usb_otg" ,"pll2_pfd1_594m" ,"pll2_pfd9_720m" , };static const char *ipu_sels[] = {"mmdc_ch0_axi" ,"pll2_pfd2_396m" ,"pll3_120m" ,"pll3_pfd1_540m" , }; -static const char *ldb_di_sels[] = {"pll5_video" ,"pll2_pfd0_352m" ,"pll2_pfd2_396m" ,"mmdc_ch1_axi" ,"pll3_pfd1_540m" , }; -static const char *ipu_di_pre_sels[] = {"mmdc_ch0_axi" ,"pll3_usb_otg" ,"pll5_video" ,"pll2_pfd0_352m" ,"pll2_pfd2_396m" ,"pll3_pfd1_540m" , }; +static const char *ldb_di_sels[] = {"pll5_control3" ,"pll2_pfd0_352m" ,"pll2_pfd2_396m" ,"mmdc_ch1_axi" ,"pll3_pfd1_540m" , }; +static const char *ipu_di_pre_sels[] = {"mmdc_ch0_axi" ,"pll3_usb_otg" ,"pll5_control3" ,"pll2_pfd0_352m" ,"pll2_pfd2_396m" ,"pll3_pfd1_540m" , };static const char *ipu1_di0_sels[] = {"ipu1_di0_pre" ,"dummy" ,"dummy" ,"ldb_di0" ,"ldb_di1" , };static const char *ipu1_di1_sels[] = {"ipu1_di1_pre" ,"dummy" ,"dummy" ,"ldb_di0" ,"ldb_di1" , };static const char *ipu2_di0_sels[] = {"ipu2_di0_pre" ,"dummy" ,"dummy" ,"ldb_di0" ,"ldb_di1" , };static const char *ipu2_di1_sels[] = {"ipu2_di1_pre" ,"dummy" ,"dummy" ,"ldb_di0" ,"ldb_di1" , };static const char *hsi_tx_sels[] = {"pll3_120m" ,"pll2_pfd2_396m" , };static const char *pcie_axi_sels[] = {"axi" ,"ahb" , }; -static const char *ssi_sels[] = {"pll3_pfd2_508m" ,"pll3_pfd3_454m" ,"pll4_audio" , }; +static const char *ssi_sels[] = {"pll3_pfd2_508m" ,"pll3_pfd3_454m" ,"pll4_test_div" , };static const char *usdhc_sels[] = {"pll2_pfd2_396m" ,"pll2_pfd0_352m" , };static const char *enfc_sels[] = {"pll2_pfd0_352m" ,"pll2_bus" ,"pll3_usb_otg" ,"pll2_pfd2_396m" , };static const char *emi_sels[] = {"axi" ,"pll3_usb_otg" ,"pll2_pfd2_396m" ,"pll2_pfd0_352m" , };static const char *vdo_axi_sels[] = {"axi" ,"ahb" , };static const char *vpu_axi_sels[] = {"axi" ,"pll2_pfd2_396m" ,"pll2_pfd0_352m" , }; -static const char *cko1_sels[] = {"pll3_usb_otg" ,"pll2_bus" ,"pll1_sys" ,"pll5_video" , +static const char *cko1_sels[] = {"pll3_usb_otg" ,"pll2_bus" ,"pll1_sys" ,"pll5_control3" ,"dummy" ,"axi" ,"enfc" ,"ipu1_di0" ,"ipu1_di1" ,"ipu2_di0" , -"ipu2_di1" ,"ahb" ,"ipg" ,"ipg_per" ,"ckil" ,"pll4_audio" , }; +"ipu2_di1" ,"ahb" ,"ipg" ,"ipg_per" ,"ckil" ,"pll4_test_div" , }; + +static struct clk_div_table test_div_table[] = { {2 ,1 }, {1 ,2 }, {0 ,4 }, {0 ,0 }, }; +static struct clk_div_table control3_table[] = { {0 ,1 }, {1 ,2 }, {3 ,4 }, {0 ,0 }, };enum mx6q_clks { dummy, ckil, ckih, osc, pll2_pfd0_352m, pll2_pfd1_594m, pll2_pfd2_396m,
@@ -165,7 +169,7 @@ enum mx6q_clks { pll4_audio, pll5_video, pll8_mlb, pll7_usb_host, pll6_enet, ssi1_ipg, ssi2_ipg, ssi3_ipg, rom, usbphy1, usbphy2, ldb_di0_div_3_5, ldb_di1_div_3_5, sata_ref, sata_ref_100m, pcie_ref, pcie_ref_125m, enet_ref, usbphy1_gate, - usbphy2_gate, clk_max + usbphy2_gate, pll4_test_div, pll5_test_div, pll5_control3, clk_max };static struct clk *clk[clk_max];
@@ -208,6 +212,14 @@ int __init mx6q_clocks_init(void) base =of_iomap (np,0 );WARN_ON (!base); +/* Audio/video PLL post dividers do not work on i.MX6q revision 1.0 */ +if (imx6q_revision () ==IMX_CHIP_REVISION_1_0 ) { + test_div_table[1 ].div =1 ; + test_div_table[2 ].div =1 ; + control3_table[1 ].div =1 ; + control3_table[2 ].div =1 ; + }; +/* type name parent_name base div_mask */ clk[pll1_sys] =imx_clk_pllv3 (IMX_PLLV3_SYS ,"pll1_sys" ,"osc" , base,0x7f ); clk[pll2_bus] =imx_clk_pllv3 (IMX_PLLV3_GENERIC ,"pll2_bus" ,"osc" , base +0x30 ,0x1 );
@@ -260,6 +272,10 @@ int __init mx6q_clocks_init(void) clk[pll3_60m] =imx_clk_fixed_factor ("pll3_60m" ,"pll3_usb_otg" ,1 ,8 ); clk[twd] =imx_clk_fixed_factor ("twd" ,"arm" ,1 ,2 ); + clk[pll4_test_div] =clk_register_divider_table (NULL ,"pll4_test_div" ,"pll4_audio" ,CLK_SET_RATE_PARENT , base +0x70 ,19 ,2 ,0 , test_div_table,NULL ); + clk[pll5_test_div] =clk_register_divider_table (NULL ,"pll5_test_div" ,"pll5_video" ,CLK_SET_RATE_PARENT , base +0xa0 ,19 ,2 ,0 , test_div_table,NULL ); + clk[pll5_control3] =clk_register_divider_table (NULL ,"pll5_control3" ,"pll5_test_div" ,CLK_SET_RATE_PARENT , base +0x170 ,30 ,2 ,0 , control3_table,NULL ); + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx6q-ccm" ); base =of_iomap (np,0 );WARN_ON (!base);
Signature · 1 line
1.8.2.rc2
PATCH 5/11 ARM i.MX6q: set the LDB serial clock parent to the video PLL
In reply to Philipp ZabelOn i.MX6q revision 1.1 and later, set the video PLL as parent for the LDB clock branch. On revision 1.0, the video PLL is useless due to missing dividers, so keep the default parent (mmdc_ch1_axi).
--- arch/arm/mach-imx/clk-imx6q.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/mach-imx/clk-imx6q.c +5 -0
@@ -465,6 +465,11 @@ int __init mx6q_clocks_init(void)clk_register_clkdev (clk[cko1],"cko1" ,NULL );clk_register_clkdev (clk[arm],NULL ,"cpu0" ); +if (imx6q_revision () !=IMX_CHIP_REVISION_1_0 ) { +clk_set_parent (clk[ldb_di0_sel], clk[pll5_control3]); +clk_set_parent (clk[ldb_di1_sel], clk[pll5_control3]); + } +/* * The gpmi needs 100MHz frequency in the EDO/Sync mode, * We can not get the 100MHz from the pll2_pfd0_352m.
Signature · 1 line
1.8.2.rc2
PATCH 6/11 ARM i.MX: Add imx_clk_divider_flags and imx_clk_mux_flags
In reply to Philipp ZabelThe default is for dividers to set CLK_SET_PARENT_RATE and for muxes to not set that flag. In the LDB clock tree, we need the opposite, so add functions to create divider and mux clocks with configurable flags.
--- arch/arm/mach-imx/clk.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
arch/arm/mach-imx/clk.h +17 -0
@@ -59,6 +59,14 @@ static inline struct clk *imx_clk_divider(const char *name, const char *parent, reg, shift, width, 0, &imx_ccm_lock); } +static inline struct clk *imx_clk_divider_flags (const char *name, +const char *parent,void __iomem *reg,u8 shift,u8 width, +unsigned long flags) +{ +return clk_register_divider (NULL , name, parent, flags, + reg, shift, width,0 , &imx_ccm_lock); +} +static inline struct clk *imx_clk_gate (const char *name,const char *parent,void __iomem *reg,u8 shift) {
@@ -73,6 +81,15 @@ static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg, width, 0, &imx_ccm_lock); } +static inline struct clk *imx_clk_mux_flags (const char *name, +void __iomem *reg,u8 shift,u8 width,const char **parents, +int num_parents,unsigned long flags) +{ +return clk_register_mux (NULL , name, parents, num_parents, + flags, reg, shift, width,0 , + &imx_ccm_lock); +} +static inline struct clk *imx_clk_fixed_factor (const char *name,const char *parent,unsigned int mult,unsigned int div) {
Signature · 1 line
1.8.2.rc2
PATCH 7/11 ARM i.MX53: fix ldb di divider and selector clocks
In reply to Philipp ZabelUse imx_clk_mux_flags and imx_clk_divider_flags to set the appropriate flags for the LDB display interface divider and selector clocks.
--- arch/arm/mach-imx/clk-imx51-imx53.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-imx/clk-imx51-imx53.c +6 -6
@@ -420,15 +420,15 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, clk[pll3_sw] =imx_clk_pllv2 ("pll3_sw" ,"osc" ,MX53_DPLL3_BASE ); clk[pll4_sw] =imx_clk_pllv2 ("pll4_sw" ,"osc" ,MX53_DPLL4_BASE ); - clk[ldb_di1_sel] =imx_clk_mux ("ldb_di1_sel" ,MXC_CCM_CSCMR2 ,9 ,1 , - mx53_ldb_di1_sel,ARRAY_SIZE (mx53_ldb_di1_sel)); clk[ldb_di1_div_3_5] =imx_clk_fixed_factor ("ldb_di1_div_3_5" ,"ldb_di1_sel" ,2 ,7 ); - clk[ldb_di1_div] =imx_clk_divider ("ldb_di1_div" ,"ldb_di1_div_3_5" ,MXC_CCM_CSCMR2 ,11 ,1 ); + clk[ldb_di1_div] =imx_clk_divider_flags ("ldb_di1_div" ,"ldb_di1_div_3_5" ,MXC_CCM_CSCMR2 ,11 ,1 ,0 ); + clk[ldb_di1_sel] =imx_clk_mux_flags ("ldb_di1_sel" ,MXC_CCM_CSCMR2 ,9 ,1 , + mx53_ldb_di1_sel,ARRAY_SIZE (mx53_ldb_di1_sel),CLK_SET_RATE_PARENT ); clk[di_pll4_podf] =imx_clk_divider ("di_pll4_podf" ,"pll4_sw" ,MXC_CCM_CDCDR ,16 ,3 ); - clk[ldb_di0_sel] =imx_clk_mux ("ldb_di0_sel" ,MXC_CCM_CSCMR2 ,8 ,1 , - mx53_ldb_di0_sel,ARRAY_SIZE (mx53_ldb_di0_sel)); clk[ldb_di0_div_3_5] =imx_clk_fixed_factor ("ldb_di0_div_3_5" ,"ldb_di0_sel" ,2 ,7 ); - clk[ldb_di0_div] =imx_clk_divider ("ldb_di0_div" ,"ldb_di0_div_3_5" ,MXC_CCM_CSCMR2 ,10 ,1 ); + clk[ldb_di0_div] =imx_clk_divider_flags ("ldb_di0_div" ,"ldb_di0_div_3_5" ,MXC_CCM_CSCMR2 ,10 ,1 ,0 ); + clk[ldb_di0_sel] =imx_clk_mux_flags ("ldb_di0_sel" ,MXC_CCM_CSCMR2 ,8 ,1 , + mx53_ldb_di0_sel,ARRAY_SIZE (mx53_ldb_di0_sel),CLK_SET_RATE_PARENT ); clk[ldb_di0_gate] =imx_clk_gate2 ("ldb_di0_gate" ,"ldb_di0_div" ,MXC_CCM_CCGR6 ,28 ); clk[ldb_di1_gate] =imx_clk_gate2 ("ldb_di1_gate" ,"ldb_di1_div" ,MXC_CCM_CCGR6 ,30 ); clk[ipu_di0_sel] = imx_clk_mux("ipu_di0_sel", MXC_CCM_CSCMR2, 26, 3,
Signature · 1 line
1.8.2.rc2
PATCH 8/11 ARM i.MX6q: fix ldb di divider and selector clocks
In reply to Philipp ZabelUse imx_clk_mux_flags and imx_clk_divider_flags to set the appropriate flags for the LDB display interface divider and selector clocks.
--- arch/arm/mach-imx/clk-imx6q.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-imx/clk-imx6q.c +4 -4
@@ -299,8 +299,8 @@ int __init mx6q_clocks_init(void) clk[gpu3d_shader_sel] =imx_clk_mux ("gpu3d_shader_sel" , base +0x18 ,8 ,2 , gpu3d_shader_sels,ARRAY_SIZE (gpu3d_shader_sels)); clk[ipu1_sel] =imx_clk_mux ("ipu1_sel" , base +0x3c ,9 ,2 , ipu_sels,ARRAY_SIZE (ipu_sels)); clk[ipu2_sel] =imx_clk_mux ("ipu2_sel" , base +0x3c ,14 ,2 , ipu_sels,ARRAY_SIZE (ipu_sels)); - clk[ldb_di0_sel] =imx_clk_mux ("ldb_di0_sel" , base +0x2c ,9 ,3 , ldb_di_sels,ARRAY_SIZE (ldb_di_sels)); - clk[ldb_di1_sel] =imx_clk_mux ("ldb_di1_sel" , base +0x2c ,12 ,3 , ldb_di_sels,ARRAY_SIZE (ldb_di_sels)); + clk[ldb_di0_sel] =imx_clk_mux_flags ("ldb_di0_sel" , base +0x2c ,9 ,3 , ldb_di_sels,ARRAY_SIZE (ldb_di_sels),CLK_SET_RATE_PARENT ); + clk[ldb_di1_sel] =imx_clk_mux_flags ("ldb_di1_sel" , base +0x2c ,12 ,3 , ldb_di_sels,ARRAY_SIZE (ldb_di_sels),CLK_SET_RATE_PARENT ); clk[ipu1_di0_pre_sel] =imx_clk_mux ("ipu1_di0_pre_sel" , base +0x34 ,6 ,3 , ipu_di_pre_sels,ARRAY_SIZE (ipu_di_pre_sels)); clk[ipu1_di1_pre_sel] =imx_clk_mux ("ipu1_di1_pre_sel" , base +0x34 ,15 ,3 , ipu_di_pre_sels,ARRAY_SIZE (ipu_di_pre_sels)); clk[ipu2_di0_pre_sel] =imx_clk_mux ("ipu2_di0_pre_sel" , base +0x38 ,6 ,3 , ipu_di_pre_sels,ARRAY_SIZE (ipu_di_pre_sels));
@@ -348,9 +348,9 @@ int __init mx6q_clocks_init(void) clk[ipu1_podf] =imx_clk_divider ("ipu1_podf" ,"ipu1_sel" , base +0x3c ,11 ,3 ); clk[ipu2_podf] =imx_clk_divider ("ipu2_podf" ,"ipu2_sel" , base +0x3c ,16 ,3 ); clk[ldb_di0_div_3_5] =imx_clk_fixed_factor ("ldb_di0_div_3_5" ,"ldb_di0_sel" ,2 ,7 ); - clk[ldb_di0_podf] =imx_clk_divider ("ldb_di0_podf" ,"ldb_di0_div_3_5" , base +0x20 ,10 ,1 ); + clk[ldb_di0_podf] =imx_clk_divider_flags ("ldb_di0_podf" ,"ldb_di0_div_3_5" , base +0x20 ,10 ,1 ,0 ); clk[ldb_di1_div_3_5] =imx_clk_fixed_factor ("ldb_di1_div_3_5" ,"ldb_di1_sel" ,2 ,7 ); - clk[ldb_di1_podf] =imx_clk_divider ("ldb_di1_podf" ,"ldb_di1_div_3_5" , base +0x20 ,11 ,1 ); + clk[ldb_di1_podf] =imx_clk_divider_flags ("ldb_di1_podf" ,"ldb_di1_div_3_5" , base +0x20 ,11 ,1 ,0 ); clk[ipu1_di0_pre] =imx_clk_divider ("ipu1_di0_pre" ,"ipu1_di0_pre_sel" , base +0x34 ,3 ,3 ); clk[ipu1_di1_pre] =imx_clk_divider ("ipu1_di1_pre" ,"ipu1_di1_pre_sel" , base +0x34 ,12 ,3 ); clk[ipu2_di0_pre] =imx_clk_divider ("ipu2_di0_pre" ,"ipu2_di0_pre_sel" , base +0x38 ,3 ,3 );
Signature · 1 line
1.8.2.rc2
PATCH 9/11 ARM i.MX53: Add IOMUXC GPR to device tree
In reply to Philipp Zabel--- arch/arm/boot/dts/imx53.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/imx53.dtsi +5 -0
@@ -506,6 +506,11 @@ }; + gpr: iomuxc-gpr at 53fa8000 { + compatible = "fsl,imx53-iomuxc-gpr", "syscon"; + reg = <0x53fa8000 0xc>; + }; + pwm1: pwm at 53fb4000 { #pwm-cells = <2>; compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";
Signature · 1 line
1.8.2.rc2
PATCH 10/11 ARM i.MX53: Add LDB device to device tree
In reply to Philipp Zabel--- arch/arm/boot/dts/imx53.dtsi | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
arch/arm/boot/dts/imx53.dtsi +27 -0
@@ -511,6 +511,33 @@ reg = <0x53fa8000 0xc>; }; + ldb: ldb at 53fa8008 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-ldb"; + reg = <0x53fa8008 0x4>; + gpr = <&gpr>; + clocks = <&clks 122>, <&clks 120>, + <&clks 115>, <&clks 116>, + <&clks 123>, <&clks 85>; + clock-names = "di0_pll", "di1_pll", + "di0_sel", "di1_sel", + "di0", "di1"; + status = "disabled"; + + lvds-channel at 0 { + reg = <0>; + crtcs = <&ipu 0>; + status = "disabled"; + }; + + lvds-channel at 1 { + reg = <1>; + crtcs = <&ipu 1>; + status = "disabled"; + }; + }; + pwm1: pwm at 53fb4000 { #pwm-cells = <2>; compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";
Signature · 1 line
1.8.2.rc2
PATCH 11/11 ARM i.MX6q: Add LDB device to device tree
In reply to Philipp ZabelFrom: Steffen Trumtrar <[email protected]>
Add ldb device tree node and clock lookups.
--- arch/arm/boot/dts/imx6q.dtsi | 17 +++++++++++++++++ arch/arm/boot/dts/imx6qdl.dtsi | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)
arch/arm/boot/dts/imx6q.dtsi +17 -0
@@ -294,3 +294,20 @@ }; }; }; + +&ldb { + clocks = <&clks 33>, <&clks 34>, + <&clks 39>, <&clks 40>, <&clks 41>, <&clks 42>, + <&clks 135>, <&clks 136>; + clock-names = "di0_pll", "di1_pll", + "di0_sel", "di1_sel", "di2_sel", "di3_sel", + "di0", "di1"; + + lvds-channel at 0 { + crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>; + }; + + lvds-channel at 1 { + crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>; + }; +};
arch/arm/boot/dts/imx6qdl.dtsi +26 -0
@@ -529,6 +529,32 @@ reg = <0x020e0000 0x38>; }; + ldb: ldb at 020e0008 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb"; + clocks = <&clks 33>, <&clks 34>, + <&clks 39>, <&clks 40>, + <&clks 135>, <&clks 136>; + clock-names = "di0_pll", "di1_pll", + "di0_sel", "di1_sel", + "di0", "di1"; + gpr = <&gpr>; + status = "disabled"; + + lvds-channel at 0 { + reg = <0>; + crtcs = <&ipu1 0>; + status = "disabled"; + }; + + lvds-channel at 1 { + reg = <1>; + crtcs = <&ipu1 1>; + status = "disabled"; + }; + }; + dcic1: dcic at 020e4000 { reg = <0x020e4000 0x4000>; interrupts = <0 124 0x04>;
Signature · 1 line
1.8.2.rc2