hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/arch/arm/boot/dts/s5pv210-goni.dts
....@@ -11,6 +11,8 @@
1111 */
1212
1313 /dts-v1/;
14
+#include <dt-bindings/gpio/gpio.h>
15
+#include <dt-bindings/interrupt-controller/irq.h>
1416 #include <dt-bindings/input/input.h>
1517 #include "s5pv210.dtsi"
1618
....@@ -33,52 +35,49 @@
3335 0x50000000 0x08000000>;
3436 };
3537
36
- regulators {
37
- compatible = "simple-bus";
38
- #address-cells = <1>;
39
- #size-cells = <0>;
38
+ pmic_ap_clk: clock-0 {
39
+ /* Workaround for missing clock on PMIC */
40
+ compatible = "fixed-clock";
41
+ #clock-cells = <0>;
42
+ clock-frequency = <32768>;
43
+ };
4044
41
- vtf_reg: fixed-regulator@0 {
42
- compatible = "regulator-fixed";
43
- regulator-name = "V_TF_2.8V";
44
- regulator-min-microvolt = <2800000>;
45
- regulator-max-microvolt = <2800000>;
46
- reg = <0>;
47
- gpio = <&mp05 4 0>;
48
- enable-active-high;
49
- };
45
+ vtf_reg: regulator-0 {
46
+ compatible = "regulator-fixed";
47
+ regulator-name = "V_TF_2.8V";
48
+ regulator-min-microvolt = <2800000>;
49
+ regulator-max-microvolt = <2800000>;
50
+ gpio = <&mp05 4 GPIO_ACTIVE_HIGH>;
51
+ enable-active-high;
52
+ };
5053
51
- pda_reg: fixed-regulator@1 {
52
- compatible = "regulator-fixed";
53
- regulator-name = "VCC_1.8V_PDA";
54
- regulator-min-microvolt = <1800000>;
55
- regulator-max-microvolt = <1800000>;
56
- reg = <1>;
57
- };
54
+ pda_reg: regulator-1 {
55
+ compatible = "regulator-fixed";
56
+ regulator-name = "VCC_1.8V_PDA";
57
+ regulator-min-microvolt = <1800000>;
58
+ regulator-max-microvolt = <1800000>;
59
+ };
5860
59
- bat_reg: fixed-regulator@2 {
60
- compatible = "regulator-fixed";
61
- regulator-name = "V_BAT";
62
- regulator-min-microvolt = <3700000>;
63
- regulator-max-microvolt = <3700000>;
64
- reg = <2>;
65
- };
61
+ bat_reg: regulator-2 {
62
+ compatible = "regulator-fixed";
63
+ regulator-name = "V_BAT";
64
+ regulator-min-microvolt = <3700000>;
65
+ regulator-max-microvolt = <3700000>;
66
+ };
6667
67
- tsp_reg: fixed-regulator@3 {
68
- compatible = "regulator-fixed";
69
- regulator-name = "TSP_VDD";
70
- regulator-min-microvolt = <2800000>;
71
- regulator-max-microvolt = <2800000>;
72
- reg = <3>;
73
- gpio = <&gpj1 3 0>;
74
- enable-active-high;
75
- };
68
+ tsp_reg: regulator-3 {
69
+ compatible = "regulator-fixed";
70
+ regulator-name = "TSP_VDD";
71
+ regulator-min-microvolt = <2800000>;
72
+ regulator-max-microvolt = <2800000>;
73
+ gpio = <&gpj1 3 GPIO_ACTIVE_HIGH>;
74
+ enable-active-high;
7675 };
7776
7877 i2c_pmic: i2c-pmic {
7978 compatible = "i2c-gpio";
80
- gpios = <&gpj4 0 0>, /* sda */
81
- <&gpj4 3 0>; /* scl */
79
+ sda-gpios = <&gpj4 0 GPIO_ACTIVE_HIGH>;
80
+ scl-gpios = <&gpj4 3 GPIO_ACTIVE_HIGH>;
8281 i2c-gpio,delay-us = <2>; /* ~100 kHz */
8382 #address-cells = <1>;
8483 #size-cells = <0>;
....@@ -88,13 +87,13 @@
8887 reg = <0x66>;
8988
9089 max8998,pmic-buck1-default-dvs-idx = <0>;
91
- max8998,pmic-buck1-dvs-gpios = <&gph0 3 0>,
92
- <&gph0 4 0>;
90
+ max8998,pmic-buck1-dvs-gpios = <&gph0 3 GPIO_ACTIVE_HIGH>,
91
+ <&gph0 4 GPIO_ACTIVE_HIGH>;
9392 max8998,pmic-buck1-dvs-voltage = <1200000>, <1200000>,
9493 <1200000>, <1200000>;
9594
9695 max8998,pmic-buck2-default-dvs-idx = <0>;
97
- max8998,pmic-buck2-dvs-gpio = <&gph0 5 0>;
96
+ max8998,pmic-buck2-dvs-gpio = <&gph0 5 GPIO_ACTIVE_HIGH>;
9897 max8998,pmic-buck2-dvs-voltage = <1200000>, <1200000>;
9998
10099 regulators {
....@@ -224,6 +223,11 @@
224223 regulator-max-microvolt = <1200000>;
225224 regulator-always-on;
226225 };
226
+
227
+ ap32khz_reg: EN32KHz-AP {
228
+ regulator-name = "32KHz AP";
229
+ regulator-always-on;
230
+ };
227231 };
228232 };
229233 };
....@@ -255,37 +259,37 @@
255259 <&keypad_col0>, <&keypad_col1>, <&keypad_col2>;
256260 status = "okay";
257261
258
- key_1 {
262
+ key-1 {
259263 keypad,row = <0>;
260264 keypad,column = <1>;
261265 linux,code = <KEY_CONNECT>;
262266 };
263267
264
- key_2 {
268
+ key-2 {
265269 keypad,row = <0>;
266270 keypad,column = <2>;
267271 linux,code = <KEY_BACK>;
268272 };
269273
270
- key_3 {
274
+ key-3 {
271275 keypad,row = <1>;
272276 keypad,column = <1>;
273277 linux,code = <KEY_CAMERA_FOCUS>;
274278 };
275279
276
- key_4 {
280
+ key-4 {
277281 keypad,row = <1>;
278282 keypad,column = <2>;
279283 linux,code = <KEY_VOLUMEUP>;
280284 };
281285
282
- key_5 {
286
+ key-5 {
283287 keypad,row = <2>;
284288 keypad,column = <1>;
285289 linux,code = <KEY_CAMERA>;
286290 };
287291
288
- key_6 {
292
+ key-6 {
289293 keypad,row = <2>;
290294 keypad,column = <2>;
291295 linux,code = <KEY_VOLUMEDOWN>;
....@@ -306,6 +310,11 @@
306310
307311 &uart3 {
308312 status = "okay";
313
+};
314
+
315
+&rtc {
316
+ clocks = <&clocks CLK_RTC>, <&pmic_ap_clk>;
317
+ clock-names = "rtc", "rtc_src";
309318 };
310319
311320 &sdhci0 {
....@@ -344,11 +353,11 @@
344353 samsung,i2c-slave-addr = <0x10>;
345354 status = "okay";
346355
347
- tsp@4a {
356
+ touchscreen@4a {
348357 compatible = "atmel,maxtouch";
349358 reg = <0x4a>;
350359 interrupt-parent = <&gpj0>;
351
- interrupts = <5 2>;
360
+ interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
352361
353362 atmel,x-line = <17>;
354363 atmel,y-line = <11>;
....@@ -376,10 +385,10 @@
376385 vdd_core-supply = <&ldo14_reg>;
377386
378387 clock-frequency = <16000000>;
379
- clocks = <&clock_cam 0>;
388
+ clocks = <&camera 0>;
380389 clock-names = "mclk";
381
- nreset-gpios = <&gpb 2 0>;
382
- nstby-gpios = <&gpb 0 0>;
390
+ nreset-gpios = <&gpb 2 GPIO_ACTIVE_HIGH>;
391
+ nstby-gpios = <&gpb 0 GPIO_ACTIVE_HIGH>;
383392
384393 port {
385394 noon010pc30_ep: endpoint {