Skip to content

Commit ad6d5af

Browse files
arndbarndb
committed
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>
2 parents 43af11e + a24cd2f commit ad6d5af

11 files changed

Lines changed: 31 additions & 31 deletions

‎arch/arm/boot/dts/samsung/exynos3250-monk.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
enable-active-high;
5757
};
5858

59-
i2c_max77836: i2c-gpio-0 {
59+
i2c_max77836: i2c-8 {
6060
compatible = "i2c-gpio";
6161
sda-gpios = <&gpd0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
6262
scl-gpios = <&gpd0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

‎arch/arm/boot/dts/samsung/exynos3250-rinato.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
reset-gpios = <&gpe0 4 GPIO_ACTIVE_LOW>;
5959
};
6060

61-
i2c_max77836: i2c-gpio-0 {
61+
i2c_max77836: i2c-8 {
6262
compatible = "i2c-gpio";
6363
sda-gpios = <&gpd0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
6464
scl-gpios = <&gpd0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

‎arch/arm/boot/dts/samsung/exynos4210-i9100.dts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
reset-gpios = <&gpl1 2 GPIO_ACTIVE_LOW>;
131131
};
132132

133-
i2c_max17042_fuel: i2c-gpio-0 {
133+
i2c_max17042_fuel: i2c-9 {
134134
compatible = "i2c-gpio";
135135
#address-cells = <1>;
136136
#size-cells = <0>;
@@ -154,7 +154,7 @@
154154
};
155155
};
156156

157-
i2c_s5k5baf: i2c-gpio-1 {
157+
i2c_s5k5baf: i2c-10 {
158158
compatible = "i2c-gpio";
159159
#address-cells = <1>;
160160
#size-cells = <0>;
@@ -184,7 +184,7 @@
184184
};
185185
};
186186

187-
i2c-gpio-2 {
187+
i2c-11 {
188188
compatible = "i2c-gpio";
189189
#address-cells = <1>;
190190
#size-cells = <0>;

‎arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
color = <LED_COLOR_ID_WHITE>;
124124
};
125125

126-
i2c_max77693: i2c-gpio-1 {
126+
i2c_max77693: i2c-9 {
127127
compatible = "i2c-gpio";
128128
sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
129129
scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -169,7 +169,7 @@
169169
};
170170
};
171171

172-
i2c_max77693_fuel: i2c-gpio-2 {
172+
i2c_max77693_fuel: i2c-10 {
173173
compatible = "i2c-gpio";
174174
sda-gpios = <&gpy0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
175175
scl-gpios = <&gpy0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -190,7 +190,7 @@
190190
};
191191
};
192192

193-
i2c_magnetometer: i2c-gpio-3 {
193+
i2c_magnetometer: i2c-11 {
194194
compatible = "i2c-gpio";
195195
sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
196196
scl-gpios = <&gpy2 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -208,7 +208,7 @@
208208
};
209209
};
210210

211-
i2c_lightsensor: i2c-gpio-4 {
211+
i2c_lightsensor: i2c-12 {
212212
compatible = "i2c-gpio";
213213
sda-gpios = <&gpl0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
214214
scl-gpios = <&gpl0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -220,7 +220,7 @@
220220
/* WiFi model uses CM3323, 3G/LTE use CM36653 */
221221
};
222222

223-
i2c_bl: i2c-gpio-5 {
223+
i2c_bl: i2c-13 {
224224
compatible = "i2c-gpio";
225225
sda-gpios = <&gpm4 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
226226
scl-gpios = <&gpm4 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

‎arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
enable-active-high;
5454
};
5555

56-
i2c_ak8975: i2c-gpio-0 {
56+
i2c_ak8975: i2c-13 {
5757
compatible = "i2c-gpio";
5858
sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
5959
scl-gpios = <&gpy2 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -68,7 +68,7 @@
6868
};
6969
};
7070

71-
i2c_cm36651: i2c-gpio-2 {
71+
i2c_cm36651: i2c-14 {
7272
compatible = "i2c-gpio";
7373
sda-gpios = <&gpf0 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
7474
scl-gpios = <&gpf0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

‎arch/arm/boot/dts/samsung/exynos4412-midas.dtsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
};
167167
};
168168

169-
i2c_max77693: i2c-gpio-1 {
169+
i2c_max77693: i2c-9 {
170170
compatible = "i2c-gpio";
171171
sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
172172
scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -246,7 +246,7 @@
246246
};
247247
};
248248

249-
i2c_max77693_fuel: i2c-gpio-3 {
249+
i2c_max77693_fuel: i2c-10 {
250250
compatible = "i2c-gpio";
251251
sda-gpios = <&gpf1 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
252252
scl-gpios = <&gpf1 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -267,7 +267,7 @@
267267
};
268268
};
269269

270-
i2c-gpio-4 {
270+
i2c-11 {
271271
compatible = "i2c-gpio";
272272
sda-gpios = <&gpl0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
273273
scl-gpios = <&gpl0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -286,7 +286,7 @@
286286
};
287287
};
288288

289-
i2c-mhl {
289+
i2c-12 {
290290
compatible = "i2c-gpio";
291291
sda-gpios = <&gpf0 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
292292
scl-gpios = <&gpf0 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

‎arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
constant-charge-voltage-max-microvolt = <4200000>;
141141
};
142142

143-
i2c-gpio-1 {
143+
i2c-9 {
144144
compatible = "i2c-gpio";
145145
sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
146146
scl-gpios = <&gpy2 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -158,7 +158,7 @@
158158
};
159159
};
160160

161-
i2c-gpio-2 {
161+
i2c-10 {
162162
compatible = "i2c-gpio";
163163
sda-gpios = <&gpy0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
164164
scl-gpios = <&gpy0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -179,7 +179,7 @@
179179
};
180180
};
181181

182-
i2c-gpio-3 {
182+
i2c-11 {
183183
compatible = "i2c-gpio";
184184
sda-gpios = <&gpm4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
185185
scl-gpios = <&gpm4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -207,7 +207,7 @@
207207
};
208208
};
209209

210-
i2c-gpio-4 {
210+
i2c-12 {
211211
compatible = "i2c-gpio";
212212
sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
213213
scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

‎arch/arm/boot/dts/samsung/s5pv210-aquila.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
regulator-max-microvolt = <3700000>;
6363
};
6464

65-
i2c_pmic: i2c-pmic {
65+
i2c_pmic: i2c-3 {
6666
compatible = "i2c-gpio";
6767
sda-gpios = <&gpj4 0 GPIO_ACTIVE_HIGH>;
6868
scl-gpios = <&gpj4 3 GPIO_ACTIVE_HIGH>;

‎arch/arm/boot/dts/samsung/s5pv210-aries.dtsi‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
power-off-delay-us = <500>;
103103
};
104104

105-
i2c_sound: i2c-gpio-0 {
105+
i2c_sound: i2c-3 {
106106
compatible = "i2c-gpio";
107107
sda-gpios = <&mp05 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
108108
scl-gpios = <&mp05 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -150,7 +150,7 @@
150150
};
151151
};
152152

153-
i2c_accel: i2c-gpio-1 {
153+
i2c_accel: i2c-4 {
154154
compatible = "i2c-gpio";
155155
sda-gpios = <&gpj3 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
156156
scl-gpios = <&gpj3 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -170,7 +170,7 @@
170170
};
171171
};
172172

173-
i2c_pmic: i2c-gpio-2 {
173+
i2c_pmic: i2c-5 {
174174
compatible = "i2c-gpio";
175175
sda-gpios = <&gpj4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
176176
scl-gpios = <&gpj4 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -420,7 +420,7 @@
420420
};
421421
};
422422

423-
i2c_musb: i2c-gpio-3 {
423+
i2c_musb: i2c-6 {
424424
compatible = "i2c-gpio";
425425
sda-gpios = <&gpj3 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
426426
scl-gpios = <&gpj3 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -442,7 +442,7 @@
442442
};
443443
};
444444

445-
i2c_fuel: i2c-gpio-4 {
445+
i2c_fuel: i2c-7 {
446446
compatible = "i2c-gpio";
447447
sda-gpios = <&mp05 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
448448
scl-gpios = <&mp05 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -459,7 +459,7 @@
459459
};
460460
};
461461

462-
i2c_touchkey: i2c-gpio-5 {
462+
i2c_touchkey: i2c-8 {
463463
compatible = "i2c-gpio";
464464
sda-gpios = <&gpj3 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
465465
scl-gpios = <&gpj3 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -485,7 +485,7 @@
485485
};
486486
};
487487

488-
i2c_prox: i2c-gpio-6 {
488+
i2c_prox: i2c-9 {
489489
compatible = "i2c-gpio";
490490
sda-gpios = <&gpg2 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
491491
scl-gpios = <&gpg0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -513,7 +513,7 @@
513513
};
514514
};
515515

516-
i2c_magnetometer: i2c-gpio-7 {
516+
i2c_magnetometer: i2c-10 {
517517
compatible = "i2c-gpio";
518518
sda-gpios = <&gpj0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
519519
scl-gpios = <&gpj0 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

‎arch/arm/boot/dts/samsung/s5pv210-galaxys.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
};
5252
};
5353

54-
i2c_fmradio: i2c-gpio-8 {
54+
i2c_fmradio: i2c-11 {
5555
compatible = "i2c-gpio";
5656
sda-gpios = <&gpd1 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
5757
scl-gpios = <&gpd1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

0 commit comments

Comments
 (0)