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
Unified · Split
| @@ -33,24 +33,40 @@ properties: · 32 unmodified lines | ||
| 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 |
| 53 | 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 | |
| 69 | + | |
| 54 | 70 | # See ./video-interfaces.txt for details |
| 55 | 71 | port: |
| 56 | 72 | type: object |
| @@ -347,6 +347,7 @@ examples: · 346 unmodified lines | ||
| 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 { |
| @@ -363,20 +364,23 @@ examples: · 10 unmodified lines | ||
| 363 | 364 | timing-0 { |
| 364 | 365 | clock-frequency = <12750000>; |
| 365 | 366 | |
| 366 | − nvidia,emc-zcal-cnt-long = <0x00000042>; | |
| 367 | − nvidia,emc-auto-cal-interval = <0x001fffff>; | |
| 368 | − nvidia,emc-ctt-term-ctrl = <0x00000802>; | |
| 369 | − nvidia,emc-cfg = <0x73240000>; | |
| 370 | − nvidia,emc-cfg-2 = <0x000008c5>; | |
| 371 | − nvidia,emc-sel-dpd-ctrl = <0x00040128>; | |
| 372 | − nvidia,emc-bgbias-ctl0 = <0x00000008>; | |
| 373 | 367 | nvidia,emc-auto-cal-config = <0xa1430000>; |
| 374 | 368 | nvidia,emc-auto-cal-config2 = <0x00000000>; |
| 375 | 369 | nvidia,emc-auto-cal-config3 = <0x00000000>; |
| 376 | − nvidia,emc-mode-reset = <0x80001221>; | |
| 370 | + nvidia,emc-auto-cal-interval = <0x001fffff>; | |
| 371 | + nvidia,emc-bgbias-ctl0 = <0x00000008>; | |
| 372 | + nvidia,emc-cfg = <0x73240000>; | |
| 373 | + nvidia,emc-cfg-2 = <0x000008c5>; | |
| 374 | + nvidia,emc-ctt-term-ctrl = <0x00000802>; | |
| 377 | 375 | nvidia,emc-mode-1 = <0x80100003>; |
| 378 | 376 | nvidia,emc-mode-2 = <0x80200008>; |
| 379 | 377 | nvidia,emc-mode-4 = <0x00000000>; |
| 378 | + nvidia,emc-mode-reset = <0x80001221>; | |
| 379 | + nvidia,emc-mrs-wait-cnt = <0x000e000e>; | |
| 380 | + nvidia,emc-sel-dpd-ctrl = <0x00040128>; | |
| 381 | + nvidia,emc-xm2dqspadctrl2 = <0x0130b118>; | |
| 382 | + nvidia,emc-zcal-cnt-long = <0x00000042>; | |
| 383 | + nvidia,emc-zcal-interval = <0x00000000>; | |
| 380 | 384 | |
| 381 | 385 | nvidia,emc-configuration = < |
| 382 | 386 | 0x00000000 /* EMC_RC */ |
| @@ -124,7 +124,7 @@ not every application needs SDIO irq, e.g. MMC cards. · 123 unmodified lines | ||
| 124 | 124 | pinctrl-1 = <&mmc1_idle>; |
| 125 | 125 | pinctrl-2 = <&mmc1_sleep>; |
| 126 | 126 | ... |
| 127 | − interrupts-extended = <&intc 64 &gpio2 28 GPIO_ACTIVE_LOW>; | |
| 127 | + interrupts-extended = <&intc 64 &gpio2 28 IRQ_TYPE_LEVEL_LOW>; | |
| 128 | 128 | }; |
| 129 | 129 | |
| 130 | 130 | mmc1_idle : pinmux_cirq_pin { |
| @@ -56,7 +56,6 @@ patternProperties: · 55 unmodified lines | ||
| 56 | 56 | examples: |
| 57 | 57 | - | |
| 58 | 58 | davinci_mdio: mdio@5c030000 { |
| 59 | − compatible = "ti,davinci_mdio"; | |
| 60 | 59 | reg = <0x5c030000 0x1000>; |
| 61 | 60 | #address-cells = <1>; |
| 62 | 61 | #size-cells = <0>; |