Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'devicetree-fixes-for-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes deom Rob Herring:
"A handful of fixes in DT bindings for MDIO bus, Allwinner CSI, OMAP
HSMMC, and Tegra124 EMC"
* tag 'devicetree-fixes-for-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: media: csi: Fix clocks description
dt-bindings: media: csi: Add interconnects properties
dt-bindings: net: mdio: remove compatible string from example
dt-bindings: memory-controller: Update example for Tegra124 EMC
dt-bindings: mmc: omap-hsmmc: Fix SDIO interrupt
+41
-22
+28
-12
Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
+28
-12
Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
···
33
33
maxItems: 1
34
34
35
35
clocks:
36
-
minItems: 2
37
-
maxItems: 3
38
-
items:
39
-
- description: The CSI interface clock
40
-
- description: The CSI ISP clock
41
-
- description: The CSI DRAM clock
36
+
oneOf:
37
+
- items:
38
+
- description: The CSI interface clock
39
+
- description: The CSI DRAM clock
40
+
41
+
- items:
42
+
- description: The CSI interface clock
43
+
- description: The CSI ISP clock
44
+
- description: The CSI DRAM clock
42
45
43
46
clock-names:
44
-
minItems: 2
45
-
maxItems: 3
46
-
items:
47
-
- const: bus
48
-
- const: isp
49
-
- const: ram
47
+
oneOf:
48
+
- items:
49
+
- const: bus
50
+
- const: ram
51
+
52
+
- items:
53
+
- const: bus
54
+
- const: isp
55
+
- const: ram
50
56
51
57
resets:
52
58
maxItems: 1
59
+
60
+
# FIXME: This should be made required eventually once every SoC will
61
+
# have the MBUS declared.
62
+
interconnects:
63
+
maxItems: 1
64
+
65
+
# FIXME: This should be made required eventually once every SoC will
66
+
# have the MBUS declared.
67
+
interconnect-names:
68
+
const: dma-mem
53
69
54
70
# See ./video-interfaces.txt for details
55
71
port:
+12
-8
Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml
+12
-8
Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml
···
347
347
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
348
348
349
349
#iommu-cells = <1>;
350
+
#reset-cells = <1>;
350
351
};
351
352
352
353
external-memory-controller@7001b000 {
···
364
363
timing-0 {
365
364
clock-frequency = <12750000>;
366
365
367
-
nvidia,emc-zcal-cnt-long = <0x00000042>;
368
-
nvidia,emc-auto-cal-interval = <0x001fffff>;
369
-
nvidia,emc-ctt-term-ctrl = <0x00000802>;
370
-
nvidia,emc-cfg = <0x73240000>;
371
-
nvidia,emc-cfg-2 = <0x000008c5>;
372
-
nvidia,emc-sel-dpd-ctrl = <0x00040128>;
373
-
nvidia,emc-bgbias-ctl0 = <0x00000008>;
374
366
nvidia,emc-auto-cal-config = <0xa1430000>;
375
367
nvidia,emc-auto-cal-config2 = <0x00000000>;
376
368
nvidia,emc-auto-cal-config3 = <0x00000000>;
377
-
nvidia,emc-mode-reset = <0x80001221>;
369
+
nvidia,emc-auto-cal-interval = <0x001fffff>;
370
+
nvidia,emc-bgbias-ctl0 = <0x00000008>;
371
+
nvidia,emc-cfg = <0x73240000>;
372
+
nvidia,emc-cfg-2 = <0x000008c5>;
373
+
nvidia,emc-ctt-term-ctrl = <0x00000802>;
378
374
nvidia,emc-mode-1 = <0x80100003>;
379
375
nvidia,emc-mode-2 = <0x80200008>;
380
376
nvidia,emc-mode-4 = <0x00000000>;
377
+
nvidia,emc-mode-reset = <0x80001221>;
378
+
nvidia,emc-mrs-wait-cnt = <0x000e000e>;
379
+
nvidia,emc-sel-dpd-ctrl = <0x00040128>;
380
+
nvidia,emc-xm2dqspadctrl2 = <0x0130b118>;
381
+
nvidia,emc-zcal-cnt-long = <0x00000042>;
382
+
nvidia,emc-zcal-interval = <0x00000000>;
381
383
382
384
nvidia,emc-configuration = <
383
385
0x00000000 /* EMC_RC */
+1
-1
Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
+1
-1
Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt