Commit fea63021 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 591dd4c1 854bdbae

Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml

+28 −12
Original line number Diff line number Diff line
@@ -33,17 +33,23 @@ properties: 
    maxItems: 1



  clocks:

    minItems: 2

    maxItems: 3

    items:

    oneOf:

      - items:

        - description: The CSI interface clock

        - description: The CSI DRAM clock



      - items:

        - description: The CSI interface clock

        - description: The CSI ISP clock

        - description: The CSI DRAM clock



  clock-names:

    minItems: 2

    maxItems: 3

    items:

    oneOf:

      - items:

        - const: bus

        - const: ram



      - items:

        - const: bus

        - const: isp

        - const: ram
@@ -51,6 +57,16 @@ properties: 
  resets:

    maxItems: 1



  # FIXME: This should be made required eventually once every SoC will

  # have the MBUS declared.

  interconnects:

    maxItems: 1



  # FIXME: This should be made required eventually once every SoC will

  # have the MBUS declared.

  interconnect-names:

    const: dma-mem



  # See ./video-interfaces.txt for details

  port:

    type: object

Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml

+12 −8
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ examples: 
        interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;



        #iommu-cells = <1>;

        #reset-cells = <1>;

    };



    external-memory-controller@7001b000 {
@@ -363,20 +364,23 @@ examples: 
            timing-0 {

                clock-frequency = <12750000>;



                nvidia,emc-zcal-cnt-long = <0x00000042>;

                nvidia,emc-auto-cal-interval = <0x001fffff>;

                nvidia,emc-ctt-term-ctrl = <0x00000802>;

                nvidia,emc-cfg = <0x73240000>;

                nvidia,emc-cfg-2 = <0x000008c5>;

                nvidia,emc-sel-dpd-ctrl = <0x00040128>;

                nvidia,emc-bgbias-ctl0 = <0x00000008>;

                nvidia,emc-auto-cal-config = <0xa1430000>;

                nvidia,emc-auto-cal-config2 = <0x00000000>;

                nvidia,emc-auto-cal-config3 = <0x00000000>;

                nvidia,emc-mode-reset = <0x80001221>;

                nvidia,emc-auto-cal-interval = <0x001fffff>;

                nvidia,emc-bgbias-ctl0 = <0x00000008>;

                nvidia,emc-cfg = <0x73240000>;

                nvidia,emc-cfg-2 = <0x000008c5>;

                nvidia,emc-ctt-term-ctrl = <0x00000802>;

                nvidia,emc-mode-1 = <0x80100003>;

                nvidia,emc-mode-2 = <0x80200008>;

                nvidia,emc-mode-4 = <0x00000000>;

                nvidia,emc-mode-reset = <0x80001221>;

                nvidia,emc-mrs-wait-cnt = <0x000e000e>;

                nvidia,emc-sel-dpd-ctrl = <0x00040128>;

                nvidia,emc-xm2dqspadctrl2 = <0x0130b118>;

                nvidia,emc-zcal-cnt-long = <0x00000042>;

                nvidia,emc-zcal-interval = <0x00000000>;



                nvidia,emc-configuration = <

                    0x00000000 /* EMC_RC */

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ not every application needs SDIO irq, e.g. MMC cards. 
		pinctrl-1 = <&mmc1_idle>;

		pinctrl-2 = <&mmc1_sleep>;

		...

		interrupts-extended = <&intc 64 &gpio2 28 GPIO_ACTIVE_LOW>;

		interrupts-extended = <&intc 64 &gpio2 28 IRQ_TYPE_LEVEL_LOW>;

	};



	mmc1_idle : pinmux_cirq_pin {

Documentation/devicetree/bindings/net/mdio.yaml

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ patternProperties: 
examples:

  - |

    davinci_mdio: mdio@5c030000 {

        compatible = "ti,davinci_mdio";

        reg = <0x5c030000 0x1000>;

        #address-cells = <1>;

        #size-cells = <0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE