Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'samsung-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt
Samsung DTS ARM changes for v5.19
1. Several DT schema related changes to make DTBs passing schema checks:
EHCI/OHCI/DMA/Ethernet node names, DMA channels order, USB-like
compatibles.
2. Add specific compatibles to Multi Core Timer to allow stricter DT
schema matching.
3. Cleanup from deprecated bindings:
- Remove deprecated unit-address workaround for Exynos5422 Odroid XU3
LPDDR3 memory timings.
- Do not use unit-address (and SFR region) in Exynos5250 MIPI phy in
favor of syscon node (unit-address deprecated in 2016).
- Use standard generic PHYs for EHCI/OHCI device in S5PV210.
4. Fix inverted SPI CS (thus blank panel) on S5PV210 Aries boards.
5. Correct Bluetooth interupt name on S5PV210 Aries boards.
* tag 'samsung-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: dts: s5pv210: align DMA channels with dtschema
ARM: dts: s5pv210: Adjust DMA node names to match spec
ARM: dts: s5pv210: Adjust memory reg entries to match spec
ARM: dts: s5pv210: Correct interrupt name for bluetooth in Aries
ARM: dts: s5pv210: Remove spi-cs-high on panel in Aries
ARM: dts: s5pv210: Use standard arrays of generic PHYs for EHCI/OHCI device
ARM: dts: s5pv210: align EHCI/OHCI nodes with dtschema
ARM: dts: exynos: align EHCI/OHCI nodes with dtschema on Exynos4
ARM: dts: exynos: drop deprecated SFR region from MIPI phy
ARM: dts: exynos: add a specific compatible to MCT
ARM: dts: exynos: remove deprecated unit address for LPDDR3 timings on Odroid
ARM: dts: exynos: fix compatible strings for Ethernet USB devices
ARM: dts: exynos: fix ethernet node name for different odroid boards
Link: https://lore.kernel.org/r/20220420072152.11696-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+52
-64
+2
-1
arch/arm/boot/dts/exynos3250.dtsi
+2
-1
arch/arm/boot/dts/exynos3250.dtsi
···
269
269
};
270
270
271
271
timer@10050000 {
272
-
compatible = "samsung,exynos4210-mct";
272
+
compatible = "samsung,exynos3250-mct",
273
+
"samsung,exynos4210-mct";
273
274
reg = <0x10050000 0x800>;
274
275
interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
275
276
<GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
+2
-2
arch/arm/boot/dts/exynos4.dtsi
+2
-2
arch/arm/boot/dts/exynos4.dtsi
···
373
373
status = "disabled";
374
374
};
375
375
376
-
ehci: ehci@12580000 {
376
+
ehci: usb@12580000 {
377
377
compatible = "samsung,exynos4210-ehci";
378
378
reg = <0x12580000 0x100>;
379
379
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
···
384
384
phy-names = "host", "hsic0", "hsic1";
385
385
};
386
386
387
-
ohci: ohci@12590000 {
387
+
ohci: usb@12590000 {
388
388
compatible = "samsung,exynos4210-ohci";
389
389
reg = <0x12590000 0x100>;
390
390
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
+2
-2
arch/arm/boot/dts/exynos4412-odroidu3.dts
+2
-2
arch/arm/boot/dts/exynos4412-odroidu3.dts
···
119
119
phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>;
120
120
phy-names = "hsic0", "hsic1";
121
121
122
-
ethernet: usbether@2 {
123
-
compatible = "usb0424,9730";
122
+
ethernet: ethernet@2 {
123
+
compatible = "usb424,9730";
124
124
reg = <2>;
125
125
local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
126
126
};
+4
-4
arch/arm/boot/dts/exynos4412-odroidx.dts
+4
-4
arch/arm/boot/dts/exynos4412-odroidx.dts
···
70
70
phy-names = "hsic0";
71
71
72
72
hub@2 {
73
-
compatible = "usb0424,3503";
73
+
compatible = "usb424,3503";
74
74
reg = <2>;
75
75
#address-cells = <1>;
76
76
#size-cells = <0>;
77
77
78
78
hub@1 {
79
-
compatible = "usb0424,9514";
79
+
compatible = "usb424,9514";
80
80
reg = <1>;
81
81
#address-cells = <1>;
82
82
#size-cells = <0>;
83
83
84
-
ethernet: usbether@1 {
85
-
compatible = "usb0424,ec00";
84
+
ethernet: ethernet@1 {
85
+
compatible = "usb424,ec00";
86
86
reg = <1>;
87
87
/* Filled in by a bootloader */
88
88
local-mac-address = [00 00 00 00 00 00];
+4
-4
arch/arm/boot/dts/exynos5250.dtsi
+4
-4
arch/arm/boot/dts/exynos5250.dtsi
···
245
245
};
246
246
247
247
timer@101c0000 {
248
-
compatible = "samsung,exynos4210-mct";
248
+
compatible = "samsung,exynos5250-mct",
249
+
"samsung,exynos4210-mct";
249
250
reg = <0x101C0000 0x800>;
250
251
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
251
252
clock-names = "fin_pll", "mct";
···
818
817
status = "disabled";
819
818
};
820
819
821
-
dp_phy: video-phy {
820
+
dp_phy: video-phy-0 {
822
821
compatible = "samsung,exynos5250-dp-video-phy";
823
822
samsung,pmu-syscon = <&pmu_system_controller>;
824
823
#phy-cells = <0>;
825
824
};
826
825
827
-
mipi_phy: video-phy@10040710 {
826
+
mipi_phy: video-phy-1 {
828
827
compatible = "samsung,s5pv210-mipi-video-phy";
829
-
reg = <0x10040710 0x100>;
830
828
#phy-cells = <1>;
831
829
syscon = <&pmu_system_controller>;
832
830
};
+2
-1
arch/arm/boot/dts/exynos5260.dtsi
+2
-1
arch/arm/boot/dts/exynos5260.dtsi
···
333
333
};
334
334
335
335
mct: timer@100b0000 {
336
-
compatible = "samsung,exynos4210-mct";
336
+
compatible = "samsung,exynos5260-mct",
337
+
"samsung,exynos4210-mct";
337
338
reg = <0x100B0000 0x1000>;
338
339
clocks = <&fin_pll>, <&clock_peri PERI_CLK_MCT>;
339
340
clock-names = "fin_pll", "mct";
+2
-2
arch/arm/boot/dts/exynos5410-odroidxu.dts
+2
-2
arch/arm/boot/dts/exynos5410-odroidxu.dts
···
655
655
#address-cells = <1>;
656
656
#size-cells = <0>;
657
657
658
-
ethernet: usbether@2 {
659
-
compatible = "usb0424,9730";
658
+
ethernet: ethernet@2 {
659
+
compatible = "usb424,9730";
660
660
reg = <2>;
661
661
local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
662
662
};
+2
-5
arch/arm/boot/dts/exynos5422-odroid-core.dtsi
+2
-5
arch/arm/boot/dts/exynos5422-odroid-core.dtsi
···
333
333
compatible = "samsung,K3QF2F20DB", "jedec,lpddr3";
334
334
density = <16384>;
335
335
io-width = <32>;
336
-
#address-cells = <1>;
337
-
#size-cells = <0>;
338
336
339
337
tRFC-min-tck = <17>;
340
338
tRRD-min-tck = <2>;
···
356
358
tCKESR-min-tck = <2>;
357
359
tMRD-min-tck = <5>;
358
360
359
-
timings_samsung_K3QF2F20DB_800mhz: timings@800000000 {
361
+
timings_samsung_K3QF2F20DB_800mhz: timings {
360
362
compatible = "jedec,lpddr3-timings";
361
-
/* workaround: 'reg' shows max-freq */
362
-
reg = <800000000>;
363
+
max-freq = <800000000>;
363
364
min-freq = <100000000>;
364
365
tRFC = <65000>;
365
366
tRRD = <6000>;
+3
-3
arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts
+3
-3
arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts
···
113
113
#size-cells = <0>;
114
114
115
115
hub@1 {
116
-
compatible = "usb0424,9514";
116
+
compatible = "usb424,9514";
117
117
reg = <1>;
118
118
#address-cells = <1>;
119
119
#size-cells = <0>;
120
120
121
-
ethernet: usbether@1 {
122
-
compatible = "usb0424,ec00";
121
+
ethernet: ethernet@1 {
122
+
compatible = "usb424,ec00";
123
123
reg = <1>;
124
124
local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
125
125
};
+3
-3
arch/arm/boot/dts/exynos5422-odroidxu3.dts
+3
-3
arch/arm/boot/dts/exynos5422-odroidxu3.dts
···
80
80
#size-cells = <0>;
81
81
82
82
hub@1 {
83
-
compatible = "usb0424,9514";
83
+
compatible = "usb424,9514";
84
84
reg = <1>;
85
85
#address-cells = <1>;
86
86
#size-cells = <0>;
87
87
88
-
ethernet: usbether@1 {
89
-
compatible = "usb0424,ec00";
88
+
ethernet: ethernet@1 {
89
+
compatible = "usb424,ec00";
90
90
reg = <1>;
91
91
local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
92
92
};
+2
-1
arch/arm/boot/dts/exynos54xx.dtsi
+2
-1
arch/arm/boot/dts/exynos54xx.dtsi
+1
-2
arch/arm/boot/dts/s5pv210-aquila.dts
+1
-2
arch/arm/boot/dts/s5pv210-aquila.dts
+5
-6
arch/arm/boot/dts/s5pv210-aries.dtsi
+5
-6
arch/arm/boot/dts/s5pv210-aries.dtsi
···
24
24
25
25
memory@30000000 {
26
26
device_type = "memory";
27
-
reg = <0x30000000 0x05000000
28
-
0x40000000 0x10000000
29
-
0x50000000 0x08000000>;
27
+
reg = <0x30000000 0x05000000>,
28
+
<0x40000000 0x10000000>,
29
+
<0x50000000 0x08000000>;
30
30
};
31
31
32
32
reserved-memory {
···
564
564
reset-gpios = <&mp05 5 GPIO_ACTIVE_LOW>;
565
565
vdd3-supply = <&ldo7_reg>;
566
566
vci-supply = <&ldo17_reg>;
567
-
spi-cs-high;
568
567
spi-max-frequency = <1200000>;
569
568
570
569
pinctrl-names = "default";
···
635
636
};
636
637
637
638
&i2s0 {
638
-
dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
639
+
dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
639
640
status = "okay";
640
641
};
641
642
···
894
895
device-wakeup-gpios = <&gpg3 4 GPIO_ACTIVE_HIGH>;
895
896
interrupt-parent = <&gph2>;
896
897
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
897
-
interrupt-names = "host-wake";
898
+
interrupt-names = "host-wakeup";
898
899
};
899
900
};
900
901
+3
-3
arch/arm/boot/dts/s5pv210-goni.dts
+3
-3
arch/arm/boot/dts/s5pv210-goni.dts
+15
-25
arch/arm/boot/dts/s5pv210.dtsi
+15
-25
arch/arm/boot/dts/s5pv210.dtsi
···
117
117
};
118
118
};
119
119
120
-
pdma0: dma@e0900000 {
120
+
pdma0: dma-controller@e0900000 {
121
121
compatible = "arm,pl330", "arm,primecell";
122
122
reg = <0xe0900000 0x1000>;
123
123
interrupt-parent = <&vic0>;
···
129
129
#dma-requests = <32>;
130
130
};
131
131
132
-
pdma1: dma@e0a00000 {
132
+
pdma1: dma-controller@e0a00000 {
133
133
compatible = "arm,pl330", "arm,primecell";
134
134
reg = <0xe0a00000 0x1000>;
135
135
interrupt-parent = <&vic0>;
···
239
239
reg = <0xeee30000 0x1000>;
240
240
interrupt-parent = <&vic2>;
241
241
interrupts = <16>;
242
-
dma-names = "rx", "tx", "tx-sec";
243
-
dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
242
+
dma-names = "tx", "rx", "tx-sec";
243
+
dmas = <&pdma1 10>, <&pdma1 9>, <&pdma1 11>;
244
244
clock-names = "iis",
245
245
"i2s_opclk0",
246
246
"i2s_opclk1";
···
259
259
reg = <0xe2100000 0x1000>;
260
260
interrupt-parent = <&vic2>;
261
261
interrupts = <17>;
262
-
dma-names = "rx", "tx";
263
-
dmas = <&pdma1 12>, <&pdma1 13>;
262
+
dma-names = "tx", "rx";
263
+
dmas = <&pdma1 13>, <&pdma1 12>;
264
264
clock-names = "iis", "i2s_opclk0";
265
265
clocks = <&clocks CLK_I2S1>, <&clocks SCLK_AUDIO1>;
266
266
pinctrl-names = "default";
···
274
274
reg = <0xe2a00000 0x1000>;
275
275
interrupt-parent = <&vic2>;
276
276
interrupts = <18>;
277
-
dma-names = "rx", "tx";
278
-
dmas = <&pdma1 14>, <&pdma1 15>;
277
+
dma-names = "tx", "rx";
278
+
dmas = <&pdma1 15>, <&pdma1 14>;
279
279
clock-names = "iis", "i2s_opclk0";
280
280
clocks = <&clocks CLK_I2S2>, <&clocks SCLK_AUDIO2>;
281
281
pinctrl-names = "default";
···
427
427
status = "disabled";
428
428
};
429
429
430
-
ehci: ehci@ec200000 {
430
+
ehci: usb@ec200000 {
431
431
compatible = "samsung,exynos4210-ehci";
432
432
reg = <0xec200000 0x100>;
433
433
interrupts = <23>;
434
434
interrupt-parent = <&vic1>;
435
435
clocks = <&clocks CLK_USB_HOST>;
436
436
clock-names = "usbhost";
437
-
#address-cells = <1>;
438
-
#size-cells = <0>;
437
+
phys = <&usbphy 1>;
438
+
phy-names = "host";
439
439
status = "disabled";
440
-
441
-
port@0 {
442
-
reg = <0>;
443
-
phys = <&usbphy 1>;
444
-
};
445
440
};
446
441
447
-
ohci: ohci@ec300000 {
442
+
ohci: usb@ec300000 {
448
443
compatible = "samsung,exynos4210-ohci";
449
444
reg = <0xec300000 0x100>;
450
445
interrupts = <23>;
451
446
interrupt-parent = <&vic1>;
452
447
clocks = <&clocks CLK_USB_HOST>;
453
448
clock-names = "usbhost";
454
-
#address-cells = <1>;
455
-
#size-cells = <0>;
449
+
phys = <&usbphy 1>;
450
+
phy-names = "host";
456
451
status = "disabled";
457
-
458
-
port@0 {
459
-
reg = <0>;
460
-
phys = <&usbphy 1>;
461
-
};
462
452
};
463
453
464
454
mfc: codec@f1700000 {
···
518
528
clock-names = "sclk_fimg2d", "fimg2d";
519
529
};
520
530
521
-
mdma1: mdma@fa200000 {
531
+
mdma1: dma-controller@fa200000 {
522
532
compatible = "arm,pl330", "arm,primecell";
523
533
reg = <0xfa200000 0x1000>;
524
534
interrupt-parent = <&vic0>;