diff options
author | Hans de Goede <hdegoede@redhat.com> | 2016-07-08 12:05:43 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-07-18 05:39:45 -0400 |
commit | f4a51e0ff74a496304ea06c4c74cca934c915efa (patch) | |
tree | 8345ff7b57ad47f1e73d3e13230f4ed8a2d63fc7 | |
parent | 110af36aa06dfa201b844ac683d35ce18d4d686e (diff) |
ARM: dts: sun5i: Move q8 display bits to sun5i-a13-q8-tablet.dts
This is a preparation patch for renaming sun5i-q8-common.dtsi to
sun5i-reference-design-tablet.dtsi and sharing it between all
the A13 tablet dts files.
Since we only have a panel config for the 18 tablets (for now) move
this to the q8 specific dts file.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r-- | arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 36 | ||||
-rw-r--r-- | arch/arm/boot/dts/sun5i-q8-common.dtsi | 36 |
2 files changed, 36 insertions, 36 deletions
diff --git a/arch/arm/boot/dts/sun5i-a13-q8-tablet.dts b/arch/arm/boot/dts/sun5i-a13-q8-tablet.dts index dce77825571d..afe14f7bf3fb 100644 --- a/arch/arm/boot/dts/sun5i-a13-q8-tablet.dts +++ b/arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | |||
@@ -47,4 +47,40 @@ | |||
47 | / { | 47 | / { |
48 | model = "Q8 A13 Tablet"; | 48 | model = "Q8 A13 Tablet"; |
49 | compatible = "allwinner,q8-a13", "allwinner,sun5i-a13"; | 49 | compatible = "allwinner,q8-a13", "allwinner,sun5i-a13"; |
50 | |||
51 | panel: panel { | ||
52 | compatible = "urt,umsh-8596md-t", "simple-panel"; | ||
53 | #address-cells = <1>; | ||
54 | #size-cells = <0>; | ||
55 | |||
56 | port@0 { | ||
57 | reg = <0>; | ||
58 | /* TODO: lcd panel uses axp gpio0 as enable pin */ | ||
59 | backlight = <&backlight>; | ||
60 | #address-cells = <1>; | ||
61 | #size-cells = <0>; | ||
62 | |||
63 | panel_input: endpoint@0 { | ||
64 | reg = <0>; | ||
65 | remote-endpoint = <&tcon0_out_lcd>; | ||
66 | }; | ||
67 | }; | ||
68 | }; | ||
69 | }; | ||
70 | |||
71 | &be0 { | ||
72 | status = "okay"; | ||
73 | }; | ||
74 | |||
75 | &tcon0 { | ||
76 | pinctrl-names = "default"; | ||
77 | pinctrl-0 = <&lcd_rgb666_pins>; | ||
78 | status = "okay"; | ||
79 | }; | ||
80 | |||
81 | &tcon0_out { | ||
82 | tcon0_out_lcd: endpoint@0 { | ||
83 | reg = <0>; | ||
84 | remote-endpoint = <&panel_input>; | ||
85 | }; | ||
50 | }; | 86 | }; |
diff --git a/arch/arm/boot/dts/sun5i-q8-common.dtsi b/arch/arm/boot/dts/sun5i-q8-common.dtsi index 8977fb2ee443..ca5d0c4b12a5 100644 --- a/arch/arm/boot/dts/sun5i-q8-common.dtsi +++ b/arch/arm/boot/dts/sun5i-q8-common.dtsi | |||
@@ -59,29 +59,6 @@ | |||
59 | chosen { | 59 | chosen { |
60 | stdout-path = "serial0:115200n8"; | 60 | stdout-path = "serial0:115200n8"; |
61 | }; | 61 | }; |
62 | |||
63 | panel: panel { | ||
64 | compatible = "urt,umsh-8596md-t", "simple-panel"; | ||
65 | #address-cells = <1>; | ||
66 | #size-cells = <0>; | ||
67 | |||
68 | port@0 { | ||
69 | reg = <0>; | ||
70 | /* TODO: lcd panel uses axp gpio0 as enable pin */ | ||
71 | backlight = <&backlight>; | ||
72 | #address-cells = <1>; | ||
73 | #size-cells = <0>; | ||
74 | |||
75 | panel_input: endpoint@0 { | ||
76 | reg = <0>; | ||
77 | remote-endpoint = <&tcon0_out_lcd>; | ||
78 | }; | ||
79 | }; | ||
80 | }; | ||
81 | }; | ||
82 | |||
83 | &be0 { | ||
84 | status = "okay"; | ||
85 | }; | 62 | }; |
86 | 63 | ||
87 | &codec { | 64 | &codec { |
@@ -202,19 +179,6 @@ | |||
202 | status = "okay"; | 179 | status = "okay"; |
203 | }; | 180 | }; |
204 | 181 | ||
205 | &tcon0 { | ||
206 | pinctrl-names = "default"; | ||
207 | pinctrl-0 = <&lcd_rgb666_pins>; | ||
208 | status = "okay"; | ||
209 | }; | ||
210 | |||
211 | &tcon0_out { | ||
212 | tcon0_out_lcd: endpoint@0 { | ||
213 | reg = <0>; | ||
214 | remote-endpoint = <&panel_input>; | ||
215 | }; | ||
216 | }; | ||
217 | |||
218 | &uart1 { | 182 | &uart1 { |
219 | pinctrl-names = "default"; | 183 | pinctrl-names = "default"; |
220 | pinctrl-0 = <&uart1_pins_b>; | 184 | pinctrl-0 = <&uart1_pins_b>; |