Unverified Commit e0427893 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10369 Backport 6.6.33-34 LTS patches from upstream 

Merge Pull Request from: @pigalsofine 
 
Backport 6.6.33-34 LTS patches from upstream 
 
Link:https://gitee.com/openeuler/kernel/pulls/10369

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents c9a2f58b 4e2197ac

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -3402,6 +3402,9 @@ 
			arch-independent options, each of which is an

			aggregation of existing arch-specific options.



			Note, "mitigations" is supported if and only if the

			kernel was built with CPU_MITIGATIONS=y.



			off

				Disable all optional CPU mitigations.  This

				improves system performance, but it may also

Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml

+10 −3
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ properties: 
  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  dmas:

    maxItems: 1
@@ -39,12 +42,16 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/phandle

    description:

      A reference to a the actual ADC to which this FPGA ADC interfaces to.

    deprecated: true



  '#io-backend-cells':

    const: 0



required:

  - compatible

  - dmas

  - reg

  - adi,adc-dev

  - clocks



additionalProperties: false
@@ -55,7 +62,7 @@ examples: 
        reg = <0x44a00000 0x10000>;

        dmas = <&rx_dma 0>;

        dma-names = "rx";



        adi,adc-dev = <&spi_adc>;

        clocks = <&axi_clk>;

        #io-backend-cells = <0>;

    };

...

Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml

+9 −9
Original line number Diff line number Diff line
@@ -37,15 +37,15 @@ properties: 
      active low.

    maxItems: 1



  dovdd-supply:

  DOVDD-supply:

    description:

      Definition of the regulator used as interface power supply.



  avdd-supply:

  AVDD-supply:

    description:

      Definition of the regulator used as analog power supply.



  dvdd-supply:

  DVDD-supply:

    description:

      Definition of the regulator used as digital power supply.
@@ -59,9 +59,9 @@ required: 
  - reg

  - clocks

  - clock-names

  - dovdd-supply

  - avdd-supply

  - dvdd-supply

  - DOVDD-supply

  - AVDD-supply

  - DVDD-supply

  - reset-gpios

  - port
@@ -82,9 +82,9 @@ examples: 
                clock-names = "xvclk";

                reset-gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;



                dovdd-supply = <&sw2_reg>;

                dvdd-supply = <&sw2_reg>;

                avdd-supply = <&reg_peri_3p15v>;

                DOVDD-supply = <&sw2_reg>;

                DVDD-supply = <&sw2_reg>;

                AVDD-supply = <&reg_peri_3p15v>;



                port {

                        ov2680_to_mipi: endpoint {

Documentation/devicetree/bindings/pci/rcar-pci-host.yaml

+14 −0
Original line number Diff line number Diff line
@@ -68,6 +68,18 @@ properties: 
  phy-names:

    const: pcie



  vpcie1v5-supply:

    description: The 1.5v regulator to use for PCIe.



  vpcie3v3-supply:

    description: The 3.3v regulator to use for PCIe.



  vpcie12v-supply:

    description: The 12v regulator to use for PCIe.



  iommu-map: true

  iommu-map-mask: true



required:

  - compatible

  - reg
@@ -121,5 +133,7 @@ examples: 
             clock-names = "pcie", "pcie_bus";

             power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;

             resets = <&cpg 319>;

             vpcie3v3-supply = <&pcie_3v3>;

             vpcie12v-supply = <&pcie_12v>;

         };

    };

Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie.yaml

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ properties: 
    description: This property is needed if using 24MHz OSC for RC's PHY.



  ep-gpios:

    maxItems: 1

    description: pre-reset GPIO



  vpcie12v-supply: