From 5cc7149d886fdcd396ba5c65cfe4050594e8bf49 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Wed, 11 Jun 2014 17:48:48 +0200 Subject: [PATCH] updated Ka-Ro DTS files;LVDS display works Conflicts: arch/arm/boot/dts/Makefile --- arch/arm/boot/dts/Makefile | 5 +- arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts | 57 +++--- arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 15 +- arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 80 ++------ arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 58 +++--- arch/arm/boot/dts/imx6q-tx6q-1010.dts | 184 ++++++------------- arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts | 58 +++--- arch/arm/boot/dts/imx6q-tx6q-1020.dts | 152 +++------------ arch/arm/boot/dts/imx6q-tx6q-1110.dts | 81 ++------ arch/arm/boot/dts/imx6qdl-tx6.dtsi | 46 ++--- arch/arm/boot/dts/imx6qdl.dtsi | 1 + 11 files changed, 211 insertions(+), 526 deletions(-) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 8860caaee709..f8986980d6e9 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -239,7 +239,10 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6q-tx6q-1020.dtb \ imx6q-tx6q-1020-comtft.dtb \ imx6q-tx6q-1110.dtb \ - + imx6sl-evk.dtb \ + imx6sl-evk-csi.dtb \ + imx6sl-evk-ldo.dtb \ + vf610-twr.dtb dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx23-olinuxino.dtb \ imx23-stmp378x_devb.dtb \ diff --git a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts index a2812a4e25fe..e2ef0cbdfaff 100644 --- a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts +++ b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts @@ -18,12 +18,12 @@ compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; aliases { - display = &display; + display = &mxcfb3; }; backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm2 0 500000 0>; + pwms = <&pwm2 0 500000>; power-supply = <®_3v3>; /* * a poor man's way to create a 1:1 relationship between @@ -41,50 +41,35 @@ 90 91 92 93 94 95 96 97 98 99 100>; default-brightness-level = <50>; + }; + + mxcfb3: fb@2 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "lcd"; + interface_pix_fmt = "RGB565"; + mode_str ="CLAA-WVGA"; + default_bpp = <16>; + int_clk = <0>; + late_init = <0>; + status = "okay"; }; - display: display@di0 { - compatible = "fsl,imx-parallel-display"; - crtcs = <&ipu1 0>; - interface-pix-fmt = "rgb24"; + lcd@0 { + compatible = "fsl,lcd"; + ipu_id = <0>; + disp_id = <0>; + default_ifmt = "RGB565"; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_1>; + pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; - - display-timings { - native-mode = <&ET070001DM6>; - - ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */ - clock-frequency = <33264000>; - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hsync-len = <128>; - hfront-porch = <40>; - vback-porch = <33>; - vsync-len = <2>; - vfront-porch = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <1>; - }; - }; - }; - - panel { - compatible = "simple-panel"; - power-supply = <®_lcd1_pwr>; - enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>; - backlight = <&backlight>; }; }; -&can1 { +&flexcan1 { status = "disabled"; }; -&can2 { +&flexcan2 { xceiver-supply = <®_3v3>; }; diff --git a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts index 2664eeba5667..6657798cb9fc 100644 --- a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts +++ b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts @@ -19,6 +19,7 @@ aliases { display = &mxcfb3; + mxcfb2 = &mxcfb3; }; backlight: backlight { @@ -51,7 +52,7 @@ default_bpp = <16>; int_clk = <0>; late_init = <0>; - status = "disabled"; + status = "okay"; }; lcd@0 { @@ -63,18 +64,6 @@ pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; }; - - v4l2_out { - compatible = "fsl,mxc_v4l2_output"; - status = "okay"; - }; - - mipi_dsi_reset: mipi-dsi-reset { - compatible = "gpio-reset"; - reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>; - reset-delay-us = <50>; - #reset-cells = <0>; - }; }; ®_lcd0_pwr { diff --git a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts index 9b2f04edd6a3..a496fc4ef6c2 100644 --- a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts +++ b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts @@ -18,9 +18,8 @@ compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; aliases { - display = &lvds0; - lvds0 = &lvds0; - lvds1 = &lvds1; + display = &ldb; + mxcfb0 = &mxcfb1; }; backlight0: backlight0 { @@ -67,21 +66,20 @@ default-brightness-level = <50>; }; - panel0 { - compatible = "simple-panel"; - power-supply = <®_3v3>; - backlight = <&backlight0>; - }; - - panel1 { - compatible = "simple-panel"; - power-supply = <®_3v3>; - backlight = <&backlight1>; + mxcfb1: fb@0 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "ldb"; + interface_pix_fmt = "RGB666"; + mode_str ="LDB-XGA"; + default_bpp = <16>; + int_clk = <0>; + late_init = <0>; + status = "okay"; }; }; &i2c3 { - polytouch2: eeti@04 { + polytouch1: eeti@04 { compatible = "eeti,egalax_ts"; reg = <0x04>; pinctrl-names = "default"; @@ -104,57 +102,17 @@ }; &kpp { - status = "disabled"; /* clashes with backlight1 PWM */ + status = "disabled"; /* pads partially clash with backlight1 PWM */ }; &ldb { + ipu_id = <0>; + disp_id = <0>; + ext_ref = <0>; + mode = "sep0"; + sec_ipu_id = <1>; + sec_disp_id = <1>; status = "okay"; - - lvds0: lvds-channel@0 { - fsl,data-mapping = "spwg"; - fsl,data-width = <18>; - status = "okay"; - - display-timings { - native-mode = <&lvds_timing0>; - lvds_timing0: hsd100pxn1 { - clock-frequency = <65000000>; - hactive = <1024>; - vactive = <768>; - hback-porch = <220>; - hfront-porch = <40>; - vback-porch = <21>; - vfront-porch = <7>; - hsync-len = <60>; - vsync-len = <10>; - de-active = <1>; - pixelclk-active = <1>; - }; - }; - }; - - lvds1: lvds-channel@1 { - fsl,data-mapping = "spwg"; - fsl,data-width = <18>; - status = "okay"; - - display-timings { - native-mode = <&lvds_timing1>; - lvds_timing1: hsd100pxn1 { - clock-frequency = <65000000>; - hactive = <1024>; - vactive = <768>; - hback-porch = <220>; - hfront-porch = <40>; - vback-porch = <21>; - vfront-porch = <7>; - hsync-len = <60>; - vsync-len = <10>; - de-active = <1>; - pixelclk-active = <1>; - }; - }; - }; }; &pwm1 { diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts index 451f0187911f..56c5972de0a6 100644 --- a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts +++ b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts @@ -18,12 +18,13 @@ compatible = "karo,imx6q-tx6q", "fsl,imx6q"; aliases { - display = &display; + display = &mxcfb3; + mxcfb2 = &mxcfb3; }; backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm2 0 500000 0>; + pwms = <&pwm2 0 500000>; power-supply = <®_3v3>; /* * a poor man's way to create a 1:1 relationship between @@ -41,50 +42,35 @@ 90 91 92 93 94 95 96 97 98 99 100>; default-brightness-level = <50>; + }; + + mxcfb3: fb@2 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "lcd"; + interface_pix_fmt = "RGB565"; + mode_str ="CLAA-WVGA"; + default_bpp = <16>; + int_clk = <0>; + late_init = <0>; + status = "okay"; }; - display: display@di0 { - compatible = "fsl,imx-parallel-display"; - crtcs = <&ipu1 0>; - interface-pix-fmt = "rgb24"; + lcd@0 { + compatible = "fsl,lcd"; + ipu_id = <0>; + disp_id = <0>; + default_ifmt = "RGB565"; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_1>; + pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; - - display-timings { - native-mode = <&ET070001DM6>; - - ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */ - clock-frequency = <33264000>; - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hsync-len = <128>; - hfront-porch = <40>; - vback-porch = <33>; - vsync-len = <2>; - vfront-porch = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <1>; - }; - }; - }; - - panel { - compatible = "simple-panel"; - power-supply = <®_lcd1_pwr>; - enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>; - backlight = <&backlight>; }; }; -&can1 { +&flexcan1 { status = "disabled"; }; -&can2 { +&flexcan2 { xceiver-supply = <®_3v3>; }; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010.dts b/arch/arm/boot/dts/imx6q-tx6q-1010.dts index dcbbf5ae12af..7299664eb79a 100644 --- a/arch/arm/boot/dts/imx6q-tx6q-1010.dts +++ b/arch/arm/boot/dts/imx6q-tx6q-1010.dts @@ -18,12 +18,16 @@ compatible = "karo,imx6q-tx6q", "fsl,imx6q"; aliases { - display = &display; + display = &mxcfb3; + mxcfb0 = &mxcfb1; + mxcfb1 = &mxcfb2; + mxcfb2 = &mxcfb3; + mxcfb3 = &mxcfb4; }; backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; + pwms = <&pwm2 0 500000>; power-supply = <®_3v3>; /* * a poor man's way to create a 1:1 relationship between @@ -41,141 +45,65 @@ 90 91 92 93 94 95 96 97 98 99 100>; default-brightness-level = <50>; - }; - - display: display@di0 { - compatible = "fsl,imx-parallel-display"; - crtcs = <&ipu1 0>; - interface-pix-fmt = "rgb24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_1>; - status = "okay"; - - display-timings { - VGA { - clock-frequency = <25200000>; - hactive = <640>; - vactive = <480>; - hback-porch = <48>; - hsync-len = <96>; - hfront-porch = <16>; - vback-porch = <31>; - vsync-len = <2>; - vfront-porch = <12>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; - - ETV570 { - clock-frequency = <25200000>; - hactive = <640>; - vactive = <480>; - hback-porch = <114>; - hsync-len = <30>; - hfront-porch = <16>; - vback-porch = <32>; - vsync-len = <3>; - vfront-porch = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; - - ET0350 { - clock-frequency = <6413760>; - hactive = <320>; - vactive = <240>; - hback-porch = <34>; - hsync-len = <34>; - hfront-porch = <20>; - vback-porch = <15>; - vsync-len = <3>; - vfront-porch = <4>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; + }; - ET0430 { - clock-frequency = <9009000>; - hactive = <480>; - vactive = <272>; - hback-porch = <2>; - hsync-len = <41>; - hfront-porch = <2>; - vback-porch = <2>; - vsync-len = <10>; - vfront-porch = <2>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <1>; - }; + mxcfb1: fb@0 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "ldb"; + interface_pix_fmt = "RGB666"; + mode_str ="LDB-XGA"; + default_bpp = <16>; + int_clk = <0>; + late_init = <0>; + status = "disabled"; + }; - ET0500 { - clock-frequency = <33264000>; - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hsync-len = <128>; - hfront-porch = <40>; - vback-porch = <33>; - vsync-len = <2>; - vfront-porch = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; + mxcfb2: fb@1 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "hdmi"; + interface_pix_fmt = "RGB24"; + mode_str ="1920x1080M@60"; + default_bpp = <24>; + int_clk = <0>; + late_init = <0>; + status = "disabled"; + }; - ET0700 { /* same as ET0500 */ - clock-frequency = <33264000>; - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hsync-len = <128>; - hfront-porch = <40>; - vback-porch = <33>; - vsync-len = <2>; - vfront-porch = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; + mxcfb3: fb@2 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "lcd"; + interface_pix_fmt = "RGB24"; + mode_str ="CLAA-WVGA"; + default_bpp = <32>; + int_clk = <1>; + late_init = <0>; + status = "okay"; + }; - ETQ570 { - clock-frequency = <6596040>; - hactive = <320>; - vactive = <240>; - hback-porch = <38>; - hsync-len = <30>; - hfront-porch = <30>; - vback-porch = <16>; - vsync-len = <3>; - vfront-porch = <4>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; - }; - }; + mxcfb4: fb@3 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "ldb"; + interface_pix_fmt = "RGB666"; + mode_str ="LDB-XGA"; + default_bpp = <16>; + int_clk = <0>; + late_init = <0>; + status = "disabled"; + }; - panel { - compatible = "simple-panel"; - power-supply = <®_lcd1_pwr>; - enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>; - backlight = <&backlight>; + lcd@0 { + compatible = "fsl,lcd"; + ipu_id = <0>; + disp_id = <0>; + default_ifmt = "RGB24"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; + status = "okay"; }; }; &ipu2 { - status = "disabled"; +// status = "disabled"; }; ®_lcd1_pwr { diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts index 830585e42062..03b33d12c695 100644 --- a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts +++ b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts @@ -18,12 +18,13 @@ compatible = "karo,imx6q-tx6q", "fsl,imx6q"; aliases { - display = &display; + display = &mxcfb3; + mxcfb2 = &mxcfb3; }; backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm2 0 500000 0>; + pwms = <&pwm2 0 500000>; power-supply = <®_3v3>; /* * a poor man's way to create a 1:1 relationship between @@ -41,50 +42,35 @@ 90 91 92 93 94 95 96 97 98 99 100>; default-brightness-level = <50>; + }; + + mxcfb3: fb@2 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "lcd"; + interface_pix_fmt = "RGB565"; + mode_str ="CLAA-WVGA"; + default_bpp = <16>; + int_clk = <0>; + late_init = <0>; + status = "okay"; }; - display: display@di0 { - compatible = "fsl,imx-parallel-display"; - crtcs = <&ipu1 0>; - interface-pix-fmt = "rgb24"; + lcd@0 { + compatible = "fsl,lcd"; + ipu_id = <0>; + disp_id = <0>; + default_ifmt = "RGB565"; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_1>; + pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; - - display-timings { - native-mode = <&ET070001DM6>; - - ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */ - clock-frequency = <33264000>; - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hsync-len = <128>; - hfront-porch = <40>; - vback-porch = <33>; - vsync-len = <2>; - vfront-porch = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <1>; - }; - }; - }; - - panel { - compatible = "simple-panel"; - power-supply = <®_lcd1_pwr>; - enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>; - backlight = <&backlight>; }; }; -&can1 { +&flexcan1 { status = "disabled"; }; -&can2 { +&flexcan2 { xceiver-supply = <®_3v3>; }; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020.dts b/arch/arm/boot/dts/imx6q-tx6q-1020.dts index 07e3ca308a55..305e71d9d76d 100644 --- a/arch/arm/boot/dts/imx6q-tx6q-1020.dts +++ b/arch/arm/boot/dts/imx6q-tx6q-1020.dts @@ -18,12 +18,13 @@ compatible = "karo,imx6q-tx6q", "fsl,imx6q"; aliases { - display = &display; + display = &mxcfb3; + mxcfb2 = &mxcfb3; }; backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; + pwms = <&pwm2 0 500000>; power-supply = <®_3v3>; /* * a poor man's way to create a 1:1 relationship between @@ -41,136 +42,27 @@ 90 91 92 93 94 95 96 97 98 99 100>; default-brightness-level = <50>; + }; + + mxcfb3: fb@2 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "lcd"; + interface_pix_fmt = "RGB565"; + mode_str ="CLAA-WVGA"; + default_bpp = <16>; + int_clk = <0>; + late_init = <0>; + status = "okay"; }; - display: display@di0 { - compatible = "fsl,imx-parallel-display"; - crtcs = <&ipu1 0>; - interface-pix-fmt = "rgb24"; + lcd@0 { + compatible = "fsl,lcd"; + ipu_id = <0>; + disp_id = <0>; + default_ifmt = "RGB565"; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_1>; + pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; - - display-timings { - VGA { - clock-frequency = <25200000>; - hactive = <640>; - vactive = <480>; - hback-porch = <48>; - hsync-len = <96>; - hfront-porch = <16>; - vback-porch = <31>; - vsync-len = <2>; - vfront-porch = <12>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; - - ETV570 { - clock-frequency = <25200000>; - hactive = <640>; - vactive = <480>; - hback-porch = <114>; - hsync-len = <30>; - hfront-porch = <16>; - vback-porch = <32>; - vsync-len = <3>; - vfront-porch = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; - - ET0350 { - clock-frequency = <6413760>; - hactive = <320>; - vactive = <240>; - hback-porch = <34>; - hsync-len = <34>; - hfront-porch = <20>; - vback-porch = <15>; - vsync-len = <3>; - vfront-porch = <4>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; - - ET0430 { - clock-frequency = <9009000>; - hactive = <480>; - vactive = <272>; - hback-porch = <2>; - hsync-len = <41>; - hfront-porch = <2>; - vback-porch = <2>; - vsync-len = <10>; - vfront-porch = <2>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <1>; - }; - - ET0500 { - clock-frequency = <33264000>; - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hsync-len = <128>; - hfront-porch = <40>; - vback-porch = <33>; - vsync-len = <2>; - vfront-porch = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; - - ET0700 { /* same as ET0500 */ - clock-frequency = <33264000>; - hactive = <800>; - vactive = <480>; - hback-porch = <88>; - hsync-len = <128>; - hfront-porch = <40>; - vback-porch = <33>; - vsync-len = <2>; - vfront-porch = <10>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; - - ETQ570 { - clock-frequency = <6596040>; - hactive = <320>; - vactive = <240>; - hback-porch = <38>; - hsync-len = <30>; - hfront-porch = <30>; - vback-porch = <16>; - vsync-len = <3>; - vfront-porch = <4>; - hsync-active = <0>; - vsync-active = <0>; - de-active = <1>; - pixelclk-active = <0>; - }; - }; - }; - - panel { - compatible = "simple-panel"; - power-supply = <®_lcd1_pwr>; - enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>; - backlight = <&backlight>; }; }; @@ -182,6 +74,10 @@ status = "disabled"; }; +&ipu2 { + status = "disabled"; +}; + &iomuxc { imx6qdl-tx6 { pinctrl_usdhc4: usdhc4grp { diff --git a/arch/arm/boot/dts/imx6q-tx6q-1110.dts b/arch/arm/boot/dts/imx6q-tx6q-1110.dts index 5a220b918f93..ff3603da5889 100644 --- a/arch/arm/boot/dts/imx6q-tx6q-1110.dts +++ b/arch/arm/boot/dts/imx6q-tx6q-1110.dts @@ -18,9 +18,9 @@ compatible = "karo,imx6q-tx6q", "fsl,imx6q"; aliases { - display = &lvds0; - lvds0 = &lvds0; - lvds1 = &lvds1; + display = &ldb; + ipu1 = &ipu2; + mxcfb0 = &mxcfb1; }; backlight0: backlight0 { @@ -67,21 +67,20 @@ default-brightness-level = <50>; }; - panel0 { - compatible = "simple-panel"; - power-supply = <®_3v3>; - backlight = <&backlight0>; - }; - - panel1 { - compatible = "simple-panel"; - power-supply = <®_3v3>; - backlight = <&backlight1>; + mxcfb1: fb@0 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "ldb"; + interface_pix_fmt = "RGB666"; + mode_str ="LDB-XGA"; + default_bpp = <16>; + int_clk = <0>; + late_init = <0>; + status = "okay"; }; }; &i2c3 { - polytouch2: eeti@04 { + polytouch1: eeti@04 { compatible = "eeti,egalax_ts"; reg = <0x04>; pinctrl-names = "default"; @@ -108,57 +107,17 @@ }; &kpp { - status = "disabled"; /* clashes with backlight1 PWM */ + status = "disabled"; /* pads partially clash with backlight1 PWM */ }; &ldb { + ipu_id = <0>; + disp_id = <0>; + ext_ref = <0>; + mode = "sep0"; + sec_ipu_id = <1>; + sec_disp_id = <1>; status = "okay"; - - lvds0: lvds-channel@0 { - fsl,data-mapping = "spwg"; - fsl,data-width = <18>; - status = "okay"; - - display-timings { - native-mode = <&lvds_timing0>; - lvds_timing0: hsd100pxn1 { - clock-frequency = <65000000>; - hactive = <1024>; - vactive = <768>; - hback-porch = <220>; - hfront-porch = <40>; - vback-porch = <21>; - vfront-porch = <7>; - hsync-len = <60>; - vsync-len = <10>; - de-active = <1>; - pixelclk-active = <1>; - }; - }; - }; - - lvds1: lvds-channel@1 { - fsl,data-mapping = "spwg"; - fsl,data-width = <18>; - status = "okay"; - - display-timings { - native-mode = <&lvds_timing1>; - lvds_timing1: hsd100pxn1 { - clock-frequency = <65000000>; - hactive = <1024>; - vactive = <768>; - hback-porch = <220>; - hfront-porch = <40>; - vback-porch = <21>; - vfront-porch = <7>; - hsync-len = <60>; - vsync-len = <10>; - de-active = <1>; - pixelclk-active = <1>; - }; - }; - }; }; &pwm1 { diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi index 384c86e9cf08..d943851569bb 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi @@ -14,10 +14,8 @@ / { aliases { -#if 0 - can0 = &can2; - can1 = &can1; -#endif + can0 = &flexcan2; + can1 = &flexcan1; ethernet0 = &fec; lcdif_23bit_pins_a = &pinctrl_disp0_1; lcdif_24bit_pins_a = &pinctrl_disp0_2; @@ -44,18 +42,18 @@ clock-frequency = <27000000>; }; }; -#if 0 + gpio-keys { compatible = "gpio-keys"; power { label = "Power Button"; gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; - linux,code = ; + linux,code = <116>; /* KEY_POWER */ gpio-key,wakeup; }; }; -#endif + leds { compatible = "gpio-leds"; @@ -172,8 +170,6 @@ compatible = "karo,imx6qdl-tx6qdl-sgtl5000", "fsl,imx-audio-sgtl5000"; model = "sgtl5000-audio"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_audmux>; ssi-controller = <&ssi1>; audio-codec = <&sgtl5000>; audio-routing = @@ -186,24 +182,24 @@ }; &audmux { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_audmux>; status = "okay"; }; -#if 0 -&can1 { +&flexcan1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flexcan1>; xceiver-supply = <®_can_xcvr>; status = "okay"; }; -&can2 { +&flexcan2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flexcan2>; xceiver-supply = <®_can_xcvr>; status = "okay"; }; -#endif &ecspi1 { pinctrl-names = "default"; @@ -607,27 +603,25 @@ }; }; -#if 0 &kpp { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_kpp>; /* sample keymap */ /* row/col 0,1 are mapped to KPP row/col 6,7 */ linux,keymap = < - MATRIX_KEY(6, 6, KEY_POWER) /* 0x06060074 */ - MATRIX_KEY(6, 7, KEY_KP0) /* 0x06070052 */ - MATRIX_KEY(6, 2, KEY_KP1) /* 0x0602004f */ - MATRIX_KEY(6, 3, KEY_KP2) /* 0x06030050 */ - MATRIX_KEY(7, 6, KEY_KP3) /* 0x07060051 */ - MATRIX_KEY(7, 7, KEY_KP4) /* 0x0707004b */ - MATRIX_KEY(7, 2, KEY_KP5) /* 0x0702004c */ - MATRIX_KEY(7, 3, KEY_KP6) /* 0x0703004d */ - MATRIX_KEY(2, 6, KEY_KP7) /* 0x02060047 */ - MATRIX_KEY(2, 7, KEY_KP8) /* 0x02070048 */ - MATRIX_KEY(2, 2, KEY_KP9) /* 0x02020049 */ + 0x06060074 /* MATRIX_KEY(6, 6, 116) KEY_POWER */ + 0x06070052 /* MATRIX_KEY(6, 7, 82) KEY_KP0 */ + 0x0602004f /* MATRIX_KEY(6, 2, 79) KEY_KP1 */ + 0x06030050 /* MATRIX_KEY(6, 3, 80) KEY_KP2 */ + 0x07060051 /* MATRIX_KEY(7, 6, 81) KEY_KP3 */ + 0x0707004b /* MATRIX_KEY(7, 7, 75) KEY_KP4 */ + 0x0702004c /* MATRIX_KEY(7, 2, 76) KEY_KP5 */ + 0x0703004d /* MATRIX_KEY(7, 3, 77) KEY_KP6 */ + 0x02060047 /* MATRIX_KEY(2, 6, 71) KEY_KP7 */ + 0x02070048 /* MATRIX_KEY(2, 7, 72) KEY_KP8 */ + 0x02020049 /* MATRIX_KEY(2, 2, 73) KEY_KP9 */ >; }; -#endif &pwm1 { pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index ce0599134a69..4838379dc459 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -466,6 +466,7 @@ }; kpp: kpp@020b8000 { + compatible = "fsl,imx6qdl-kpp", "fsl,imx21-kpp"; reg = <0x020b8000 0x4000>; interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>; }; -- 2.39.2