Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 777d062e authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'errata/tx2-219' into for-next/fixes 

Workaround for Cavium/Marvell ThunderX2 erratum #219.

* errata/tx2-219:
  arm64: Allow CAVIUM_TX2_ERRATUM_219 to be selected
  arm64: Avoid Cavium TX2 erratum 219 when switching TTBR
  arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT
  arm64: KVM: Trap VM ops when ARM64_WORKAROUND_CAVIUM_TX2_219_TVM is set
parents 597399d0 603afdc9

Documentation/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX2 SMMUv3| #126            | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX2 Core  | #219            | CAVIUM_TX2_ERRATUM_219      |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| Freescale/NXP  | LS2080A/LS1043A | A-008585        | FSL_ERRATUM_A008585         |

+----------------+-----------------+-----------------+-----------------------------+

Documentation/devicetree/bindings/dsp/fsl,dsp.yaml

+1 −0
Original line number Diff line number Diff line
@@ -85,4 +85,5 @@ examples: 
                        <&pd IMX_SC_R_DSP_RAM>;

        mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1";

        mboxes = <&lsio_mu13 2 0>, <&lsio_mu13 2 1>, <&lsio_mu13 3 0>, <&lsio_mu13 3 1>;

        memory-region = <&dsp_reserved>;

    };

Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml

+3 −4
Original line number Diff line number Diff line
@@ -43,13 +43,9 @@ properties: 


  dvdd-supply:

    description: DVdd voltage supply

    items:

      - const: dvdd



  avdd-supply:

    description: AVdd voltage supply

    items:

      - const: avdd



  adi,rejection-60-Hz-enable:

    description: |
@@ -99,6 +95,9 @@ required: 
examples:

  - |

    spi0 {

      #address-cells = <1>;

      #size-cells = <0>;



      adc@0 {

        compatible = "adi,ad7192";

        reg = <0>;

Documentation/devicetree/bindings/media/rc.yaml

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ properties: 
          - rc-genius-tvgo-a11mce

          - rc-gotview7135

          - rc-hauppauge

          - rc-hauppauge

          - rc-hisi-poplar

          - rc-hisi-tv-demo

          - rc-imon-mce

Documentation/devicetree/bindings/phy/lantiq,vrx200-pcie-phy.yaml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ properties: 
      - description: exclusive PHY reset line

      - description: shared reset line between the PCIe PHY and PCIe controller



  resets-names:

  reset-names:

    items:

      - const: phy

      - const: pcie