Skip to content

Commit 052bc8f

Browse files
arndbarndb
committed
Merge tag 'samsung-dt64-4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt64
Pull "Second update of Samsung DeviceTree ARM64 for v4.12" from Krzysztof Kozłowski: - Fix DTC warnings in Exynos ARM64 Device Tree sources. - Add panel node to TM2E board. * tag 'samsung-dt64-4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: arm64: dts: exynos: Use - instead of @ for DT OPP entries arm64: dts: exynos: Add support for s6e3hf2 panel device on TM2e board
2 parents ae706be + 684c581 commit 052bc8f

File tree

3 files changed

+60
-49
lines changed

3 files changed

+60
-49
lines changed

‎arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -94,27 +94,27 @@
9494
compatible = "operating-points-v2";
9595
opp-shared;
9696

97-
opp@400000000 {
97+
opp-400000000 {
9898
opp-hz = /bits/ 64 <400000000>;
9999
opp-microvolt = <1075000>;
100100
};
101-
opp@267000000 {
101+
opp-267000000 {
102102
opp-hz = /bits/ 64 <267000000>;
103103
opp-microvolt = <1000000>;
104104
};
105-
opp@200000000 {
105+
opp-200000000 {
106106
opp-hz = /bits/ 64 <200000000>;
107107
opp-microvolt = <975000>;
108108
};
109-
opp@160000000 {
109+
opp-160000000 {
110110
opp-hz = /bits/ 64 <160000000>;
111111
opp-microvolt = <962500>;
112112
};
113-
opp@134000000 {
113+
opp-134000000 {
114114
opp-hz = /bits/ 64 <134000000>;
115115
opp-microvolt = <950000>;
116116
};
117-
opp@100000000 {
117+
opp-100000000 {
118118
opp-hz = /bits/ 64 <100000000>;
119119
opp-microvolt = <937500>;
120120
};
@@ -123,33 +123,33 @@
123123
bus_g2d_266_opp_table: opp_table3 {
124124
compatible = "operating-points-v2";
125125

126-
opp@267000000 {
126+
opp-267000000 {
127127
opp-hz = /bits/ 64 <267000000>;
128128
};
129-
opp@200000000 {
129+
opp-200000000 {
130130
opp-hz = /bits/ 64 <200000000>;
131131
};
132-
opp@160000000 {
132+
opp-160000000 {
133133
opp-hz = /bits/ 64 <160000000>;
134134
};
135-
opp@134000000 {
135+
opp-134000000 {
136136
opp-hz = /bits/ 64 <134000000>;
137137
};
138-
opp@100000000 {
138+
opp-100000000 {
139139
opp-hz = /bits/ 64 <100000000>;
140140
};
141141
};
142142

143143
bus_gscl_opp_table: opp_table4 {
144144
compatible = "operating-points-v2";
145145

146-
opp@333000000 {
146+
opp-333000000 {
147147
opp-hz = /bits/ 64 <333000000>;
148148
};
149-
opp@222000000 {
149+
opp-222000000 {
150150
opp-hz = /bits/ 64 <222000000>;
151151
};
152-
opp@166500000 {
152+
opp-166500000 {
153153
opp-hz = /bits/ 64 <166500000>;
154154
};
155155
};
@@ -158,39 +158,39 @@
158158
compatible = "operating-points-v2";
159159
opp-shared;
160160

161-
opp@400000000 {
161+
opp-400000000 {
162162
opp-hz = /bits/ 64 <400000000>;
163163
};
164-
opp@267000000 {
164+
opp-267000000 {
165165
opp-hz = /bits/ 64 <267000000>;
166166
};
167-
opp@200000000 {
167+
opp-200000000 {
168168
opp-hz = /bits/ 64 <200000000>;
169169
};
170-
opp@160000000 {
170+
opp-160000000 {
171171
opp-hz = /bits/ 64 <160000000>;
172172
};
173-
opp@134000000 {
173+
opp-134000000 {
174174
opp-hz = /bits/ 64 <134000000>;
175175
};
176-
opp@100000000 {
176+
opp-100000000 {
177177
opp-hz = /bits/ 64 <100000000>;
178178
};
179179
};
180180

181181
bus_noc2_opp_table: opp_table6 {
182182
compatible = "operating-points-v2";
183183

184-
opp@400000000 {
184+
opp-400000000 {
185185
opp-hz = /bits/ 64 <400000000>;
186186
};
187-
opp@200000000 {
187+
opp-200000000 {
188188
opp-hz = /bits/ 64 <200000000>;
189189
};
190-
opp@134000000 {
190+
opp-134000000 {
191191
opp-hz = /bits/ 64 <134000000>;
192192
};
193-
opp@100000000 {
193+
opp-100000000 {
194194
opp-hz = /bits/ 64 <100000000>;
195195
};
196196
};

‎arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@
5252
assigned-clock-rates = <278000000>, <400000000>;
5353
};
5454

55+
&dsi {
56+
panel@0 {
57+
compatible = "samsung,s6e3hf2";
58+
reg = <0>;
59+
vdd3-supply = <&ldo27_reg>;
60+
vci-supply = <&ldo28_reg>;
61+
reset-gpios = <&gpg0 0 GPIO_ACTIVE_LOW>;
62+
enable-gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>;
63+
};
64+
};
65+
5566
&ldo31_reg {
5667
regulator-name = "TSP_VDD_1.8V_AP";
5768
regulator-min-microvolt = <1800000>;

‎arch/arm64/boot/dts/exynos/exynos5433.dtsi

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -119,43 +119,43 @@
119119
compatible = "operating-points-v2";
120120
opp-shared;
121121

122-
opp@400000000 {
122+
opp-400000000 {
123123
opp-hz = /bits/ 64 <400000000>;
124124
opp-microvolt = <900000>;
125125
};
126-
opp@500000000 {
126+
opp-500000000 {
127127
opp-hz = /bits/ 64 <500000000>;
128128
opp-microvolt = <925000>;
129129
};
130-
opp@600000000 {
130+
opp-600000000 {
131131
opp-hz = /bits/ 64 <600000000>;
132132
opp-microvolt = <950000>;
133133
};
134-
opp@700000000 {
134+
opp-700000000 {
135135
opp-hz = /bits/ 64 <700000000>;
136136
opp-microvolt = <975000>;
137137
};
138-
opp@800000000 {
138+
opp-800000000 {
139139
opp-hz = /bits/ 64 <800000000>;
140140
opp-microvolt = <1000000>;
141141
};
142-
opp@900000000 {
142+
opp-900000000 {
143143
opp-hz = /bits/ 64 <900000000>;
144144
opp-microvolt = <1050000>;
145145
};
146-
opp@1000000000 {
146+
opp-1000000000 {
147147
opp-hz = /bits/ 64 <1000000000>;
148148
opp-microvolt = <1075000>;
149149
};
150-
opp@1100000000 {
150+
opp-1100000000 {
151151
opp-hz = /bits/ 64 <1100000000>;
152152
opp-microvolt = <1112500>;
153153
};
154-
opp@1200000000 {
154+
opp-1200000000 {
155155
opp-hz = /bits/ 64 <1200000000>;
156156
opp-microvolt = <1112500>;
157157
};
158-
opp@1300000000 {
158+
opp-1300000000 {
159159
opp-hz = /bits/ 64 <1300000000>;
160160
opp-microvolt = <1150000>;
161161
};
@@ -165,63 +165,63 @@
165165
compatible = "operating-points-v2";
166166
opp-shared;
167167

168-
opp@500000000 {
168+
opp-500000000 {
169169
opp-hz = /bits/ 64 <500000000>;
170170
opp-microvolt = <900000>;
171171
};
172-
opp@600000000 {
172+
opp-600000000 {
173173
opp-hz = /bits/ 64 <600000000>;
174174
opp-microvolt = <900000>;
175175
};
176-
opp@700000000 {
176+
opp-700000000 {
177177
opp-hz = /bits/ 64 <700000000>;
178178
opp-microvolt = <912500>;
179179
};
180-
opp@800000000 {
180+
opp-800000000 {
181181
opp-hz = /bits/ 64 <800000000>;
182182
opp-microvolt = <912500>;
183183
};
184-
opp@900000000 {
184+
opp-900000000 {
185185
opp-hz = /bits/ 64 <900000000>;
186186
opp-microvolt = <937500>;
187187
};
188-
opp@1000000000 {
188+
opp-1000000000 {
189189
opp-hz = /bits/ 64 <1000000000>;
190190
opp-microvolt = <975000>;
191191
};
192-
opp@1100000000 {
192+
opp-1100000000 {
193193
opp-hz = /bits/ 64 <1100000000>;
194194
opp-microvolt = <1012500>;
195195
};
196-
opp@1200000000 {
196+
opp-1200000000 {
197197
opp-hz = /bits/ 64 <1200000000>;
198198
opp-microvolt = <1037500>;
199199
};
200-
opp@1300000000 {
200+
opp-1300000000 {
201201
opp-hz = /bits/ 64 <1300000000>;
202202
opp-microvolt = <1062500>;
203203
};
204-
opp@1400000000 {
204+
opp-1400000000 {
205205
opp-hz = /bits/ 64 <1400000000>;
206206
opp-microvolt = <1087500>;
207207
};
208-
opp@1500000000 {
208+
opp-1500000000 {
209209
opp-hz = /bits/ 64 <1500000000>;
210210
opp-microvolt = <1125000>;
211211
};
212-
opp@1600000000 {
212+
opp-1600000000 {
213213
opp-hz = /bits/ 64 <1600000000>;
214214
opp-microvolt = <1137500>;
215215
};
216-
opp@1700000000 {
216+
opp-1700000000 {
217217
opp-hz = /bits/ 64 <1700000000>;
218218
opp-microvolt = <1175000>;
219219
};
220-
opp@1800000000 {
220+
opp-1800000000 {
221221
opp-hz = /bits/ 64 <1800000000>;
222222
opp-microvolt = <1212500>;
223223
};
224-
opp@1900000000 {
224+
opp-1900000000 {
225225
opp-hz = /bits/ 64 <1900000000>;
226226
opp-microvolt = <1262500>;
227227
};

0 commit comments

Comments
 (0)