diff options
author | Jagan Teki <jagan@amarulasolutions.com> | 2017-03-24 12:18:38 -0400 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2017-04-10 04:16:15 -0400 |
commit | 0760c782cf0b334e0a9d011ad46802e66d9be6b0 (patch) | |
tree | 9f4f4d1a62b8fe0570f66cb37ba04c9db9d523db | |
parent | 3e176720e6a6de2426f364dc806659f51095bb9f (diff) |
ARM: dts: imx6ul-isiot: Add imx6ul-isiot-common.dtsi
lcdif nodes are differ wrt specific LCD connected on Is.IoT MX6UL
module, so create separate file 'imx6ul-isiot-common.dtsi' for common
lcdif node structure and include the same on respective dts.
More common nodes will add in future patches.
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-rw-r--r-- | arch/arm/boot/dts/imx6ul-isiot-common.dtsi | 107 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-isiot-emmc.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-isiot-nand.dts | 1 |
3 files changed, 109 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ul-isiot-common.dtsi b/arch/arm/boot/dts/imx6ul-isiot-common.dtsi new file mode 100644 index 000000000000..9660e20eacb6 --- /dev/null +++ b/arch/arm/boot/dts/imx6ul-isiot-common.dtsi | |||
@@ -0,0 +1,107 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2016 Amarula Solutions B.V. | ||
3 | * Copyright (C) 2016 Engicam S.r.l. | ||
4 | * | ||
5 | * This file is dual-licensed: you can use it either under the terms | ||
6 | * of the GPL or the X11 license, at your option. Note that this dual | ||
7 | * licensing only applies to this file, and not this project as a | ||
8 | * whole. | ||
9 | * | ||
10 | * a) This file is free software; you can redistribute it and/or | ||
11 | * modify it under the terms of the GNU General Public License | ||
12 | * version 2 as published by the Free Software Foundation. | ||
13 | * | ||
14 | * This file is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | * Or, alternatively, | ||
20 | * | ||
21 | * b) Permission is hereby granted, free of charge, to any person | ||
22 | * obtaining a copy of this software and associated documentation | ||
23 | * files (the "Software"), to deal in the Software without | ||
24 | * restriction, including without limitation the rights to use, | ||
25 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
26 | * sell copies of the Software, and to permit persons to whom the | ||
27 | * Software is furnished to do so, subject to the following | ||
28 | * conditions: | ||
29 | * | ||
30 | * The above copyright notice and this permission notice shall be | ||
31 | * included in all copies or substantial portions of the Software. | ||
32 | * | ||
33 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
34 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
35 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
36 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
37 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
38 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
39 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
40 | * OTHER DEALINGS IN THE SOFTWARE. | ||
41 | */ | ||
42 | |||
43 | &lcdif { | ||
44 | pinctrl-names = "default"; | ||
45 | pinctrl-0 = <&pinctrl_lcdif_dat | ||
46 | &pinctrl_lcdif_ctrl>; | ||
47 | display = <&display0>; | ||
48 | status = "okay"; | ||
49 | |||
50 | display0: display { | ||
51 | bits-per-pixel = <16>; | ||
52 | bus-width = <18>; | ||
53 | |||
54 | display-timings { | ||
55 | native-mode = <&timing0>; | ||
56 | timing0: timing0 { | ||
57 | clock-frequency = <28000000>; | ||
58 | hactive = <800>; | ||
59 | vactive = <480>; | ||
60 | hfront-porch = <30>; | ||
61 | hback-porch = <30>; | ||
62 | hsync-len = <64>; | ||
63 | vback-porch = <5>; | ||
64 | vfront-porch = <5>; | ||
65 | vsync-len = <20>; | ||
66 | hsync-active = <0>; | ||
67 | vsync-active = <0>; | ||
68 | de-active = <1>; | ||
69 | pixelclk-active = <0>; | ||
70 | }; | ||
71 | }; | ||
72 | }; | ||
73 | }; | ||
74 | |||
75 | &iomuxc { | ||
76 | pinctrl_lcdif_ctrl: lcdifctrlgrp { | ||
77 | fsl,pins = < | ||
78 | MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x79 | ||
79 | MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x79 | ||
80 | MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x79 | ||
81 | MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x79 | ||
82 | >; | ||
83 | }; | ||
84 | |||
85 | pinctrl_lcdif_dat: lcdifdatgrp { | ||
86 | fsl,pins = < | ||
87 | MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x79 | ||
88 | MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x79 | ||
89 | MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x79 | ||
90 | MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x79 | ||
91 | MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x79 | ||
92 | MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x79 | ||
93 | MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x79 | ||
94 | MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x79 | ||
95 | MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x79 | ||
96 | MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x79 | ||
97 | MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x79 | ||
98 | MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x79 | ||
99 | MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x79 | ||
100 | MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x79 | ||
101 | MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x79 | ||
102 | MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x79 | ||
103 | MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x79 | ||
104 | MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x79 | ||
105 | >; | ||
106 | }; | ||
107 | }; | ||
diff --git a/arch/arm/boot/dts/imx6ul-isiot-emmc.dts b/arch/arm/boot/dts/imx6ul-isiot-emmc.dts index f5b422898e61..73a1d0f0b9d5 100644 --- a/arch/arm/boot/dts/imx6ul-isiot-emmc.dts +++ b/arch/arm/boot/dts/imx6ul-isiot-emmc.dts | |||
@@ -43,6 +43,7 @@ | |||
43 | /dts-v1/; | 43 | /dts-v1/; |
44 | 44 | ||
45 | #include "imx6ul-isiot.dtsi" | 45 | #include "imx6ul-isiot.dtsi" |
46 | #include "imx6ul-isiot-common.dtsi" | ||
46 | 47 | ||
47 | / { | 48 | / { |
48 | model = "Engicam Is.IoT MX6UL eMMC Starter kit"; | 49 | model = "Engicam Is.IoT MX6UL eMMC Starter kit"; |
diff --git a/arch/arm/boot/dts/imx6ul-isiot-nand.dts b/arch/arm/boot/dts/imx6ul-isiot-nand.dts index de15e1c75dd1..da29a86eb6a8 100644 --- a/arch/arm/boot/dts/imx6ul-isiot-nand.dts +++ b/arch/arm/boot/dts/imx6ul-isiot-nand.dts | |||
@@ -43,6 +43,7 @@ | |||
43 | /dts-v1/; | 43 | /dts-v1/; |
44 | 44 | ||
45 | #include "imx6ul-isiot.dtsi" | 45 | #include "imx6ul-isiot.dtsi" |
46 | #include "imx6ul-isiot-common.dtsi" | ||
46 | 47 | ||
47 | / { | 48 | / { |
48 | model = "Engicam Is.IoT MX6UL NAND Starter kit"; | 49 | model = "Engicam Is.IoT MX6UL NAND Starter kit"; |