Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'samsung-dt-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/dt
Samsung DTS ARM changes for v6.17
Just few cleanups based on dtbs_check.
* tag 'samsung-dt-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: dts: s5pv210: Align i2c-gpio node names with dtschema
ARM: dts: exynos: Align i2c-gpio node names with dtschema
Link: https://lore.kernel.org/r/20250709191523.171359-5-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+31
-31
+1
-1
arch/arm/boot/dts/samsung/exynos3250-monk.dts
+1
-1
arch/arm/boot/dts/samsung/exynos3250-monk.dts
+1
-1
arch/arm/boot/dts/samsung/exynos3250-rinato.dts
+1
-1
arch/arm/boot/dts/samsung/exynos3250-rinato.dts
+3
-3
arch/arm/boot/dts/samsung/exynos4210-i9100.dts
+3
-3
arch/arm/boot/dts/samsung/exynos4210-i9100.dts
···
130
130
reset-gpios = <&gpl1 2 GPIO_ACTIVE_LOW>;
131
131
};
132
132
133
-
i2c_max17042_fuel: i2c-gpio-0 {
133
+
i2c_max17042_fuel: i2c-9 {
134
134
compatible = "i2c-gpio";
135
135
#address-cells = <1>;
136
136
#size-cells = <0>;
···
154
154
};
155
155
};
156
156
157
-
i2c_s5k5baf: i2c-gpio-1 {
157
+
i2c_s5k5baf: i2c-10 {
158
158
compatible = "i2c-gpio";
159
159
#address-cells = <1>;
160
160
#size-cells = <0>;
···
184
184
};
185
185
};
186
186
187
-
i2c-gpio-2 {
187
+
i2c-11 {
188
188
compatible = "i2c-gpio";
189
189
#address-cells = <1>;
190
190
#size-cells = <0>;
+5
-5
arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
+5
-5
arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
···
123
123
color = <LED_COLOR_ID_WHITE>;
124
124
};
125
125
126
-
i2c_max77693: i2c-gpio-1 {
126
+
i2c_max77693: i2c-9 {
127
127
compatible = "i2c-gpio";
128
128
sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
129
129
scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
169
169
};
170
170
};
171
171
172
-
i2c_max77693_fuel: i2c-gpio-2 {
172
+
i2c_max77693_fuel: i2c-10 {
173
173
compatible = "i2c-gpio";
174
174
sda-gpios = <&gpy0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
175
175
scl-gpios = <&gpy0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
190
190
};
191
191
};
192
192
193
-
i2c_magnetometer: i2c-gpio-3 {
193
+
i2c_magnetometer: i2c-11 {
194
194
compatible = "i2c-gpio";
195
195
sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
196
196
scl-gpios = <&gpy2 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
208
208
};
209
209
};
210
210
211
-
i2c_lightsensor: i2c-gpio-4 {
211
+
i2c_lightsensor: i2c-12 {
212
212
compatible = "i2c-gpio";
213
213
sda-gpios = <&gpl0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
214
214
scl-gpios = <&gpl0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
220
220
/* WiFi model uses CM3323, 3G/LTE use CM36653 */
221
221
};
222
222
223
-
i2c_bl: i2c-gpio-5 {
223
+
i2c_bl: i2c-13 {
224
224
compatible = "i2c-gpio";
225
225
sda-gpios = <&gpm4 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
226
226
scl-gpios = <&gpm4 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+2
-2
arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi
+2
-2
arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi
···
53
53
enable-active-high;
54
54
};
55
55
56
-
i2c_ak8975: i2c-gpio-0 {
56
+
i2c_ak8975: i2c-13 {
57
57
compatible = "i2c-gpio";
58
58
sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
59
59
scl-gpios = <&gpy2 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
68
68
};
69
69
};
70
70
71
-
i2c_cm36651: i2c-gpio-2 {
71
+
i2c_cm36651: i2c-14 {
72
72
compatible = "i2c-gpio";
73
73
sda-gpios = <&gpf0 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
74
74
scl-gpios = <&gpf0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+4
-4
arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
+4
-4
arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
···
166
166
};
167
167
};
168
168
169
-
i2c_max77693: i2c-gpio-1 {
169
+
i2c_max77693: i2c-9 {
170
170
compatible = "i2c-gpio";
171
171
sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
172
172
scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
246
246
};
247
247
};
248
248
249
-
i2c_max77693_fuel: i2c-gpio-3 {
249
+
i2c_max77693_fuel: i2c-10 {
250
250
compatible = "i2c-gpio";
251
251
sda-gpios = <&gpf1 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
252
252
scl-gpios = <&gpf1 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
267
267
};
268
268
};
269
269
270
-
i2c-gpio-4 {
270
+
i2c-11 {
271
271
compatible = "i2c-gpio";
272
272
sda-gpios = <&gpl0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
273
273
scl-gpios = <&gpl0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
286
286
};
287
287
};
288
288
289
-
i2c-mhl {
289
+
i2c-12 {
290
290
compatible = "i2c-gpio";
291
291
sda-gpios = <&gpf0 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
292
292
scl-gpios = <&gpf0 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+4
-4
arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
+4
-4
arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
···
140
140
constant-charge-voltage-max-microvolt = <4200000>;
141
141
};
142
142
143
-
i2c-gpio-1 {
143
+
i2c-9 {
144
144
compatible = "i2c-gpio";
145
145
sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
146
146
scl-gpios = <&gpy2 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
158
158
};
159
159
};
160
160
161
-
i2c-gpio-2 {
161
+
i2c-10 {
162
162
compatible = "i2c-gpio";
163
163
sda-gpios = <&gpy0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
164
164
scl-gpios = <&gpy0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
179
179
};
180
180
};
181
181
182
-
i2c-gpio-3 {
182
+
i2c-11 {
183
183
compatible = "i2c-gpio";
184
184
sda-gpios = <&gpm4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
185
185
scl-gpios = <&gpm4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
207
207
};
208
208
};
209
209
210
-
i2c-gpio-4 {
210
+
i2c-12 {
211
211
compatible = "i2c-gpio";
212
212
sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
213
213
scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+1
-1
arch/arm/boot/dts/samsung/s5pv210-aquila.dts
+1
-1
arch/arm/boot/dts/samsung/s5pv210-aquila.dts
+8
-8
arch/arm/boot/dts/samsung/s5pv210-aries.dtsi
+8
-8
arch/arm/boot/dts/samsung/s5pv210-aries.dtsi
···
102
102
power-off-delay-us = <500>;
103
103
};
104
104
105
-
i2c_sound: i2c-gpio-0 {
105
+
i2c_sound: i2c-3 {
106
106
compatible = "i2c-gpio";
107
107
sda-gpios = <&mp05 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
108
108
scl-gpios = <&mp05 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
150
150
};
151
151
};
152
152
153
-
i2c_accel: i2c-gpio-1 {
153
+
i2c_accel: i2c-4 {
154
154
compatible = "i2c-gpio";
155
155
sda-gpios = <&gpj3 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
156
156
scl-gpios = <&gpj3 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
170
170
};
171
171
};
172
172
173
-
i2c_pmic: i2c-gpio-2 {
173
+
i2c_pmic: i2c-5 {
174
174
compatible = "i2c-gpio";
175
175
sda-gpios = <&gpj4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
176
176
scl-gpios = <&gpj4 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
420
420
};
421
421
};
422
422
423
-
i2c_musb: i2c-gpio-3 {
423
+
i2c_musb: i2c-6 {
424
424
compatible = "i2c-gpio";
425
425
sda-gpios = <&gpj3 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
426
426
scl-gpios = <&gpj3 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
442
442
};
443
443
};
444
444
445
-
i2c_fuel: i2c-gpio-4 {
445
+
i2c_fuel: i2c-7 {
446
446
compatible = "i2c-gpio";
447
447
sda-gpios = <&mp05 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
448
448
scl-gpios = <&mp05 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
459
459
};
460
460
};
461
461
462
-
i2c_touchkey: i2c-gpio-5 {
462
+
i2c_touchkey: i2c-8 {
463
463
compatible = "i2c-gpio";
464
464
sda-gpios = <&gpj3 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
465
465
scl-gpios = <&gpj3 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
485
485
};
486
486
};
487
487
488
-
i2c_prox: i2c-gpio-6 {
488
+
i2c_prox: i2c-9 {
489
489
compatible = "i2c-gpio";
490
490
sda-gpios = <&gpg2 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
491
491
scl-gpios = <&gpg0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
···
513
513
};
514
514
};
515
515
516
-
i2c_magnetometer: i2c-gpio-7 {
516
+
i2c_magnetometer: i2c-10 {
517
517
compatible = "i2c-gpio";
518
518
sda-gpios = <&gpj0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
519
519
scl-gpios = <&gpj0 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+1
-1
arch/arm/boot/dts/samsung/s5pv210-galaxys.dts
+1
-1
arch/arm/boot/dts/samsung/s5pv210-galaxys.dts