* [PATCH 0/6] ARM: dts: update Ka-Ro i.MX6 module support
@ 2016-01-20 12:57 Lothar Waßmann
2016-01-20 12:57 ` [PATCH 2/6] ARM: dts: imx6: use correct mclk frequency for audio codec Lothar Waßmann
` (4 more replies)
0 siblings, 5 replies; 13+ messages in thread
From: Lothar Waßmann @ 2016-01-20 12:57 UTC (permalink / raw)
To: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll,
Rob Herring, Russell King, Sascha Hauer, Shawn Guo, Vinod Koul,
devicetree-u79uwXL29TY76Z2rM5mHXA,
dmaengine-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
This patch set updates the Ka-Ro electronics i.MX6 based module
support and adds support for some new modules and a new baseboard.
dma: enable mxs-dma for imx6ul
ARM: dts: imx6: use correct mclk frequency for audio
ARM: dts: imx6qdl-tx6: add ENET_OUT clock to fec node
ARM: dts: imx6: change TX6 module names due to new HW
ARM: dts: imx6: add support for more Ka-Ro electronics
ARM: dts: imx6: add support for the Ka-Ro electronics
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 2/6] ARM: dts: imx6: use correct mclk frequency for audio codec 2016-01-20 12:57 [PATCH 0/6] ARM: dts: update Ka-Ro i.MX6 module support Lothar Waßmann @ 2016-01-20 12:57 ` Lothar Waßmann 2016-02-02 6:31 ` Shawn Guo 2016-01-20 12:57 ` [PATCH 3/6] ARM: dts: imx6qdl-tx6: add ENET_OUT clock to fec node Lothar Waßmann ` (3 subsequent siblings) 4 siblings, 1 reply; 13+ messages in thread From: Lothar Waßmann @ 2016-01-20 12:57 UTC (permalink / raw) To: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, Shawn Guo, Vinod Koul, devicetree, dmaengine, linux-arm-kernel, linux-kernel Cc: Lothar Waßmann The reference clock for the SGTL5000 is generated by a 26MHz crystal oscillator on the Ka-Ro electronics STK5 eval kits. Use the correct frequency setting in DTB. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> --- arch/arm/boot/dts/imx6qdl-tx6.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi index 13cb7cc..9404668 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi @@ -41,7 +41,7 @@ compatible = "fixed-clock"; reg = <0>; #clock-cells = <0>; - clock-frequency = <27000000>; + clock-frequency = <26000000>; }; }; -- 2.1.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 2/6] ARM: dts: imx6: use correct mclk frequency for audio codec 2016-01-20 12:57 ` [PATCH 2/6] ARM: dts: imx6: use correct mclk frequency for audio codec Lothar Waßmann @ 2016-02-02 6:31 ` Shawn Guo 0 siblings, 0 replies; 13+ messages in thread From: Shawn Guo @ 2016-02-02 6:31 UTC (permalink / raw) To: Lothar Waßmann Cc: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, Vinod Koul, devicetree, dmaengine, linux-arm-kernel, linux-kernel On Wed, Jan 20, 2016 at 01:57:02PM +0100, Lothar Waßmann wrote: > The reference clock for the SGTL5000 is generated by a 26MHz crystal > oscillator on the Ka-Ro electronics STK5 eval kits. Use the correct > frequency setting in DTB. > > Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Applied, thanks. > --- > arch/arm/boot/dts/imx6qdl-tx6.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi > index 13cb7cc..9404668 100644 > --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi > @@ -41,7 +41,7 @@ > compatible = "fixed-clock"; > reg = <0>; > #clock-cells = <0>; > - clock-frequency = <27000000>; > + clock-frequency = <26000000>; > }; > }; > > -- > 2.1.4 > > ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/6] ARM: dts: imx6qdl-tx6: add ENET_OUT clock to fec node 2016-01-20 12:57 [PATCH 0/6] ARM: dts: update Ka-Ro i.MX6 module support Lothar Waßmann 2016-01-20 12:57 ` [PATCH 2/6] ARM: dts: imx6: use correct mclk frequency for audio codec Lothar Waßmann @ 2016-01-20 12:57 ` Lothar Waßmann [not found] ` <1453294626-17608-4-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> 2016-01-20 12:57 ` [PATCH 4/6] ARM: dts: imx6: change TX6 module names due to new HW revision Lothar Waßmann ` (2 subsequent siblings) 4 siblings, 1 reply; 13+ messages in thread From: Lothar Waßmann @ 2016-01-20 12:57 UTC (permalink / raw) To: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, Shawn Guo, Vinod Koul, devicetree, dmaengine, linux-arm-kernel, linux-kernel Cc: Lothar Waßmann ENET_OUT is used as reference clock for the ethernet PHY on the Ka-Ro TX6 modules. Specify this clock in DTB to let it be managed correctly by the driver. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> --- arch/arm/boot/dts/imx6qdl-tx6.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi index 9404668..5e0afc8 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi @@ -227,6 +227,11 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; + clocks = <&clks IMX6QDL_CLK_ENET>, + <&clks IMX6QDL_CLK_ENET>, + <&clks IMX6QDL_CLK_ENET_REF>, + <&clks IMX6QDL_CLK_ENET_REF>; + clock-names = "ipg", "ahb", "ptp", "enet_out"; phy-mode = "rmii"; phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_HIGH>; phy-supply = <®_3v3_etn>; -- 2.1.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <1453294626-17608-4-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org>]
* Re: [PATCH 3/6] ARM: dts: imx6qdl-tx6: add ENET_OUT clock to fec node [not found] ` <1453294626-17608-4-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> @ 2016-02-02 6:31 ` Shawn Guo 0 siblings, 0 replies; 13+ messages in thread From: Shawn Guo @ 2016-02-02 6:31 UTC (permalink / raw) To: Lothar Waßmann Cc: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, Vinod Koul, devicetree-u79uwXL29TY76Z2rM5mHXA, dmaengine-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA On Wed, Jan 20, 2016 at 01:57:03PM +0100, Lothar Waßmann wrote: > ENET_OUT is used as reference clock for the ethernet PHY on the Ka-Ro > TX6 modules. Specify this clock in DTB to let it be managed correctly > by the driver. > > Signed-off-by: Lothar Waßmann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/6] ARM: dts: imx6: change TX6 module names due to new HW revision 2016-01-20 12:57 [PATCH 0/6] ARM: dts: update Ka-Ro i.MX6 module support Lothar Waßmann 2016-01-20 12:57 ` [PATCH 2/6] ARM: dts: imx6: use correct mclk frequency for audio codec Lothar Waßmann 2016-01-20 12:57 ` [PATCH 3/6] ARM: dts: imx6qdl-tx6: add ENET_OUT clock to fec node Lothar Waßmann @ 2016-01-20 12:57 ` Lothar Waßmann 2016-02-02 6:36 ` Shawn Guo [not found] ` <1453294626-17608-1-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> 2016-01-20 12:57 ` [PATCH 6/6] ARM: dts: imx6: add support for the Ka-Ro electronics 'MB7' baseboard Lothar Waßmann 4 siblings, 1 reply; 13+ messages in thread From: Lothar Waßmann @ 2016-01-20 12:57 UTC (permalink / raw) To: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, Shawn Guo, Vinod Koul, devicetree, dmaengine, linux-arm-kernel, linux-kernel Cc: Lothar Waßmann The second last digit of the Ka-Ro electronics TX-module names denotes the HW revision of the module. HW rev 1 and 3 of the TX6 modules can use the same DTB. Change this digit to 'x' to indicate that the DTB file can be used for both HW revisions. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> --- arch/arm/boot/dts/Makefile | 10 +- arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 177 ------------------- arch/arm/boot/dts/imx6dl-tx6u-80xx.dts | 185 ++++++++++++++++++++ arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 150 ---------------- arch/arm/boot/dts/imx6dl-tx6u-81xx.dts | 156 +++++++++++++++++ arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 103 ----------- arch/arm/boot/dts/imx6q-tx6q-1010.dts | 177 ------------------- arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts | 119 +++++++++++++ arch/arm/boot/dts/imx6q-tx6q-10x0.dts | 191 ++++++++++++++++++++ arch/arm/boot/dts/imx6q-tx6q-1110.dts | 154 ----------------- arch/arm/boot/dts/imx6q-tx6q-11x0.dts | 249 +++++++++++++++++++++++++++ 11 files changed, 905 insertions(+), 766 deletions(-) delete mode 100644 arch/arm/boot/dts/imx6dl-tx6u-801x.dts create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-80xx.dts delete mode 100644 arch/arm/boot/dts/imx6dl-tx6u-811x.dts create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-81xx.dts delete mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts delete mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010.dts create mode 100644 arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts create mode 100644 arch/arm/boot/dts/imx6q-tx6q-10x0.dts delete mode 100644 arch/arm/boot/dts/imx6q-tx6q-1110.dts create mode 100644 arch/arm/boot/dts/imx6q-tx6q-11x0.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a4a6d70..5759aac 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -312,8 +312,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-sabrelite.dtb \ imx6dl-sabresd.dtb \ imx6dl-tx6dl-comtft.dtb \ - imx6dl-tx6u-801x.dtb \ - imx6dl-tx6u-811x.dtb \ + imx6dl-tx6u-80xx.dtb \ + imx6dl-tx6u-81xx.dtb \ imx6dl-udoo.dtb \ imx6dl-wandboard.dtb \ imx6dl-wandboard-revb1.dtb \ @@ -342,11 +342,11 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-sabresd.dtb \ imx6q-sbc6x.dtb \ imx6q-tbs2910.dtb \ - imx6q-tx6q-1010.dtb \ - imx6q-tx6q-1010-comtft.dtb \ imx6q-tx6q-1020.dtb \ imx6q-tx6q-1020-comtft.dtb \ - imx6q-tx6q-1110.dtb \ + imx6q-tx6q-10x0-comtft.dtb \ + imx6q-tx6q-10x0.dtb \ + imx6q-tx6q-11x0.dtb \ imx6q-udoo.dtb \ imx6q-wandboard.dtb \ imx6q-wandboard-revb1.dtb diff --git a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts deleted file mode 100644 index 5fe465c..0000000 --- a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -#include "imx6dl.dtsi" -#include "imx6qdl-tx6.dtsi" - -/ { - model = "Ka-Ro electronics TX6U-801x Module"; - compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; - - aliases { - display = &display; - }; - - backlight: backlight { - compatible = "pwm-backlight"; - pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; - power-supply = <®_3v3>; - /* - * a poor man's way to create a 1:1 relationship between - * the PWM value and the actual duty cycle - */ - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 - 10 11 12 13 14 15 16 17 18 19 - 20 21 22 23 24 25 26 27 28 29 - 30 31 32 33 34 35 36 37 38 39 - 40 41 42 43 44 45 46 47 48 49 - 50 51 52 53 54 55 56 57 58 59 - 60 61 62 63 64 65 66 67 68 69 - 70 71 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 88 89 - 90 91 92 93 94 95 96 97 98 99 - 100>; - default-brightness-level = <50>; - }; - - display: display@di0 { - compatible = "fsl,imx-parallel-display"; - interface-pix-fmt = "rgb24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_1>; - status = "okay"; - - port { - display0_in: endpoint { - remote-endpoint = <&ipu1_di0_disp0>; - }; - }; - - 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>; - }; - }; - }; -}; - -&ipu1_di0_disp0 { - remote-endpoint = <&display0_in>; -}; diff --git a/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts b/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts new file mode 100644 index 0000000..f6621d6 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts @@ -0,0 +1,185 @@ +/* + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6U-801x/-803x Module"; + compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; + + aliases { + display = &display; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + display: display@di0 { + compatible = "fsl,imx-parallel-display"; + interface-pix-fmt = "rgb24"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_1>; + status = "okay"; + + port { + display0_in: endpoint { + remote-endpoint = <&ipu1_di0_disp0>; + }; + }; + + 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>; + }; + }; + }; +}; + +&ipu1_di0_disp0 { + remote-endpoint = <&display0_in>; +}; + +®_lcd0_pwr { + status = "okay"; +}; + +®_lcd1_pwr { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts deleted file mode 100644 index c275eec..0000000 --- a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -#include "imx6dl.dtsi" -#include "imx6qdl-tx6.dtsi" - -/ { - model = "Ka-Ro electronics TX6U-811x Module"; - compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; - - aliases { - display = &lvds0; - lvds0 = &lvds0; - lvds1 = &lvds1; - }; - - backlight0: backlight0 { - compatible = "pwm-backlight"; - pwms = <&pwm2 0 500000 0>; - power-supply = <®_lcd0_pwr>; - /* - * a poor man's way to create a 1:1 relationship between - * the PWM value and the actual duty cycle - */ - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 - 10 11 12 13 14 15 16 17 18 19 - 20 21 22 23 24 25 26 27 28 29 - 30 31 32 33 34 35 36 37 38 39 - 40 41 42 43 44 45 46 47 48 49 - 50 51 52 53 54 55 56 57 58 59 - 60 61 62 63 64 65 66 67 68 69 - 70 71 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 88 89 - 90 91 92 93 94 95 96 97 98 99 - 100>; - default-brightness-level = <50>; - }; - - backlight1: backlight1 { - compatible = "pwm-backlight"; - pwms = <&pwm1 0 500000 0>; - power-supply = <®_lcd1_pwr>; - /* - * a poor man's way to create a 1:1 relationship between - * the PWM value and the actual duty cycle - */ - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 - 10 11 12 13 14 15 16 17 18 19 - 20 21 22 23 24 25 26 27 28 29 - 30 31 32 33 34 35 36 37 38 39 - 40 41 42 43 44 45 46 47 48 49 - 50 51 52 53 54 55 56 57 58 59 - 60 61 62 63 64 65 66 67 68 69 - 70 71 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 88 89 - 90 91 92 93 94 95 96 97 98 99 - 100>; - default-brightness-level = <50>; - }; -}; - -&i2c3 { - polytouch2: eeti@04 { - compatible = "eeti,egalax_ts"; - reg = <0x04>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_eeti>; - interrupt-parent = <&gpio3>; - interrupts = <22 0>; - wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; - linux,wakeup; - }; -}; - -&iomuxc { - imx6dl-tx6u-811x { - pinctrl_eeti: eetigrp { - fsl,pins = < - MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ - >; - }; - }; -}; - -&kpp { - status = "disabled"; /* pad conflict with backlight1 PWM */ -}; - -&ldb { - 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 = "disabled"; - - 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 { - status = "okay"; -}; diff --git a/arch/arm/boot/dts/imx6dl-tx6u-81xx.dts b/arch/arm/boot/dts/imx6dl-tx6u-81xx.dts new file mode 100644 index 0000000..5ff8e13 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-tx6u-81xx.dts @@ -0,0 +1,156 @@ +/* + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6U-81xx Module"; + compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; + + aliases { + display = &lvds0; + lvds0 = &lvds0; + lvds1 = &lvds1; + }; + + backlight0: backlight0 { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 0>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + backlight1: backlight1 { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 500000 0>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; +}; + +&i2c3 { + polytouch1: eeti@04 { + compatible = "eeti,egalax_ts"; + reg = <0x04>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_eeti>; + interrupt-parent = <&gpio3>; + interrupts = <22 0>; + wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; + linux,wakeup; + }; +}; + +&iomuxc { + imx6dl-tx6u-81xx { + pinctrl_eeti: eetigrp { + fsl,pins = < + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ + >; + }; + }; +}; + +&kpp { + status = "disabled"; /* pads partially clash with backlight1 PWM */ +}; + +&ldb { + status = "okay"; + + lvds0: lvds-channel@0 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&lvds0_timing0>; + + lvds0_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>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + }; + }; + + lvds1: lvds-channel@1 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "disabled"; + + display-timings { + native-mode = <&lvds1_timing0>; + + lvds1_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>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + }; + }; +}; + +&pwm1 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts deleted file mode 100644 index b18fae1..0000000 --- a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -#include "imx6q.dtsi" -#include "imx6qdl-tx6.dtsi" - -/ { - model = "Ka-Ro electronics TX6Q-1010 Module on CoMpact TFT"; - compatible = "karo,imx6q-tx6q", "fsl,imx6q"; - - aliases { - display = &display; - }; - - backlight: backlight { - compatible = "pwm-backlight"; - pwms = <&pwm2 0 500000 0>; - power-supply = <®_3v3>; - /* - * a poor man's way to create a 1:1 relationship between - * the PWM value and the actual duty cycle - */ - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 - 10 11 12 13 14 15 16 17 18 19 - 20 21 22 23 24 25 26 27 28 29 - 30 31 32 33 34 35 36 37 38 39 - 40 41 42 43 44 45 46 47 48 49 - 50 51 52 53 54 55 56 57 58 59 - 60 61 62 63 64 65 66 67 68 69 - 70 71 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 88 89 - 90 91 92 93 94 95 96 97 98 99 - 100>; - default-brightness-level = <50>; - }; - - display: display@di0 { - compatible = "fsl,imx-parallel-display"; - interface-pix-fmt = "rgb24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_1>; - status = "okay"; - - port { - display0_in: endpoint { - remote-endpoint = <&ipu1_di0_disp0>; - }; - }; - - 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>; - }; - }; - }; -}; - -&can1 { - status = "disabled"; -}; - -&can2 { - xceiver-supply = <®_3v3>; -}; - -&ipu1_di0_disp0 { - remote-endpoint = <&display0_in>; -}; - -&kpp { - status = "disabled"; -}; - -®_can_xcvr { - status = "disabled"; -}; - -&touchscreen { - status = "disabled"; -}; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010.dts b/arch/arm/boot/dts/imx6q-tx6q-1010.dts deleted file mode 100644 index b58ec9c..0000000 --- a/arch/arm/boot/dts/imx6q-tx6q-1010.dts +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -#include "imx6q.dtsi" -#include "imx6qdl-tx6.dtsi" - -/ { - model = "Ka-Ro electronics TX6Q-1010 Module"; - compatible = "karo,imx6q-tx6q", "fsl,imx6q"; - - aliases { - display = &display; - }; - - backlight: backlight { - compatible = "pwm-backlight"; - pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; - power-supply = <®_3v3>; - /* - * a poor man's way to create a 1:1 relationship between - * the PWM value and the actual duty cycle - */ - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 - 10 11 12 13 14 15 16 17 18 19 - 20 21 22 23 24 25 26 27 28 29 - 30 31 32 33 34 35 36 37 38 39 - 40 41 42 43 44 45 46 47 48 49 - 50 51 52 53 54 55 56 57 58 59 - 60 61 62 63 64 65 66 67 68 69 - 70 71 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 88 89 - 90 91 92 93 94 95 96 97 98 99 - 100>; - default-brightness-level = <50>; - }; - - display: display@di0 { - compatible = "fsl,imx-parallel-display"; - interface-pix-fmt = "rgb24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_1>; - status = "okay"; - - port { - display0_in: endpoint { - remote-endpoint = <&ipu1_di0_disp0>; - }; - }; - - 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>; - }; - }; - }; -}; - -&ipu1_di0_disp0 { - remote-endpoint = <&display0_in>; -}; diff --git a/arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts new file mode 100644 index 0000000..8997553 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts @@ -0,0 +1,119 @@ +/* + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6q.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6Q-1010/-1030 Module on CoMpact TFT"; + compatible = "karo,imx6q-tx6q", "fsl,imx6q"; + + aliases { + display = &mxcfb0; + mxcfb0 = &mxcfb0; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 0>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + mxcfb0: fb@2 { + compatible = "fsl,mxc_sdc_fb"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; + disp_dev = "lcd"; + interface_pix_fmt = "RGB24"; + mode_str = ""; + default_bpp = <32>; + int_clk = <1>; + late_init = <0>; + 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>; + }; + }; + }; + + lcd: lcd@0 { + compatible = "fsl,lcd"; + ipu_id = <0>; + disp_id = <0>; + default_ifmt = "RGB24"; + status = "okay"; + }; +}; + +&can1 { + status = "disabled"; +}; + +&can2 { + xceiver-supply = <®_3v3>; +}; + +&ipu2 { + status = "disabled"; +}; + +&kpp { + status = "disabled"; +}; + +®_can_xcvr { + status = "disabled"; +}; + +®_lcd0_pwr { + status = "okay"; +}; + +®_lcd1_pwr { + status = "okay"; +}; + +&touchscreen { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx6q-tx6q-10x0.dts b/arch/arm/boot/dts/imx6q-tx6q-10x0.dts new file mode 100644 index 0000000..c3782af --- /dev/null +++ b/arch/arm/boot/dts/imx6q-tx6q-10x0.dts @@ -0,0 +1,191 @@ +/* + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6q.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6Q-1010/-1030 Module"; + compatible = "karo,imx6q-tx6q", "fsl,imx6q"; + + aliases { + display = &display; + ipu1 = &ipu1; + ipu2 = &ipu2; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + display: display@di0 { + compatible = "fsl,imx-parallel-display"; + interface-pix-fmt = "rgb24"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_1>; + status = "okay"; + + port { + display0_in: endpoint { + remote-endpoint = <&ipu1_di0_disp0>; + }; + }; + + 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>; + }; + }; + }; +}; + +&ipu1_di0_disp0 { + remote-endpoint = <&display0_in>; +}; + +&ipu2 { + status = "disabled"; +}; + +®_lcd0_pwr { + status = "okay"; +}; + +®_lcd1_pwr { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1110.dts b/arch/arm/boot/dts/imx6q-tx6q-1110.dts deleted file mode 100644 index 88aa1e4..0000000 --- a/arch/arm/boot/dts/imx6q-tx6q-1110.dts +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -#include "imx6q.dtsi" -#include "imx6qdl-tx6.dtsi" - -/ { - model = "Ka-Ro electronics TX6Q-1110 Module"; - compatible = "karo,imx6q-tx6q", "fsl,imx6q"; - - aliases { - display = &lvds0; - lvds0 = &lvds0; - lvds1 = &lvds1; - }; - - backlight0: backlight0 { - compatible = "pwm-backlight"; - pwms = <&pwm2 0 500000 0>; - power-supply = <®_lcd0_pwr>; - /* - * a poor man's way to create a 1:1 relationship between - * the PWM value and the actual duty cycle - */ - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 - 10 11 12 13 14 15 16 17 18 19 - 20 21 22 23 24 25 26 27 28 29 - 30 31 32 33 34 35 36 37 38 39 - 40 41 42 43 44 45 46 47 48 49 - 50 51 52 53 54 55 56 57 58 59 - 60 61 62 63 64 65 66 67 68 69 - 70 71 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 88 89 - 90 91 92 93 94 95 96 97 98 99 - 100>; - default-brightness-level = <50>; - }; - - backlight1: backlight1 { - compatible = "pwm-backlight"; - pwms = <&pwm1 0 500000 0>; - power-supply = <®_lcd1_pwr>; - /* - * a poor man's way to create a 1:1 relationship between - * the PWM value and the actual duty cycle - */ - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 - 10 11 12 13 14 15 16 17 18 19 - 20 21 22 23 24 25 26 27 28 29 - 30 31 32 33 34 35 36 37 38 39 - 40 41 42 43 44 45 46 47 48 49 - 50 51 52 53 54 55 56 57 58 59 - 60 61 62 63 64 65 66 67 68 69 - 70 71 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 88 89 - 90 91 92 93 94 95 96 97 98 99 - 100>; - default-brightness-level = <50>; - }; -}; - -&i2c3 { - polytouch1: eeti@04 { - compatible = "eeti,egalax_ts"; - reg = <0x04>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_eeti>; - interrupt-parent = <&gpio3>; - interrupts = <22 0>; - wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; - linux,wakeup; - }; -}; - -&iomuxc { - imx6q-tx6q-1110 { - pinctrl_eeti: eetigrp { - fsl,pins = < - MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ - >; - }; - }; -}; - -&kpp { - status = "disabled"; /* pad conflict with backlight1 PWM */ -}; - -&ldb { - 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 = "disabled"; - - 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 { - status = "okay"; -}; - -&sata { - status = "okay"; -}; diff --git a/arch/arm/boot/dts/imx6q-tx6q-11x0.dts b/arch/arm/boot/dts/imx6q-tx6q-11x0.dts new file mode 100644 index 0000000..c66524b --- /dev/null +++ b/arch/arm/boot/dts/imx6q-tx6q-11x0.dts @@ -0,0 +1,249 @@ +/* + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6q.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6Q-1110/-1130 Module"; + compatible = "karo,imx6q-tx6q", "fsl,imx6q"; + + aliases { + display = &lvds0; + ipu1 = &ipu2; + lvds0 = &lvds0; + lvds1 = &lvds1; + mxcfb0 = &lvds0; + mxcfb1 = &lvds1; + }; + + backlight0: backlight0 { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 0>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + backlight1: backlight1 { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 500000 0>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + lvds0: fb@0 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "ldb"; + interface_pix_fmt = "RGB666"; + mode_str = "LDB-XGA"; + default_bpp = <32>; + int_clk = <0>; + late_init = <0>; + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&lvds0_timing0>; + + lvds0_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>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + + lvds0_timing1: VGA { + clock-frequency = <25200000>; + hactive = <640>; + vactive = <480>; + hback-porch = <48>; + hfront-porch = <16>; + vback-porch = <31>; + vfront-porch = <12>; + hsync-len = <96>; + vsync-len = <2>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + + lvds0_timing2: nl12880bc20 { + clock-frequency = <71000000>; + hactive = <1280>; + vactive = <800>; + hback-porch = <50>; + hfront-porch = <50>; + vback-porch = <5>; + vfront-porch = <5>; + hsync-len = <60>; + vsync-len = <13>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + }; + }; + + lvds1: fb@1 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "ldb"; + interface_pix_fmt = "RGB666"; + mode_str = "LDB-XGA"; + default_bpp = <32>; + int_clk = <0>; + late_init = <0>; + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&lvds1_timing0>; + + lvds1_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>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + + lvds1_timing1: VGA { + clock-frequency = <25200000>; + hactive = <640>; + vactive = <480>; + hback-porch = <48>; + hfront-porch = <16>; + vback-porch = <31>; + vfront-porch = <12>; + hsync-len = <96>; + vsync-len = <2>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + + lvds1_timing2: nl12880bc20 { + clock-frequency = <71000000>; + hactive = <1280>; + vactive = <800>; + hback-porch = <50>; + hfront-porch = <50>; + vback-porch = <5>; + vfront-porch = <5>; + hsync-len = <60>; + vsync-len = <13>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + }; + }; +}; + +&i2c3 { + polytouch1: eeti@04 { + compatible = "eeti,egalax_ts"; + reg = <0x04>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_eeti>; + interrupt-parent = <&gpio3>; + interrupts = <22 0>; + wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; + linux,wakeup; + }; +}; + +&iomuxc { + imx6q-tx6q-11x0 { + pinctrl_eeti: eetigrp { + fsl,pins = < + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ + >; + }; + }; +}; + +&ipu2 { + status = "disabled"; +}; + +&kpp { + status = "disabled"; /* pads partially clash with backlight1 PWM */ +}; + +&ldb { + ipu_id = <0>; + disp_id = <0>; + ext_ref = <0>; + mode = "sep0"; + sec_ipu_id = <0>; + sec_disp_id = <1>; + status = "okay"; +}; + +&pwm1 { + status = "okay"; +}; + +&sata { + status = "okay"; +}; -- 2.1.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 4/6] ARM: dts: imx6: change TX6 module names due to new HW revision 2016-01-20 12:57 ` [PATCH 4/6] ARM: dts: imx6: change TX6 module names due to new HW revision Lothar Waßmann @ 2016-02-02 6:36 ` Shawn Guo 0 siblings, 0 replies; 13+ messages in thread From: Shawn Guo @ 2016-02-02 6:36 UTC (permalink / raw) To: Lothar Waßmann Cc: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, Vinod Koul, devicetree, dmaengine, linux-arm-kernel, linux-kernel On Wed, Jan 20, 2016 at 01:57:04PM +0100, Lothar Waßmann wrote: > The second last digit of the Ka-Ro electronics TX-module names denotes > the HW revision of the module. HW rev 1 and 3 of the TX6 modules can > use the same DTB. Change this digit to 'x' to indicate that the DTB > file can be used for both HW revisions. This is simply a unnecessary churn of the source tree. I wouldn't take it. Shawn > > Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> > --- > arch/arm/boot/dts/Makefile | 10 +- > arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 177 ------------------- > arch/arm/boot/dts/imx6dl-tx6u-80xx.dts | 185 ++++++++++++++++++++ > arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 150 ---------------- > arch/arm/boot/dts/imx6dl-tx6u-81xx.dts | 156 +++++++++++++++++ > arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 103 ----------- > arch/arm/boot/dts/imx6q-tx6q-1010.dts | 177 ------------------- > arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts | 119 +++++++++++++ > arch/arm/boot/dts/imx6q-tx6q-10x0.dts | 191 ++++++++++++++++++++ > arch/arm/boot/dts/imx6q-tx6q-1110.dts | 154 ----------------- > arch/arm/boot/dts/imx6q-tx6q-11x0.dts | 249 +++++++++++++++++++++++++++ > 11 files changed, 905 insertions(+), 766 deletions(-) > delete mode 100644 arch/arm/boot/dts/imx6dl-tx6u-801x.dts > create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-80xx.dts > delete mode 100644 arch/arm/boot/dts/imx6dl-tx6u-811x.dts > create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-81xx.dts > delete mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts > delete mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010.dts > create mode 100644 arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts > create mode 100644 arch/arm/boot/dts/imx6q-tx6q-10x0.dts > delete mode 100644 arch/arm/boot/dts/imx6q-tx6q-1110.dts > create mode 100644 arch/arm/boot/dts/imx6q-tx6q-11x0.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index a4a6d70..5759aac 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -312,8 +312,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ > imx6dl-sabrelite.dtb \ > imx6dl-sabresd.dtb \ > imx6dl-tx6dl-comtft.dtb \ > - imx6dl-tx6u-801x.dtb \ > - imx6dl-tx6u-811x.dtb \ > + imx6dl-tx6u-80xx.dtb \ > + imx6dl-tx6u-81xx.dtb \ > imx6dl-udoo.dtb \ > imx6dl-wandboard.dtb \ > imx6dl-wandboard-revb1.dtb \ > @@ -342,11 +342,11 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ > imx6q-sabresd.dtb \ > imx6q-sbc6x.dtb \ > imx6q-tbs2910.dtb \ > - imx6q-tx6q-1010.dtb \ > - imx6q-tx6q-1010-comtft.dtb \ > imx6q-tx6q-1020.dtb \ > imx6q-tx6q-1020-comtft.dtb \ > - imx6q-tx6q-1110.dtb \ > + imx6q-tx6q-10x0-comtft.dtb \ > + imx6q-tx6q-10x0.dtb \ > + imx6q-tx6q-11x0.dtb \ > imx6q-udoo.dtb \ > imx6q-wandboard.dtb \ > imx6q-wandboard-revb1.dtb > diff --git a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts > deleted file mode 100644 > index 5fe465c..0000000 > --- a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts > +++ /dev/null > @@ -1,177 +0,0 @@ > -/* > - * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> > - * > - * The code contained herein is licensed under the GNU General Public > - * License. You may obtain a copy of the GNU General Public License > - * Version 2 at the following locations: > - * > - * http://www.opensource.org/licenses/gpl-license.html > - * http://www.gnu.org/copyleft/gpl.html > - */ > - > -/dts-v1/; > -#include "imx6dl.dtsi" > -#include "imx6qdl-tx6.dtsi" > - > -/ { > - model = "Ka-Ro electronics TX6U-801x Module"; > - compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; > - > - aliases { > - display = &display; > - }; > - > - backlight: backlight { > - compatible = "pwm-backlight"; > - pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; > - power-supply = <®_3v3>; > - /* > - * a poor man's way to create a 1:1 relationship between > - * the PWM value and the actual duty cycle > - */ > - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > - 10 11 12 13 14 15 16 17 18 19 > - 20 21 22 23 24 25 26 27 28 29 > - 30 31 32 33 34 35 36 37 38 39 > - 40 41 42 43 44 45 46 47 48 49 > - 50 51 52 53 54 55 56 57 58 59 > - 60 61 62 63 64 65 66 67 68 69 > - 70 71 72 73 74 75 76 77 78 79 > - 80 81 82 83 84 85 86 87 88 89 > - 90 91 92 93 94 95 96 97 98 99 > - 100>; > - default-brightness-level = <50>; > - }; > - > - display: display@di0 { > - compatible = "fsl,imx-parallel-display"; > - interface-pix-fmt = "rgb24"; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_disp0_1>; > - status = "okay"; > - > - port { > - display0_in: endpoint { > - remote-endpoint = <&ipu1_di0_disp0>; > - }; > - }; > - > - 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>; > - }; > - }; > - }; > -}; > - > -&ipu1_di0_disp0 { > - remote-endpoint = <&display0_in>; > -}; > diff --git a/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts b/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts > new file mode 100644 > index 0000000..f6621d6 > --- /dev/null > +++ b/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts > @@ -0,0 +1,185 @@ > +/* > + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +/dts-v1/; > +#include "imx6dl.dtsi" > +#include "imx6qdl-tx6.dtsi" > + > +/ { > + model = "Ka-Ro electronics TX6U-801x/-803x Module"; > + compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; > + > + aliases { > + display = &display; > + }; > + > + backlight: backlight { > + compatible = "pwm-backlight"; > + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; > + power-supply = <®_3v3>; > + /* > + * a poor man's way to create a 1:1 relationship between > + * the PWM value and the actual duty cycle > + */ > + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > + 10 11 12 13 14 15 16 17 18 19 > + 20 21 22 23 24 25 26 27 28 29 > + 30 31 32 33 34 35 36 37 38 39 > + 40 41 42 43 44 45 46 47 48 49 > + 50 51 52 53 54 55 56 57 58 59 > + 60 61 62 63 64 65 66 67 68 69 > + 70 71 72 73 74 75 76 77 78 79 > + 80 81 82 83 84 85 86 87 88 89 > + 90 91 92 93 94 95 96 97 98 99 > + 100>; > + default-brightness-level = <50>; > + }; > + > + display: display@di0 { > + compatible = "fsl,imx-parallel-display"; > + interface-pix-fmt = "rgb24"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_disp0_1>; > + status = "okay"; > + > + port { > + display0_in: endpoint { > + remote-endpoint = <&ipu1_di0_disp0>; > + }; > + }; > + > + 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>; > + }; > + }; > + }; > +}; > + > +&ipu1_di0_disp0 { > + remote-endpoint = <&display0_in>; > +}; > + > +®_lcd0_pwr { > + status = "okay"; > +}; > + > +®_lcd1_pwr { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts > deleted file mode 100644 > index c275eec..0000000 > --- a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts > +++ /dev/null > @@ -1,150 +0,0 @@ > -/* > - * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> > - * > - * The code contained herein is licensed under the GNU General Public > - * License. You may obtain a copy of the GNU General Public License > - * Version 2 at the following locations: > - * > - * http://www.opensource.org/licenses/gpl-license.html > - * http://www.gnu.org/copyleft/gpl.html > - */ > - > -/dts-v1/; > -#include "imx6dl.dtsi" > -#include "imx6qdl-tx6.dtsi" > - > -/ { > - model = "Ka-Ro electronics TX6U-811x Module"; > - compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; > - > - aliases { > - display = &lvds0; > - lvds0 = &lvds0; > - lvds1 = &lvds1; > - }; > - > - backlight0: backlight0 { > - compatible = "pwm-backlight"; > - pwms = <&pwm2 0 500000 0>; > - power-supply = <®_lcd0_pwr>; > - /* > - * a poor man's way to create a 1:1 relationship between > - * the PWM value and the actual duty cycle > - */ > - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > - 10 11 12 13 14 15 16 17 18 19 > - 20 21 22 23 24 25 26 27 28 29 > - 30 31 32 33 34 35 36 37 38 39 > - 40 41 42 43 44 45 46 47 48 49 > - 50 51 52 53 54 55 56 57 58 59 > - 60 61 62 63 64 65 66 67 68 69 > - 70 71 72 73 74 75 76 77 78 79 > - 80 81 82 83 84 85 86 87 88 89 > - 90 91 92 93 94 95 96 97 98 99 > - 100>; > - default-brightness-level = <50>; > - }; > - > - backlight1: backlight1 { > - compatible = "pwm-backlight"; > - pwms = <&pwm1 0 500000 0>; > - power-supply = <®_lcd1_pwr>; > - /* > - * a poor man's way to create a 1:1 relationship between > - * the PWM value and the actual duty cycle > - */ > - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > - 10 11 12 13 14 15 16 17 18 19 > - 20 21 22 23 24 25 26 27 28 29 > - 30 31 32 33 34 35 36 37 38 39 > - 40 41 42 43 44 45 46 47 48 49 > - 50 51 52 53 54 55 56 57 58 59 > - 60 61 62 63 64 65 66 67 68 69 > - 70 71 72 73 74 75 76 77 78 79 > - 80 81 82 83 84 85 86 87 88 89 > - 90 91 92 93 94 95 96 97 98 99 > - 100>; > - default-brightness-level = <50>; > - }; > -}; > - > -&i2c3 { > - polytouch2: eeti@04 { > - compatible = "eeti,egalax_ts"; > - reg = <0x04>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_eeti>; > - interrupt-parent = <&gpio3>; > - interrupts = <22 0>; > - wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; > - linux,wakeup; > - }; > -}; > - > -&iomuxc { > - imx6dl-tx6u-811x { > - pinctrl_eeti: eetigrp { > - fsl,pins = < > - MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ > - >; > - }; > - }; > -}; > - > -&kpp { > - status = "disabled"; /* pad conflict with backlight1 PWM */ > -}; > - > -&ldb { > - 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 = "disabled"; > - > - 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 { > - status = "okay"; > -}; > diff --git a/arch/arm/boot/dts/imx6dl-tx6u-81xx.dts b/arch/arm/boot/dts/imx6dl-tx6u-81xx.dts > new file mode 100644 > index 0000000..5ff8e13 > --- /dev/null > +++ b/arch/arm/boot/dts/imx6dl-tx6u-81xx.dts > @@ -0,0 +1,156 @@ > +/* > + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +/dts-v1/; > +#include "imx6dl.dtsi" > +#include "imx6qdl-tx6.dtsi" > + > +/ { > + model = "Ka-Ro electronics TX6U-81xx Module"; > + compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; > + > + aliases { > + display = &lvds0; > + lvds0 = &lvds0; > + lvds1 = &lvds1; > + }; > + > + backlight0: backlight0 { > + compatible = "pwm-backlight"; > + pwms = <&pwm2 0 500000 0>; > + power-supply = <®_3v3>; > + /* > + * a poor man's way to create a 1:1 relationship between > + * the PWM value and the actual duty cycle > + */ > + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > + 10 11 12 13 14 15 16 17 18 19 > + 20 21 22 23 24 25 26 27 28 29 > + 30 31 32 33 34 35 36 37 38 39 > + 40 41 42 43 44 45 46 47 48 49 > + 50 51 52 53 54 55 56 57 58 59 > + 60 61 62 63 64 65 66 67 68 69 > + 70 71 72 73 74 75 76 77 78 79 > + 80 81 82 83 84 85 86 87 88 89 > + 90 91 92 93 94 95 96 97 98 99 > + 100>; > + default-brightness-level = <50>; > + }; > + > + backlight1: backlight1 { > + compatible = "pwm-backlight"; > + pwms = <&pwm1 0 500000 0>; > + power-supply = <®_3v3>; > + /* > + * a poor man's way to create a 1:1 relationship between > + * the PWM value and the actual duty cycle > + */ > + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > + 10 11 12 13 14 15 16 17 18 19 > + 20 21 22 23 24 25 26 27 28 29 > + 30 31 32 33 34 35 36 37 38 39 > + 40 41 42 43 44 45 46 47 48 49 > + 50 51 52 53 54 55 56 57 58 59 > + 60 61 62 63 64 65 66 67 68 69 > + 70 71 72 73 74 75 76 77 78 79 > + 80 81 82 83 84 85 86 87 88 89 > + 90 91 92 93 94 95 96 97 98 99 > + 100>; > + default-brightness-level = <50>; > + }; > +}; > + > +&i2c3 { > + polytouch1: eeti@04 { > + compatible = "eeti,egalax_ts"; > + reg = <0x04>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_eeti>; > + interrupt-parent = <&gpio3>; > + interrupts = <22 0>; > + wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; > + linux,wakeup; > + }; > +}; > + > +&iomuxc { > + imx6dl-tx6u-81xx { > + pinctrl_eeti: eetigrp { > + fsl,pins = < > + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ > + >; > + }; > + }; > +}; > + > +&kpp { > + status = "disabled"; /* pads partially clash with backlight1 PWM */ > +}; > + > +&ldb { > + status = "okay"; > + > + lvds0: lvds-channel@0 { > + fsl,data-mapping = "spwg"; > + fsl,data-width = <18>; > + status = "okay"; > + > + display-timings { > + native-mode = <&lvds0_timing0>; > + > + lvds0_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>; > + hsync-active = <0>; > + vsync-active = <0>; > + de-active = <1>; > + pixelclk-active = <1>; > + }; > + }; > + }; > + > + lvds1: lvds-channel@1 { > + fsl,data-mapping = "spwg"; > + fsl,data-width = <18>; > + status = "disabled"; > + > + display-timings { > + native-mode = <&lvds1_timing0>; > + > + lvds1_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>; > + hsync-active = <0>; > + vsync-active = <0>; > + de-active = <1>; > + pixelclk-active = <1>; > + }; > + }; > + }; > +}; > + > +&pwm1 { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts > deleted file mode 100644 > index b18fae1..0000000 > --- a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts > +++ /dev/null > @@ -1,103 +0,0 @@ > -/* > - * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> > - * > - * The code contained herein is licensed under the GNU General Public > - * License. You may obtain a copy of the GNU General Public License > - * Version 2 at the following locations: > - * > - * http://www.opensource.org/licenses/gpl-license.html > - * http://www.gnu.org/copyleft/gpl.html > - */ > - > -/dts-v1/; > -#include "imx6q.dtsi" > -#include "imx6qdl-tx6.dtsi" > - > -/ { > - model = "Ka-Ro electronics TX6Q-1010 Module on CoMpact TFT"; > - compatible = "karo,imx6q-tx6q", "fsl,imx6q"; > - > - aliases { > - display = &display; > - }; > - > - backlight: backlight { > - compatible = "pwm-backlight"; > - pwms = <&pwm2 0 500000 0>; > - power-supply = <®_3v3>; > - /* > - * a poor man's way to create a 1:1 relationship between > - * the PWM value and the actual duty cycle > - */ > - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > - 10 11 12 13 14 15 16 17 18 19 > - 20 21 22 23 24 25 26 27 28 29 > - 30 31 32 33 34 35 36 37 38 39 > - 40 41 42 43 44 45 46 47 48 49 > - 50 51 52 53 54 55 56 57 58 59 > - 60 61 62 63 64 65 66 67 68 69 > - 70 71 72 73 74 75 76 77 78 79 > - 80 81 82 83 84 85 86 87 88 89 > - 90 91 92 93 94 95 96 97 98 99 > - 100>; > - default-brightness-level = <50>; > - }; > - > - display: display@di0 { > - compatible = "fsl,imx-parallel-display"; > - interface-pix-fmt = "rgb24"; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_disp0_1>; > - status = "okay"; > - > - port { > - display0_in: endpoint { > - remote-endpoint = <&ipu1_di0_disp0>; > - }; > - }; > - > - 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>; > - }; > - }; > - }; > -}; > - > -&can1 { > - status = "disabled"; > -}; > - > -&can2 { > - xceiver-supply = <®_3v3>; > -}; > - > -&ipu1_di0_disp0 { > - remote-endpoint = <&display0_in>; > -}; > - > -&kpp { > - status = "disabled"; > -}; > - > -®_can_xcvr { > - status = "disabled"; > -}; > - > -&touchscreen { > - status = "disabled"; > -}; > diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010.dts b/arch/arm/boot/dts/imx6q-tx6q-1010.dts > deleted file mode 100644 > index b58ec9c..0000000 > --- a/arch/arm/boot/dts/imx6q-tx6q-1010.dts > +++ /dev/null > @@ -1,177 +0,0 @@ > -/* > - * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> > - * > - * The code contained herein is licensed under the GNU General Public > - * License. You may obtain a copy of the GNU General Public License > - * Version 2 at the following locations: > - * > - * http://www.opensource.org/licenses/gpl-license.html > - * http://www.gnu.org/copyleft/gpl.html > - */ > - > -/dts-v1/; > -#include "imx6q.dtsi" > -#include "imx6qdl-tx6.dtsi" > - > -/ { > - model = "Ka-Ro electronics TX6Q-1010 Module"; > - compatible = "karo,imx6q-tx6q", "fsl,imx6q"; > - > - aliases { > - display = &display; > - }; > - > - backlight: backlight { > - compatible = "pwm-backlight"; > - pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; > - power-supply = <®_3v3>; > - /* > - * a poor man's way to create a 1:1 relationship between > - * the PWM value and the actual duty cycle > - */ > - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > - 10 11 12 13 14 15 16 17 18 19 > - 20 21 22 23 24 25 26 27 28 29 > - 30 31 32 33 34 35 36 37 38 39 > - 40 41 42 43 44 45 46 47 48 49 > - 50 51 52 53 54 55 56 57 58 59 > - 60 61 62 63 64 65 66 67 68 69 > - 70 71 72 73 74 75 76 77 78 79 > - 80 81 82 83 84 85 86 87 88 89 > - 90 91 92 93 94 95 96 97 98 99 > - 100>; > - default-brightness-level = <50>; > - }; > - > - display: display@di0 { > - compatible = "fsl,imx-parallel-display"; > - interface-pix-fmt = "rgb24"; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_disp0_1>; > - status = "okay"; > - > - port { > - display0_in: endpoint { > - remote-endpoint = <&ipu1_di0_disp0>; > - }; > - }; > - > - 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>; > - }; > - }; > - }; > -}; > - > -&ipu1_di0_disp0 { > - remote-endpoint = <&display0_in>; > -}; > diff --git a/arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts > new file mode 100644 > index 0000000..8997553 > --- /dev/null > +++ b/arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts > @@ -0,0 +1,119 @@ > +/* > + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +/dts-v1/; > +#include "imx6q.dtsi" > +#include "imx6qdl-tx6.dtsi" > + > +/ { > + model = "Ka-Ro electronics TX6Q-1010/-1030 Module on CoMpact TFT"; > + compatible = "karo,imx6q-tx6q", "fsl,imx6q"; > + > + aliases { > + display = &mxcfb0; > + mxcfb0 = &mxcfb0; > + }; > + > + backlight: backlight { > + compatible = "pwm-backlight"; > + pwms = <&pwm2 0 500000 0>; > + power-supply = <®_3v3>; > + /* > + * a poor man's way to create a 1:1 relationship between > + * the PWM value and the actual duty cycle > + */ > + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > + 10 11 12 13 14 15 16 17 18 19 > + 20 21 22 23 24 25 26 27 28 29 > + 30 31 32 33 34 35 36 37 38 39 > + 40 41 42 43 44 45 46 47 48 49 > + 50 51 52 53 54 55 56 57 58 59 > + 60 61 62 63 64 65 66 67 68 69 > + 70 71 72 73 74 75 76 77 78 79 > + 80 81 82 83 84 85 86 87 88 89 > + 90 91 92 93 94 95 96 97 98 99 > + 100>; > + default-brightness-level = <50>; > + }; > + > + mxcfb0: fb@2 { > + compatible = "fsl,mxc_sdc_fb"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_disp0_2>; > + disp_dev = "lcd"; > + interface_pix_fmt = "RGB24"; > + mode_str = ""; > + default_bpp = <32>; > + int_clk = <1>; > + late_init = <0>; > + 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>; > + }; > + }; > + }; > + > + lcd: lcd@0 { > + compatible = "fsl,lcd"; > + ipu_id = <0>; > + disp_id = <0>; > + default_ifmt = "RGB24"; > + status = "okay"; > + }; > +}; > + > +&can1 { > + status = "disabled"; > +}; > + > +&can2 { > + xceiver-supply = <®_3v3>; > +}; > + > +&ipu2 { > + status = "disabled"; > +}; > + > +&kpp { > + status = "disabled"; > +}; > + > +®_can_xcvr { > + status = "disabled"; > +}; > + > +®_lcd0_pwr { > + status = "okay"; > +}; > + > +®_lcd1_pwr { > + status = "okay"; > +}; > + > +&touchscreen { > + status = "disabled"; > +}; > diff --git a/arch/arm/boot/dts/imx6q-tx6q-10x0.dts b/arch/arm/boot/dts/imx6q-tx6q-10x0.dts > new file mode 100644 > index 0000000..c3782af > --- /dev/null > +++ b/arch/arm/boot/dts/imx6q-tx6q-10x0.dts > @@ -0,0 +1,191 @@ > +/* > + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +/dts-v1/; > +#include "imx6q.dtsi" > +#include "imx6qdl-tx6.dtsi" > + > +/ { > + model = "Ka-Ro electronics TX6Q-1010/-1030 Module"; > + compatible = "karo,imx6q-tx6q", "fsl,imx6q"; > + > + aliases { > + display = &display; > + ipu1 = &ipu1; > + ipu2 = &ipu2; > + }; > + > + backlight: backlight { > + compatible = "pwm-backlight"; > + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; > + power-supply = <®_3v3>; > + /* > + * a poor man's way to create a 1:1 relationship between > + * the PWM value and the actual duty cycle > + */ > + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > + 10 11 12 13 14 15 16 17 18 19 > + 20 21 22 23 24 25 26 27 28 29 > + 30 31 32 33 34 35 36 37 38 39 > + 40 41 42 43 44 45 46 47 48 49 > + 50 51 52 53 54 55 56 57 58 59 > + 60 61 62 63 64 65 66 67 68 69 > + 70 71 72 73 74 75 76 77 78 79 > + 80 81 82 83 84 85 86 87 88 89 > + 90 91 92 93 94 95 96 97 98 99 > + 100>; > + default-brightness-level = <50>; > + }; > + > + display: display@di0 { > + compatible = "fsl,imx-parallel-display"; > + interface-pix-fmt = "rgb24"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_disp0_1>; > + status = "okay"; > + > + port { > + display0_in: endpoint { > + remote-endpoint = <&ipu1_di0_disp0>; > + }; > + }; > + > + 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>; > + }; > + }; > + }; > +}; > + > +&ipu1_di0_disp0 { > + remote-endpoint = <&display0_in>; > +}; > + > +&ipu2 { > + status = "disabled"; > +}; > + > +®_lcd0_pwr { > + status = "okay"; > +}; > + > +®_lcd1_pwr { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/imx6q-tx6q-1110.dts b/arch/arm/boot/dts/imx6q-tx6q-1110.dts > deleted file mode 100644 > index 88aa1e4..0000000 > --- a/arch/arm/boot/dts/imx6q-tx6q-1110.dts > +++ /dev/null > @@ -1,154 +0,0 @@ > -/* > - * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> > - * > - * The code contained herein is licensed under the GNU General Public > - * License. You may obtain a copy of the GNU General Public License > - * Version 2 at the following locations: > - * > - * http://www.opensource.org/licenses/gpl-license.html > - * http://www.gnu.org/copyleft/gpl.html > - */ > - > -/dts-v1/; > -#include "imx6q.dtsi" > -#include "imx6qdl-tx6.dtsi" > - > -/ { > - model = "Ka-Ro electronics TX6Q-1110 Module"; > - compatible = "karo,imx6q-tx6q", "fsl,imx6q"; > - > - aliases { > - display = &lvds0; > - lvds0 = &lvds0; > - lvds1 = &lvds1; > - }; > - > - backlight0: backlight0 { > - compatible = "pwm-backlight"; > - pwms = <&pwm2 0 500000 0>; > - power-supply = <®_lcd0_pwr>; > - /* > - * a poor man's way to create a 1:1 relationship between > - * the PWM value and the actual duty cycle > - */ > - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > - 10 11 12 13 14 15 16 17 18 19 > - 20 21 22 23 24 25 26 27 28 29 > - 30 31 32 33 34 35 36 37 38 39 > - 40 41 42 43 44 45 46 47 48 49 > - 50 51 52 53 54 55 56 57 58 59 > - 60 61 62 63 64 65 66 67 68 69 > - 70 71 72 73 74 75 76 77 78 79 > - 80 81 82 83 84 85 86 87 88 89 > - 90 91 92 93 94 95 96 97 98 99 > - 100>; > - default-brightness-level = <50>; > - }; > - > - backlight1: backlight1 { > - compatible = "pwm-backlight"; > - pwms = <&pwm1 0 500000 0>; > - power-supply = <®_lcd1_pwr>; > - /* > - * a poor man's way to create a 1:1 relationship between > - * the PWM value and the actual duty cycle > - */ > - brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > - 10 11 12 13 14 15 16 17 18 19 > - 20 21 22 23 24 25 26 27 28 29 > - 30 31 32 33 34 35 36 37 38 39 > - 40 41 42 43 44 45 46 47 48 49 > - 50 51 52 53 54 55 56 57 58 59 > - 60 61 62 63 64 65 66 67 68 69 > - 70 71 72 73 74 75 76 77 78 79 > - 80 81 82 83 84 85 86 87 88 89 > - 90 91 92 93 94 95 96 97 98 99 > - 100>; > - default-brightness-level = <50>; > - }; > -}; > - > -&i2c3 { > - polytouch1: eeti@04 { > - compatible = "eeti,egalax_ts"; > - reg = <0x04>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_eeti>; > - interrupt-parent = <&gpio3>; > - interrupts = <22 0>; > - wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; > - linux,wakeup; > - }; > -}; > - > -&iomuxc { > - imx6q-tx6q-1110 { > - pinctrl_eeti: eetigrp { > - fsl,pins = < > - MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ > - >; > - }; > - }; > -}; > - > -&kpp { > - status = "disabled"; /* pad conflict with backlight1 PWM */ > -}; > - > -&ldb { > - 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 = "disabled"; > - > - 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 { > - status = "okay"; > -}; > - > -&sata { > - status = "okay"; > -}; > diff --git a/arch/arm/boot/dts/imx6q-tx6q-11x0.dts b/arch/arm/boot/dts/imx6q-tx6q-11x0.dts > new file mode 100644 > index 0000000..c66524b > --- /dev/null > +++ b/arch/arm/boot/dts/imx6q-tx6q-11x0.dts > @@ -0,0 +1,249 @@ > +/* > + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +/dts-v1/; > +#include "imx6q.dtsi" > +#include "imx6qdl-tx6.dtsi" > + > +/ { > + model = "Ka-Ro electronics TX6Q-1110/-1130 Module"; > + compatible = "karo,imx6q-tx6q", "fsl,imx6q"; > + > + aliases { > + display = &lvds0; > + ipu1 = &ipu2; > + lvds0 = &lvds0; > + lvds1 = &lvds1; > + mxcfb0 = &lvds0; > + mxcfb1 = &lvds1; > + }; > + > + backlight0: backlight0 { > + compatible = "pwm-backlight"; > + pwms = <&pwm2 0 500000 0>; > + /* > + * a poor man's way to create a 1:1 relationship between > + * the PWM value and the actual duty cycle > + */ > + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > + 10 11 12 13 14 15 16 17 18 19 > + 20 21 22 23 24 25 26 27 28 29 > + 30 31 32 33 34 35 36 37 38 39 > + 40 41 42 43 44 45 46 47 48 49 > + 50 51 52 53 54 55 56 57 58 59 > + 60 61 62 63 64 65 66 67 68 69 > + 70 71 72 73 74 75 76 77 78 79 > + 80 81 82 83 84 85 86 87 88 89 > + 90 91 92 93 94 95 96 97 98 99 > + 100>; > + default-brightness-level = <50>; > + }; > + > + backlight1: backlight1 { > + compatible = "pwm-backlight"; > + pwms = <&pwm1 0 500000 0>; > + /* > + * a poor man's way to create a 1:1 relationship between > + * the PWM value and the actual duty cycle > + */ > + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 > + 10 11 12 13 14 15 16 17 18 19 > + 20 21 22 23 24 25 26 27 28 29 > + 30 31 32 33 34 35 36 37 38 39 > + 40 41 42 43 44 45 46 47 48 49 > + 50 51 52 53 54 55 56 57 58 59 > + 60 61 62 63 64 65 66 67 68 69 > + 70 71 72 73 74 75 76 77 78 79 > + 80 81 82 83 84 85 86 87 88 89 > + 90 91 92 93 94 95 96 97 98 99 > + 100>; > + default-brightness-level = <50>; > + }; > + > + lvds0: fb@0 { > + compatible = "fsl,mxc_sdc_fb"; > + disp_dev = "ldb"; > + interface_pix_fmt = "RGB666"; > + mode_str = "LDB-XGA"; > + default_bpp = <32>; > + int_clk = <0>; > + late_init = <0>; > + fsl,data-mapping = "spwg"; > + fsl,data-width = <18>; > + status = "okay"; > + > + display-timings { > + native-mode = <&lvds0_timing0>; > + > + lvds0_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>; > + hsync-active = <0>; > + vsync-active = <0>; > + de-active = <1>; > + pixelclk-active = <1>; > + }; > + > + lvds0_timing1: VGA { > + clock-frequency = <25200000>; > + hactive = <640>; > + vactive = <480>; > + hback-porch = <48>; > + hfront-porch = <16>; > + vback-porch = <31>; > + vfront-porch = <12>; > + hsync-len = <96>; > + vsync-len = <2>; > + hsync-active = <0>; > + vsync-active = <0>; > + de-active = <1>; > + pixelclk-active = <0>; > + }; > + > + lvds0_timing2: nl12880bc20 { > + clock-frequency = <71000000>; > + hactive = <1280>; > + vactive = <800>; > + hback-porch = <50>; > + hfront-porch = <50>; > + vback-porch = <5>; > + vfront-porch = <5>; > + hsync-len = <60>; > + vsync-len = <13>; > + hsync-active = <0>; > + vsync-active = <0>; > + de-active = <1>; > + pixelclk-active = <0>; > + }; > + }; > + }; > + > + lvds1: fb@1 { > + compatible = "fsl,mxc_sdc_fb"; > + disp_dev = "ldb"; > + interface_pix_fmt = "RGB666"; > + mode_str = "LDB-XGA"; > + default_bpp = <32>; > + int_clk = <0>; > + late_init = <0>; > + fsl,data-mapping = "spwg"; > + fsl,data-width = <18>; > + status = "okay"; > + > + display-timings { > + native-mode = <&lvds1_timing0>; > + > + lvds1_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>; > + hsync-active = <0>; > + vsync-active = <0>; > + de-active = <1>; > + pixelclk-active = <0>; > + }; > + > + lvds1_timing1: VGA { > + clock-frequency = <25200000>; > + hactive = <640>; > + vactive = <480>; > + hback-porch = <48>; > + hfront-porch = <16>; > + vback-porch = <31>; > + vfront-porch = <12>; > + hsync-len = <96>; > + vsync-len = <2>; > + hsync-active = <0>; > + vsync-active = <0>; > + de-active = <1>; > + pixelclk-active = <0>; > + }; > + > + lvds1_timing2: nl12880bc20 { > + clock-frequency = <71000000>; > + hactive = <1280>; > + vactive = <800>; > + hback-porch = <50>; > + hfront-porch = <50>; > + vback-porch = <5>; > + vfront-porch = <5>; > + hsync-len = <60>; > + vsync-len = <13>; > + hsync-active = <0>; > + vsync-active = <0>; > + de-active = <1>; > + pixelclk-active = <0>; > + }; > + }; > + }; > +}; > + > +&i2c3 { > + polytouch1: eeti@04 { > + compatible = "eeti,egalax_ts"; > + reg = <0x04>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_eeti>; > + interrupt-parent = <&gpio3>; > + interrupts = <22 0>; > + wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; > + linux,wakeup; > + }; > +}; > + > +&iomuxc { > + imx6q-tx6q-11x0 { > + pinctrl_eeti: eetigrp { > + fsl,pins = < > + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ > + >; > + }; > + }; > +}; > + > +&ipu2 { > + status = "disabled"; > +}; > + > +&kpp { > + status = "disabled"; /* pads partially clash with backlight1 PWM */ > +}; > + > +&ldb { > + ipu_id = <0>; > + disp_id = <0>; > + ext_ref = <0>; > + mode = "sep0"; > + sec_ipu_id = <0>; > + sec_disp_id = <1>; > + status = "okay"; > +}; > + > +&pwm1 { > + status = "okay"; > +}; > + > +&sata { > + status = "okay"; > +}; > -- > 2.1.4 > > ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <1453294626-17608-1-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org>]
* [PATCH 1/6] dma: enable mxs-dma for imx6ul [not found] ` <1453294626-17608-1-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> @ 2016-01-20 12:57 ` Lothar Waßmann 2016-01-25 12:10 ` Vinod Koul 2016-01-20 12:57 ` [PATCH 5/6] ARM: dts: imx6: add support for more Ka-Ro electronics modules Lothar Waßmann 1 sibling, 1 reply; 13+ messages in thread From: Lothar Waßmann @ 2016-01-20 12:57 UTC (permalink / raw) To: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, Shawn Guo, Vinod Koul, devicetree-u79uwXL29TY76Z2rM5mHXA, dmaengine-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA Cc: Lothar Waßmann The mxs-dma unit is also available on i.MX6UL. Make it possible to select it in Kconfig. Signed-off-by: Lothar Waßmann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> --- drivers/dma/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 79b1390..2516524 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -341,12 +341,13 @@ config MV_XOR config MXS_DMA bool "MXS DMA support" - depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q + depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q || SOC_MX6UL select STMP_DEVICE select DMA_ENGINE help Support the MXS DMA engine. This engine including APBH-DMA - and APBX-DMA is integrated into Freescale i.MX23/28/MX6Q/MX6DL chips. + and APBX-DMA is integrated into Freescale + i.MX23/28/MX6Q/MX6DL/MX6UL chips. config MX3_IPU bool "MX3x Image Processing Unit support" -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 1/6] dma: enable mxs-dma for imx6ul 2016-01-20 12:57 ` [PATCH 1/6] dma: enable mxs-dma for imx6ul Lothar Waßmann @ 2016-01-25 12:10 ` Vinod Koul 2016-02-02 6:23 ` Shawn Guo 0 siblings, 1 reply; 13+ messages in thread From: Vinod Koul @ 2016-01-25 12:10 UTC (permalink / raw) To: Lothar Waßmann Cc: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, Shawn Guo, devicetree, dmaengine, linux-arm-kernel, linux-kernel On Wed, Jan 20, 2016 at 01:57:01PM +0100, Lothar Waßmann wrote: > The mxs-dma unit is also available on i.MX6UL. Make it possible to > select it in Kconfig. It should be dmaengine:xxx With that Acked-by: Vinod Koul <vinod.koul@intel.com> > > Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> > --- > drivers/dma/Kconfig | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig > index 79b1390..2516524 100644 > --- a/drivers/dma/Kconfig > +++ b/drivers/dma/Kconfig > @@ -341,12 +341,13 @@ config MV_XOR > > config MXS_DMA > bool "MXS DMA support" > - depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q > + depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q || SOC_MX6UL > select STMP_DEVICE > select DMA_ENGINE > help > Support the MXS DMA engine. This engine including APBH-DMA > - and APBX-DMA is integrated into Freescale i.MX23/28/MX6Q/MX6DL chips. > + and APBX-DMA is integrated into Freescale > + i.MX23/28/MX6Q/MX6DL/MX6UL chips. > > config MX3_IPU > bool "MX3x Image Processing Unit support" > -- > 2.1.4 > -- ~Vinod ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/6] dma: enable mxs-dma for imx6ul 2016-01-25 12:10 ` Vinod Koul @ 2016-02-02 6:23 ` Shawn Guo 2016-02-08 3:14 ` Vinod Koul 0 siblings, 1 reply; 13+ messages in thread From: Shawn Guo @ 2016-02-02 6:23 UTC (permalink / raw) To: Vinod Koul Cc: Lothar Waßmann, Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, devicetree, dmaengine, linux-arm-kernel, linux-kernel On Mon, Jan 25, 2016 at 05:40:43PM +0530, Vinod Koul wrote: > On Wed, Jan 20, 2016 at 01:57:01PM +0100, Lothar Waßmann wrote: > > The mxs-dma unit is also available on i.MX6UL. Make it possible to > > select it in Kconfig. > > It should be dmaengine:xxx > > With that > > Acked-by: Vinod Koul <vinod.koul@intel.com> I think this can go separately via dma tree. Shawn > > > > > Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> > > --- > > drivers/dma/Kconfig | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig > > index 79b1390..2516524 100644 > > --- a/drivers/dma/Kconfig > > +++ b/drivers/dma/Kconfig > > @@ -341,12 +341,13 @@ config MV_XOR > > > > config MXS_DMA > > bool "MXS DMA support" > > - depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q > > + depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q || SOC_MX6UL > > select STMP_DEVICE > > select DMA_ENGINE > > help > > Support the MXS DMA engine. This engine including APBH-DMA > > - and APBX-DMA is integrated into Freescale i.MX23/28/MX6Q/MX6DL chips. > > + and APBX-DMA is integrated into Freescale > > + i.MX23/28/MX6Q/MX6DL/MX6UL chips. > > > > config MX3_IPU > > bool "MX3x Image Processing Unit support" > > -- > > 2.1.4 > > > > -- > ~Vinod > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/6] dma: enable mxs-dma for imx6ul 2016-02-02 6:23 ` Shawn Guo @ 2016-02-08 3:14 ` Vinod Koul 0 siblings, 0 replies; 13+ messages in thread From: Vinod Koul @ 2016-02-08 3:14 UTC (permalink / raw) To: Shawn Guo Cc: Lothar Waßmann, Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, devicetree-u79uwXL29TY76Z2rM5mHXA, dmaengine-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA On Tue, Feb 02, 2016 at 02:23:16PM +0800, Shawn Guo wrote: > On Mon, Jan 25, 2016 at 05:40:43PM +0530, Vinod Koul wrote: > > On Wed, Jan 20, 2016 at 01:57:01PM +0100, Lothar Waßmann wrote: > > > The mxs-dma unit is also available on i.MX6UL. Make it possible to > > > select it in Kconfig. > > > > It should be dmaengine:xxx > > > > With that > > > > Acked-by: Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > > I think this can go separately via dma tree. Okay, pls resend :) -- ~Vinod -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 5/6] ARM: dts: imx6: add support for more Ka-Ro electronics modules [not found] ` <1453294626-17608-1-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> 2016-01-20 12:57 ` [PATCH 1/6] dma: enable mxs-dma for imx6ul Lothar Waßmann @ 2016-01-20 12:57 ` Lothar Waßmann 1 sibling, 0 replies; 13+ messages in thread From: Lothar Waßmann @ 2016-01-20 12:57 UTC (permalink / raw) To: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, Shawn Guo, Vinod Koul, devicetree-u79uwXL29TY76Z2rM5mHXA, dmaengine-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA Cc: Lothar Waßmann Add support for the following i.MX6 based modules from Ka-Ro electronics GmbH: TX6S-8034: Processor Freescale i.MX 6 Solo, 800MHz RAM 256MiB DDR3 SDRAM ROM 128MiB NAND Flash Power supply Single 3.1V to 5.5V Size 31mm SO-DIMM Temp. Range industrial grade (-40°C/-25°C to 105°C Tj) TX6S-8035: Processor Freescale i.MX 6 Solo, 800MHz RAM 512MiB DDR3 SDRAM ROM 4GiB eMMC Power supply Single 3.1V to 5.5V Size 31mm SO-DIMM Temp. Range industrial grade (-40°C/-25°C to 105°C Tj) TX6U-8033: Processor Freescale i.MX 6 Dual Lite, 800MHz RAM 1GiB DDR3 SDRAM ROM 4GiB eMMC Power supply Single 3.1V to 5.5V Size 31mm SO-DIMM Temp. Range industrial grade (-40°C/-25°C to 105°C Tj) TX6Q-1036: Processor Freescale i.MX 6Quad, 1GHz RAM 1GB DDR3 SDRAM 64-bit ROM 8GiB eMMC Power supply Single 3.1V to 5.5V Size 31mm SO-DIMM Temp. Range Extended Consumer Grade (-20°C to 105°C Tj) Signed-off-by: Lothar Waßmann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> --- arch/arm/boot/dts/Makefile | 4 + arch/arm/boot/dts/imx6dl-tx6s-8034.dts | 245 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6dl-tx6s-8035.dts | 216 +++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6dl-tx6u-8033.dts | 227 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6q-tx6q-1036.dts | 227 ++++++++++++++++++++++++++++++ 5 files changed, 919 insertions(+) create mode 100644 arch/arm/boot/dts/imx6dl-tx6s-8034.dts create mode 100644 arch/arm/boot/dts/imx6dl-tx6s-8035.dts create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-8033.dts create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1036.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5759aac..e997d6c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -312,6 +312,9 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-sabrelite.dtb \ imx6dl-sabresd.dtb \ imx6dl-tx6dl-comtft.dtb \ + imx6dl-tx6s-8034.dtb \ + imx6dl-tx6s-8035.dtb \ + imx6dl-tx6u-8033.dtb \ imx6dl-tx6u-80xx.dtb \ imx6dl-tx6u-81xx.dtb \ imx6dl-udoo.dtb \ @@ -344,6 +347,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-tbs2910.dtb \ imx6q-tx6q-1020.dtb \ imx6q-tx6q-1020-comtft.dtb \ + imx6q-tx6q-1036.dtb \ imx6q-tx6q-10x0-comtft.dtb \ imx6q-tx6q-10x0.dtb \ imx6q-tx6q-11x0.dtb \ diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8034.dts b/arch/arm/boot/dts/imx6dl-tx6s-8034.dts new file mode 100644 index 0000000..4cc28ba --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-tx6s-8034.dts @@ -0,0 +1,245 @@ +/* + * Copyright 2015 Lothar Waßmann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6S-8034 Module"; + compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; + + aliases { + display = &display; + ipu1 = &ipu1; + }; + + cpus { + /delete-node/ cpu@1; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + display: display@di0 { + compatible = "fsl,imx-parallel-display"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_1>; + interface-pix-fmt = "rgb24"; + status = "okay"; + + port { + display0_in: endpoint { + remote-endpoint = <&ipu1_di0_disp0>; + }; + }; + + 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>; + }; + }; + }; +}; + +&ds1339 { + status = "disabled"; +}; + +&pinctrl_hog { + fsl,pins = < + MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x1b0b1 /* LED */ + MX6QDL_PAD_SD3_DAT2__GPIO7_IO06 0x1b0b1 /* ETN PHY RESET */ + MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1b0b1 /* ETN PHY INT */ + MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x1b0b1 /* PWR BTN */ + >; +}; + +&pinctrl_usdhc1 { + fsl,pins = < + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x070b1 + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x07099 + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x070b1 + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x070b1 + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x070b1 + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x070b1 + MX6QDL_PAD_SD3_CMD__GPIO7_IO02 0x170b0 /* SD1 CD */ + >; +}; + +&ipu1_di0_disp0 { + remote-endpoint = <&display0_in>; +}; + +®_lcd0_pwr { + status = "disabled"; +}; + +®_lcd1_pwr { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8035.dts b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts new file mode 100644 index 0000000..ca76b8b --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts @@ -0,0 +1,216 @@ +/* + * Copyright 2014 Lothar Waßmann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6S-8035 Module"; + compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; + + aliases { + display = &display; + ipu1 = &ipu1; + }; + + cpus { + /delete-node/ cpu@1; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + display: display@di0 { + compatible = "fsl,imx-parallel-display"; + interface-pix-fmt = "rgb24"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_1>; + status = "okay"; + + port { + display0_in: endpoint { + remote-endpoint = <&ipu1_di0_disp0>; + }; + }; + + 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>; + }; + }; + }; +}; + +&ds1339 { + status = "disabled"; +}; + +&gpmi { + status = "disabled"; +}; + +&iomuxc { + imx6qdl-tx6 { + pinctrl_usdhc4: usdhc4grp { + fsl,pins = < + MX6QDL_PAD_SD4_CMD__SD4_CMD 0x070b1 + MX6QDL_PAD_SD4_CLK__SD4_CLK 0x070b1 + MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x070b1 + MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x070b1 + MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x070b1 + MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x070b1 + MX6QDL_PAD_NANDF_ALE__SD4_RESET 0x0b0b1 + >; + }; + }; +}; + +&ipu1_di0_disp0 { + remote-endpoint = <&display0_in>; +}; + +&usdhc4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc4>; + bus-width = <4>; + non-removable; + no-1-8-v; + fsl,wp-controller; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6dl-tx6u-8033.dts b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts new file mode 100644 index 0000000..09d9274 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts @@ -0,0 +1,227 @@ +/* + * Copyright 2014 Lothar Waßmann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6U-8033 Module"; + compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; + + aliases { + display = &display; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + display: display@di0 { + compatible = "fsl,imx-parallel-display"; + interface-pix-fmt = "rgb24"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_1>; + status = "okay"; + + port { + display0_in: endpoint { + remote-endpoint = <&ipu1_di0_disp0>; + }; + }; + + 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>; + }; + }; + }; + + lcd: lcd@0 { + compatible = "fsl,lcd"; + ipu_id = <0>; + disp_id = <0>; + default_ifmt = "RGB24"; + status = "okay"; + }; +}; + +&ds1339 { + status = "disabled"; +}; + +&gpmi { + status = "disabled"; +}; + +&iomuxc { + imx6qdl-tx6 { + pinctrl_usdhc4: usdhc4grp { + fsl,pins = < + MX6QDL_PAD_SD4_CMD__SD4_CMD 0x070b1 + MX6QDL_PAD_SD4_CLK__SD4_CLK 0x070b1 + MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x070b1 + MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x070b1 + MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x070b1 + MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x070b1 + MX6QDL_PAD_NANDF_ALE__SD4_RESET 0x0b0b1 + >; + }; + }; +}; + +&ipu1_di0_disp0 { + remote-endpoint = <&display0_in>; +}; + +®_lcd0_pwr { + status = "okay"; +}; + +®_lcd1_pwr { + status = "okay"; +}; + +&usdhc4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc4>; + bus-width = <4>; + non-removable; + no-1-8-v; + fsl,wp-controller; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1036.dts b/arch/arm/boot/dts/imx6q-tx6q-1036.dts new file mode 100644 index 0000000..d9a5c35 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-tx6q-1036.dts @@ -0,0 +1,227 @@ +/* + * Copyright 2014 Lothar Waßmann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6q.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6Q-1033 Module"; + compatible = "karo,imx6q-tx6q", "fsl,imx6q"; + + aliases { + display = &mxcfb0; + mxcfb0 = &mxcfb0; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + mxcfb0: fb@2 { + compatible = "fsl,mxc_sdc_fb"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; + disp_dev = "lcd"; + interface_pix_fmt = "RGB24"; + mode_str = ""; + default_bpp = <32>; + int_clk = <1>; + late_init = <0>; + 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>; + }; + }; + }; + + lcd: lcd@0 { + compatible = "fsl,lcd"; + ipu_id = <0>; + disp_id = <0>; + default_ifmt = "RGB24"; + status = "okay"; + }; +}; + +&ds1339 { + status = "disabled"; +}; + +&gpmi { + status = "disabled"; +}; + +&iomuxc { + imx6qdl-tx6 { + pinctrl_usdhc4: usdhc4grp { + fsl,pins = < + MX6QDL_PAD_SD4_CMD__SD4_CMD 0x070b1 + MX6QDL_PAD_SD4_CLK__SD4_CLK 0x070b1 + MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x070b1 + MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x070b1 + MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x070b1 + MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x070b1 + MX6QDL_PAD_NANDF_ALE__SD4_RESET 0x0b0b1 + >; + }; + }; +}; + +&ipu2 { + status = "disabled"; +}; + +®_lcd0_pwr { + status = "okay"; +}; + +®_lcd1_pwr { + status = "okay"; +}; + +&usdhc4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc4>; + bus-width = <4>; + non-removable; + no-1-8-v; + fsl,wp-controller; + status = "okay"; +}; -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 6/6] ARM: dts: imx6: add support for the Ka-Ro electronics 'MB7' baseboard 2016-01-20 12:57 [PATCH 0/6] ARM: dts: update Ka-Ro i.MX6 module support Lothar Waßmann ` (3 preceding siblings ...) [not found] ` <1453294626-17608-1-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> @ 2016-01-20 12:57 ` Lothar Waßmann 4 siblings, 0 replies; 13+ messages in thread From: Lothar Waßmann @ 2016-01-20 12:57 UTC (permalink / raw) To: Dan Williams, Ian Campbell, Kumar Gala, Mark Rutland, Pawel Moll, Rob Herring, Russell King, Sascha Hauer, Shawn Guo, Vinod Koul, devicetree, dmaengine, linux-arm-kernel, linux-kernel Cc: Lothar Waßmann This baseboard can be used with all TX6 SoMs, but only a certain set of combinations can be ordered. Add support for these combinations in mainline, so that users can easily adopt their own combination of SoM and baseboard themselves. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> --- arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts | 236 +++++++++++++++++++++++++ arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts | 267 +++++++++++++++++++++++++++++ 3 files changed, 505 insertions(+) create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts create mode 100644 arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index e997d6c..d520c6d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -316,6 +316,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-tx6s-8035.dtb \ imx6dl-tx6u-8033.dtb \ imx6dl-tx6u-80xx.dtb \ + imx6dl-tx6u-81xx-mb7.dtb \ imx6dl-tx6u-81xx.dtb \ imx6dl-udoo.dtb \ imx6dl-wandboard.dtb \ @@ -350,6 +351,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-tx6q-1036.dtb \ imx6q-tx6q-10x0-comtft.dtb \ imx6q-tx6q-10x0.dtb \ + imx6q-tx6q-11x0-mb7.dtb \ imx6q-tx6q-11x0.dtb \ imx6q-udoo.dtb \ imx6q-wandboard.dtb \ diff --git a/arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts b/arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts new file mode 100644 index 0000000..70552f6 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts @@ -0,0 +1,236 @@ +/* + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6U-81xx Module"; + compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl"; + + aliases { + display = &lvds0; + lvds0 = &lvds0; + lvds1 = &lvds1; + }; + + backlight0: backlight0 { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + backlight1: backlight1 { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>; + power-supply = <®_3v3>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; +}; + +&can1 { + status = "disabled"; +}; + +&can2 { + xceiver-supply = <®_3v3>; +}; + +&i2c3 { + polytouch1: eeti@04 { + compatible = "eeti,egalax_ts"; + reg = <0x04>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_eeti>; + interrupt-parent = <&gpio3>; + interrupts = <22 0>; + wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; + linux,wakeup; + }; +}; + +&iomuxc { + imx6dl-tx6u-81xx { + pinctrl_eeti: eetigrp { + fsl,pins = < + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ + >; + }; + }; +}; + +&kpp { + status = "disabled"; /* pads partially clash with backlight1 PWM */ +}; + +&ldb { + status = "okay"; + + lvds0: lvds-channel@0 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&lvds0_timing1>; + + lvds0_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>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + + lvds0_timing1: VGA { + clock-frequency = <25200000>; + hactive = <640>; + vactive = <480>; + hback-porch = <48>; + hfront-porch = <16>; + vback-porch = <31>; + vfront-porch = <12>; + hsync-len = <96>; + vsync-len = <2>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + + lvds0_timing2: nl12880bc20 { + clock-frequency = <71000000>; + hactive = <1280>; + vactive = <800>; + hback-porch = <50>; + hfront-porch = <50>; + vback-porch = <5>; + vfront-porch = <5>; + hsync-len = <60>; + vsync-len = <13>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + }; + }; + + lvds1: lvds-channel@1 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "disabled"; + + display-timings { + native-mode = <&lvds1_timing2>; + + lvds1_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>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + + lvds1_timing1: VGA { + clock-frequency = <25200000>; + hactive = <640>; + vactive = <480>; + hback-porch = <48>; + hfront-porch = <16>; + vback-porch = <31>; + vfront-porch = <12>; + hsync-len = <96>; + vsync-len = <2>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + + lvds1_timing2: nl12880bc20 { + clock-frequency = <71000000>; + hactive = <1280>; + vactive = <800>; + hback-porch = <50>; + hfront-porch = <50>; + vback-porch = <5>; + vfront-porch = <5>; + hsync-len = <60>; + vsync-len = <13>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + }; + }; +}; + +&pwm1 { + status = "okay"; +}; + +®_lcd0_pwr { + status = "okay"; +}; + +®_lcd1_pwr { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts b/arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts new file mode 100644 index 0000000..d4c6a0e --- /dev/null +++ b/arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts @@ -0,0 +1,267 @@ +/* + * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx6q.dtsi" +#include "imx6qdl-tx6.dtsi" + +/ { + model = "Ka-Ro electronics TX6Q-1110/-1130 Module"; + compatible = "karo,imx6q-tx6q", "fsl,imx6q"; + + aliases { + display = &lvds0; + ipu1 = &ipu2; + lvds0 = &lvds0; + lvds1 = &lvds1; + mxcfb0 = &lvds0; + mxcfb1 = &lvds1; + }; + + backlight0: backlight0 { + compatible = "pwm-backlight"; + pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>; + power-supply = <®_lcd0_pwr>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + backlight1: backlight1 { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>; + power-supply = <®_lcd1_pwr>; + /* + * a poor man's way to create a 1:1 relationship between + * the PWM value and the actual duty cycle + */ + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + }; + + lvds0: fb@0 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "ldb"; + interface_pix_fmt = "RGB666"; + mode_str = "LDB-VGA"; + default_bpp = <32>; + int_clk = <0>; + late_init = <0>; + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&lvds0_timing1>; + + lvds0_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>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + + lvds0_timing1: VGA { + clock-frequency = <25200000>; + hactive = <640>; + vactive = <480>; + hback-porch = <48>; + hfront-porch = <16>; + vback-porch = <31>; + vfront-porch = <12>; + hsync-len = <96>; + vsync-len = <2>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + + lvds0_timing2: nl12880bc20 { + clock-frequency = <71000000>; + hactive = <1280>; + vactive = <800>; + hback-porch = <50>; + hfront-porch = <50>; + vback-porch = <5>; + vfront-porch = <5>; + hsync-len = <60>; + vsync-len = <13>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + }; + }; + + lvds1: fb@1 { + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "ldb"; + interface_pix_fmt = "RGB24"; + mode_str = "LDB-NL12880BC20"; + default_bpp = <32>; + int_clk = <0>; + late_init = <0>; + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&lvds1_timing2>; + + lvds1_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>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + + lvds1_timing1: VGA { + clock-frequency = <25200000>; + hactive = <640>; + vactive = <480>; + hback-porch = <48>; + hfront-porch = <16>; + vback-porch = <31>; + vfront-porch = <12>; + hsync-len = <96>; + vsync-len = <2>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + + lvds1_timing2: nl12880bc20 { + clock-frequency = <71000000>; + hactive = <1280>; + vactive = <800>; + hback-porch = <50>; + hfront-porch = <50>; + vback-porch = <5>; + vfront-porch = <5>; + hsync-len = <60>; + vsync-len = <13>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + }; + }; + }; +}; + +&can1 { + status = "disabled"; +}; + +&can2 { + xceiver-supply = <®_3v3>; +}; + +&i2c3 { + polytouch1: eeti@04 { + compatible = "eeti,egalax_ts"; + reg = <0x04>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_eeti>; + interrupt-parent = <&gpio3>; + interrupts = <22 0>; + wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; + linux,wakeup; + }; +}; + +&iomuxc { + imx6q-tx6q-11x0 { + pinctrl_eeti: eetigrp { + fsl,pins = < + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */ + >; + }; + }; +}; + +&ipu2 { + status = "disabled"; +}; + +&kpp { + status = "disabled"; /* pads partially clash with backlight1 PWM */ +}; + +&ldb { + ipu_id = <0>; + disp_id = <0>; + ext_ref = <0>; + mode = "sep0"; + sec_ipu_id = <0>; + sec_disp_id = <1>; + status = "okay"; +}; + +&pwm1 { + status = "okay"; +}; + +®_lcd0_pwr { + status = "okay"; +}; + +®_lcd1_pwr { + status = "okay"; +}; + +&sata { + status = "okay"; +}; -- 2.1.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2016-02-08 3:14 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-20 12:57 [PATCH 0/6] ARM: dts: update Ka-Ro i.MX6 module support Lothar Waßmann
2016-01-20 12:57 ` [PATCH 2/6] ARM: dts: imx6: use correct mclk frequency for audio codec Lothar Waßmann
2016-02-02 6:31 ` Shawn Guo
2016-01-20 12:57 ` [PATCH 3/6] ARM: dts: imx6qdl-tx6: add ENET_OUT clock to fec node Lothar Waßmann
[not found] ` <1453294626-17608-4-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org>
2016-02-02 6:31 ` Shawn Guo
2016-01-20 12:57 ` [PATCH 4/6] ARM: dts: imx6: change TX6 module names due to new HW revision Lothar Waßmann
2016-02-02 6:36 ` Shawn Guo
[not found] ` <1453294626-17608-1-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org>
2016-01-20 12:57 ` [PATCH 1/6] dma: enable mxs-dma for imx6ul Lothar Waßmann
2016-01-25 12:10 ` Vinod Koul
2016-02-02 6:23 ` Shawn Guo
2016-02-08 3:14 ` Vinod Koul
2016-01-20 12:57 ` [PATCH 5/6] ARM: dts: imx6: add support for more Ka-Ro electronics modules Lothar Waßmann
2016-01-20 12:57 ` [PATCH 6/6] ARM: dts: imx6: add support for the Ka-Ro electronics 'MB7' baseboard Lothar Waßmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).