aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann2017-04-27 14:45:13 -0500
committerArnd Bergmann2017-04-27 14:45:13 -0500
commit052bc8fc8f6de1d015ed7714a77ad65c9d9b2e4f (patch)
treee3b2bdd1645fa94dda4ac79fec8b9fd83c6b1ed1
parentae706bebd6a172a6adf9f63d1a77b8ed49e998a6 (diff)
parent684c581f10f5e21976d9dcd85a190f37ddc843dd (diff)
downloadkernel-052bc8fc8f6de1d015ed7714a77ad65c9d9b2e4f.tar.gz
kernel-052bc8fc8f6de1d015ed7714a77ad65c9d9b2e4f.tar.xz
kernel-052bc8fc8f6de1d015ed7714a77ad65c9d9b2e4f.zip
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
-rw-r--r--arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi48
-rw-r--r--arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts11
-rw-r--r--arch/arm64/boot/dts/exynos/exynos5433.dtsi50
3 files changed, 60 insertions, 49 deletions
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi
index c42dc39c3223..ec11343dc528 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi
@@ -94,27 +94,27 @@
94 compatible = "operating-points-v2"; 94 compatible = "operating-points-v2";
95 opp-shared; 95 opp-shared;
96 96
97 opp@400000000 { 97 opp-400000000 {
98 opp-hz = /bits/ 64 <400000000>; 98 opp-hz = /bits/ 64 <400000000>;
99 opp-microvolt = <1075000>; 99 opp-microvolt = <1075000>;
100 }; 100 };
101 opp@267000000 { 101 opp-267000000 {
102 opp-hz = /bits/ 64 <267000000>; 102 opp-hz = /bits/ 64 <267000000>;
103 opp-microvolt = <1000000>; 103 opp-microvolt = <1000000>;
104 }; 104 };
105 opp@200000000 { 105 opp-200000000 {
106 opp-hz = /bits/ 64 <200000000>; 106 opp-hz = /bits/ 64 <200000000>;
107 opp-microvolt = <975000>; 107 opp-microvolt = <975000>;
108 }; 108 };
109 opp@160000000 { 109 opp-160000000 {
110 opp-hz = /bits/ 64 <160000000>; 110 opp-hz = /bits/ 64 <160000000>;
111 opp-microvolt = <962500>; 111 opp-microvolt = <962500>;
112 }; 112 };
113 opp@134000000 { 113 opp-134000000 {
114 opp-hz = /bits/ 64 <134000000>; 114 opp-hz = /bits/ 64 <134000000>;
115 opp-microvolt = <950000>; 115 opp-microvolt = <950000>;
116 }; 116 };
117 opp@100000000 { 117 opp-100000000 {
118 opp-hz = /bits/ 64 <100000000>; 118 opp-hz = /bits/ 64 <100000000>;
119 opp-microvolt = <937500>; 119 opp-microvolt = <937500>;
120 }; 120 };
@@ -123,19 +123,19 @@
123 bus_g2d_266_opp_table: opp_table3 { 123 bus_g2d_266_opp_table: opp_table3 {
124 compatible = "operating-points-v2"; 124 compatible = "operating-points-v2";
125 125
126 opp@267000000 { 126 opp-267000000 {
127 opp-hz = /bits/ 64 <267000000>; 127 opp-hz = /bits/ 64 <267000000>;
128 }; 128 };
129 opp@200000000 { 129 opp-200000000 {
130 opp-hz = /bits/ 64 <200000000>; 130 opp-hz = /bits/ 64 <200000000>;
131 }; 131 };
132 opp@160000000 { 132 opp-160000000 {
133 opp-hz = /bits/ 64 <160000000>; 133 opp-hz = /bits/ 64 <160000000>;
134 }; 134 };
135 opp@134000000 { 135 opp-134000000 {
136 opp-hz = /bits/ 64 <134000000>; 136 opp-hz = /bits/ 64 <134000000>;
137 }; 137 };
138 opp@100000000 { 138 opp-100000000 {
139 opp-hz = /bits/ 64 <100000000>; 139 opp-hz = /bits/ 64 <100000000>;
140 }; 140 };
141 }; 141 };
@@ -143,13 +143,13 @@
143 bus_gscl_opp_table: opp_table4 { 143 bus_gscl_opp_table: opp_table4 {
144 compatible = "operating-points-v2"; 144 compatible = "operating-points-v2";
145 145
146 opp@333000000 { 146 opp-333000000 {
147 opp-hz = /bits/ 64 <333000000>; 147 opp-hz = /bits/ 64 <333000000>;
148 }; 148 };
149 opp@222000000 { 149 opp-222000000 {
150 opp-hz = /bits/ 64 <222000000>; 150 opp-hz = /bits/ 64 <222000000>;
151 }; 151 };
152 opp@166500000 { 152 opp-166500000 {
153 opp-hz = /bits/ 64 <166500000>; 153 opp-hz = /bits/ 64 <166500000>;
154 }; 154 };
155 }; 155 };
@@ -158,22 +158,22 @@
158 compatible = "operating-points-v2"; 158 compatible = "operating-points-v2";
159 opp-shared; 159 opp-shared;
160 160
161 opp@400000000 { 161 opp-400000000 {
162 opp-hz = /bits/ 64 <400000000>; 162 opp-hz = /bits/ 64 <400000000>;
163 }; 163 };
164 opp@267000000 { 164 opp-267000000 {
165 opp-hz = /bits/ 64 <267000000>; 165 opp-hz = /bits/ 64 <267000000>;
166 }; 166 };
167 opp@200000000 { 167 opp-200000000 {
168 opp-hz = /bits/ 64 <200000000>; 168 opp-hz = /bits/ 64 <200000000>;
169 }; 169 };
170 opp@160000000 { 170 opp-160000000 {
171 opp-hz = /bits/ 64 <160000000>; 171 opp-hz = /bits/ 64 <160000000>;
172 }; 172 };
173 opp@134000000 { 173 opp-134000000 {
174 opp-hz = /bits/ 64 <134000000>; 174 opp-hz = /bits/ 64 <134000000>;
175 }; 175 };
176 opp@100000000 { 176 opp-100000000 {
177 opp-hz = /bits/ 64 <100000000>; 177 opp-hz = /bits/ 64 <100000000>;
178 }; 178 };
179 }; 179 };
@@ -181,16 +181,16 @@
181 bus_noc2_opp_table: opp_table6 { 181 bus_noc2_opp_table: opp_table6 {
182 compatible = "operating-points-v2"; 182 compatible = "operating-points-v2";
183 183
184 opp@400000000 { 184 opp-400000000 {
185 opp-hz = /bits/ 64 <400000000>; 185 opp-hz = /bits/ 64 <400000000>;
186 }; 186 };
187 opp@200000000 { 187 opp-200000000 {
188 opp-hz = /bits/ 64 <200000000>; 188 opp-hz = /bits/ 64 <200000000>;
189 }; 189 };
190 opp@134000000 { 190 opp-134000000 {
191 opp-hz = /bits/ 64 <134000000>; 191 opp-hz = /bits/ 64 <134000000>;
192 }; 192 };
193 opp@100000000 { 193 opp-100000000 {
194 opp-hz = /bits/ 64 <100000000>; 194 opp-hz = /bits/ 64 <100000000>;
195 }; 195 };
196 }; 196 };
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
index 694717ade927..b73e1231a86f 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
@@ -52,6 +52,17 @@
52 assigned-clock-rates = <278000000>, <400000000>; 52 assigned-clock-rates = <278000000>, <400000000>;
53}; 53};
54 54
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
55&ldo31_reg { 66&ldo31_reg {
56 regulator-name = "TSP_VDD_1.8V_AP"; 67 regulator-name = "TSP_VDD_1.8V_AP";
57 regulator-min-microvolt = <1800000>; 68 regulator-min-microvolt = <1800000>;
diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index 16072c1c3ed3..727f36abf3d4 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
@@ -119,43 +119,43 @@
119 compatible = "operating-points-v2"; 119 compatible = "operating-points-v2";
120 opp-shared; 120 opp-shared;
121 121
122 opp@400000000 { 122 opp-400000000 {
123 opp-hz = /bits/ 64 <400000000>; 123 opp-hz = /bits/ 64 <400000000>;
124 opp-microvolt = <900000>; 124 opp-microvolt = <900000>;
125 }; 125 };
126 opp@500000000 { 126 opp-500000000 {
127 opp-hz = /bits/ 64 <500000000>; 127 opp-hz = /bits/ 64 <500000000>;
128 opp-microvolt = <925000>; 128 opp-microvolt = <925000>;
129 }; 129 };
130 opp@600000000 { 130 opp-600000000 {
131 opp-hz = /bits/ 64 <600000000>; 131 opp-hz = /bits/ 64 <600000000>;
132 opp-microvolt = <950000>; 132 opp-microvolt = <950000>;
133 }; 133 };
134 opp@700000000 { 134 opp-700000000 {
135 opp-hz = /bits/ 64 <700000000>; 135 opp-hz = /bits/ 64 <700000000>;
136 opp-microvolt = <975000>; 136 opp-microvolt = <975000>;
137 }; 137 };
138 opp@800000000 { 138 opp-800000000 {
139 opp-hz = /bits/ 64 <800000000>; 139 opp-hz = /bits/ 64 <800000000>;
140 opp-microvolt = <1000000>; 140 opp-microvolt = <1000000>;
141 }; 141 };
142 opp@900000000 { 142 opp-900000000 {
143 opp-hz = /bits/ 64 <900000000>; 143 opp-hz = /bits/ 64 <900000000>;
144 opp-microvolt = <1050000>; 144 opp-microvolt = <1050000>;
145 }; 145 };
146 opp@1000000000 { 146 opp-1000000000 {
147 opp-hz = /bits/ 64 <1000000000>; 147 opp-hz = /bits/ 64 <1000000000>;
148 opp-microvolt = <1075000>; 148 opp-microvolt = <1075000>;
149 }; 149 };
150 opp@1100000000 { 150 opp-1100000000 {
151 opp-hz = /bits/ 64 <1100000000>; 151 opp-hz = /bits/ 64 <1100000000>;
152 opp-microvolt = <1112500>; 152 opp-microvolt = <1112500>;
153 }; 153 };
154 opp@1200000000 { 154 opp-1200000000 {
155 opp-hz = /bits/ 64 <1200000000>; 155 opp-hz = /bits/ 64 <1200000000>;
156 opp-microvolt = <1112500>; 156 opp-microvolt = <1112500>;
157 }; 157 };
158 opp@1300000000 { 158 opp-1300000000 {
159 opp-hz = /bits/ 64 <1300000000>; 159 opp-hz = /bits/ 64 <1300000000>;
160 opp-microvolt = <1150000>; 160 opp-microvolt = <1150000>;
161 }; 161 };
@@ -165,63 +165,63 @@
165 compatible = "operating-points-v2"; 165 compatible = "operating-points-v2";
166 opp-shared; 166 opp-shared;
167 167
168 opp@500000000 { 168 opp-500000000 {
169 opp-hz = /bits/ 64 <500000000>; 169 opp-hz = /bits/ 64 <500000000>;
170 opp-microvolt = <900000>; 170 opp-microvolt = <900000>;
171 }; 171 };
172 opp@600000000 { 172 opp-600000000 {
173 opp-hz = /bits/ 64 <600000000>; 173 opp-hz = /bits/ 64 <600000000>;
174 opp-microvolt = <900000>; 174 opp-microvolt = <900000>;
175 }; 175 };
176 opp@700000000 { 176 opp-700000000 {
177 opp-hz = /bits/ 64 <700000000>; 177 opp-hz = /bits/ 64 <700000000>;
178 opp-microvolt = <912500>; 178 opp-microvolt = <912500>;
179 }; 179 };
180 opp@800000000 { 180 opp-800000000 {
181 opp-hz = /bits/ 64 <800000000>; 181 opp-hz = /bits/ 64 <800000000>;
182 opp-microvolt = <912500>; 182 opp-microvolt = <912500>;
183 }; 183 };
184 opp@900000000 { 184 opp-900000000 {
185 opp-hz = /bits/ 64 <900000000>; 185 opp-hz = /bits/ 64 <900000000>;
186 opp-microvolt = <937500>; 186 opp-microvolt = <937500>;
187 }; 187 };
188 opp@1000000000 { 188 opp-1000000000 {
189 opp-hz = /bits/ 64 <1000000000>; 189 opp-hz = /bits/ 64 <1000000000>;
190 opp-microvolt = <975000>; 190 opp-microvolt = <975000>;
191 }; 191 };
192 opp@1100000000 { 192 opp-1100000000 {
193 opp-hz = /bits/ 64 <1100000000>; 193 opp-hz = /bits/ 64 <1100000000>;
194 opp-microvolt = <1012500>; 194 opp-microvolt = <1012500>;
195 }; 195 };
196 opp@1200000000 { 196 opp-1200000000 {
197 opp-hz = /bits/ 64 <1200000000>; 197 opp-hz = /bits/ 64 <1200000000>;
198 opp-microvolt = <1037500>; 198 opp-microvolt = <1037500>;
199 }; 199 };
200 opp@1300000000 { 200 opp-1300000000 {
201 opp-hz = /bits/ 64 <1300000000>; 201 opp-hz = /bits/ 64 <1300000000>;
202 opp-microvolt = <1062500>; 202 opp-microvolt = <1062500>;
203 }; 203 };
204 opp@1400000000 { 204 opp-1400000000 {
205 opp-hz = /bits/ 64 <1400000000>; 205 opp-hz = /bits/ 64 <1400000000>;
206 opp-microvolt = <1087500>; 206 opp-microvolt = <1087500>;
207 }; 207 };
208 opp@1500000000 { 208 opp-1500000000 {
209 opp-hz = /bits/ 64 <1500000000>; 209 opp-hz = /bits/ 64 <1500000000>;
210 opp-microvolt = <1125000>; 210 opp-microvolt = <1125000>;
211 }; 211 };
212 opp@1600000000 { 212 opp-1600000000 {
213 opp-hz = /bits/ 64 <1600000000>; 213 opp-hz = /bits/ 64 <1600000000>;
214 opp-microvolt = <1137500>; 214 opp-microvolt = <1137500>;
215 }; 215 };
216 opp@1700000000 { 216 opp-1700000000 {
217 opp-hz = /bits/ 64 <1700000000>; 217 opp-hz = /bits/ 64 <1700000000>;
218 opp-microvolt = <1175000>; 218 opp-microvolt = <1175000>;
219 }; 219 };
220 opp@1800000000 { 220 opp-1800000000 {
221 opp-hz = /bits/ 64 <1800000000>; 221 opp-hz = /bits/ 64 <1800000000>;
222 opp-microvolt = <1212500>; 222 opp-microvolt = <1212500>;
223 }; 223 };
224 opp@1900000000 { 224 opp-1900000000 {
225 opp-hz = /bits/ 64 <1900000000>; 225 opp-hz = /bits/ 64 <1900000000>;
226 opp-microvolt = <1262500>; 226 opp-microvolt = <1262500>;
227 }; 227 };