aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-01-27 16:03:23 -0500
committerLinus Walleij <linus.walleij@linaro.org>2016-09-09 17:16:07 -0400
commit17470b7da11c137267c74ff0d2d4cca56f595c60 (patch)
tree31e76bbb4b4820b6011c52bb88cd71fb727a8182
parent6fb2de9d9f1b34fed21d7c88a008b8822f5dd4c7 (diff)
ARM: dts: add the CLCD LCD display to the NHK15
This adds the TPG110 TDO43MTEA2 24-bit RGB LCD panel and sets up the Nomadik device tree to activate the CLCD and connect it to this panel. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/boot/dts/ste-nomadik-nhk15.dts44
-rw-r--r--arch/arm/boot/dts/ste-nomadik-stn8815.dtsi22
2 files changed, 66 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
index 3ec5c653ad56..1ec46a794a4d 100644
--- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts
+++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
@@ -176,6 +176,50 @@
176 }; 176 };
177 177
178 amba { 178 amba {
179 clcd@10120000 {
180 status = "okay";
181 pinctrl-names = "default";
182 pinctrl-0 = <&clcd_24bit_mux>;
183 port {
184 nomadik_clcd_pads: endpoint {
185 remote-endpoint = <&nomadik_clcd_panel>;
186 arm,pl11x,tft-r0g0b0-pads = <16 8 0>;
187 };
188 };
189
190 /*
191 * WVGA connector 21
192 * WVGA (800x480): 4.3" TPG110 TDO43MTEA2 24-bit RGB
193 * with TPO touch screen.
194 */
195 panel {
196 compatible = "tpo,tpg110", "panel-dpi";
197 grestb-gpios = <&stmpe_gpio44 5 GPIO_ACTIVE_LOW>;
198 scen-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
199 scl-gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
200 sda-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
201 backlight = <&bl>;
202
203 port {
204 nomadik_clcd_panel: endpoint {
205 remote-endpoint = <&nomadik_clcd_pads>;
206 };
207 };
208
209 panel-timing {
210 clock-frequency = <33200000>;
211 hactive = <800>;
212 hback-porch = <216>;
213 hfront-porch = <40>;
214 hsync-len = <1>;
215 vactive = <480>;
216 vback-porch = <35>;
217 vfront-porch = <10>;
218 vsync-len = <1>;
219 };
220 };
221 };
222
179 /* Activate RX/TX and CTS/RTS on UART 0 */ 223 /* Activate RX/TX and CTS/RTS on UART 0 */
180 uart0: uart@101fd000 { 224 uart0: uart@101fd000 {
181 pinctrl-names = "default"; 225 pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index 80a3c9ccccd9..adb1c0998b81 100644
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -166,6 +166,18 @@
166 }; 166 };
167 }; 167 };
168 }; 168 };
169 clcd {
170 /*
171 * This should be activated to use the additional
172 * 8 lines for bits 16 thru 23 from the CLCD block.
173 */
174 clcd_24bit_mux: clcd_mux {
175 clcd_24bit_mux {
176 function = "clcd";
177 groups = "clcd_16_23_b_1";
178 };
179 };
180 };
169 }; 181 };
170 182
171 /* Power Management Unit */ 183 /* Power Management Unit */
@@ -732,6 +744,16 @@
732 #size-cells = <1>; 744 #size-cells = <1>;
733 ranges; 745 ranges;
734 746
747 clcd@10120000 {
748 compatible = "arm,pl110", "arm,primecell";
749 reg = <0x10120000 0x1000>;
750 interrupt-names = "combined";
751 interrupts = <14>;
752 clocks = <&clcdclk>, <&hclkclcd>;
753 clock-names = "clcdclk", "apb_pclk";
754 status = "disabled";
755 };
756
735 vica: intc@10140000 { 757 vica: intc@10140000 {
736 compatible = "arm,versatile-vic"; 758 compatible = "arm,versatile-vic";
737 interrupt-controller; 759 interrupt-controller;