Commit c7419a6e authored by Borislav Petkov's avatar Borislav Petkov
Browse files

Merge branch x86/cc into x86/core 



Pick up dependent cc_platform_has() changes.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parents 7fae4c24 e9d1d2bb

Documentation/admin-guide/README.rst

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ Configuring the kernel 
Compiling the kernel

--------------------



 - Make sure you have at least gcc 4.9 available.

 - Make sure you have at least gcc 5.1 available.

   For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.



   Please note that you can still run a.out user programs with this kernel.

Documentation/core-api/irq/irq-domain.rst

+3 −2
Original line number Diff line number Diff line
@@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that 
case the Linux IRQ numbers cannot be dynamically assigned and the legacy

mapping should be used.



As the name implies, the *_legacy() functions are deprecated and only

As the name implies, the \*_legacy() functions are deprecated and only

exist to ease the support of ancient platforms. No new users should be

added.

added. Same goes for the \*_simple() functions when their use results

in the legacy behaviour.



The legacy map assumes a contiguous range of IRQ numbers has already

been allocated for the controller and that the IRQ number can be

Documentation/devicetree/bindings/arm/tegra.yaml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ properties: 
          - const: toradex,apalis_t30

          - const: nvidia,tegra30

      - items:

          - const: toradex,apalis_t30-eval-v1.1

          - const: toradex,apalis_t30-v1.1-eval

          - const: toradex,apalis_t30-eval

          - const: toradex,apalis_t30-v1.1

          - const: toradex,apalis_t30

Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ function block. 


All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.

For a description of the MMSYS_CONFIG binding, see

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt.

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.



DISP function blocks

====================

Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml

+42 −4
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ properties: 


  clocks:

    minItems: 1

    maxItems: 3

    maxItems: 7



  clock-names:

    minItems: 1

    maxItems: 3

    maxItems: 7



required:

  - compatible
@@ -72,6 +72,32 @@ allOf: 
          contains:

            enum:

              - qcom,sdm660-a2noc

    then:

      properties:

        clocks:

          items:

            - description: Bus Clock.

            - description: Bus A Clock.

            - description: IPA Clock.

            - description: UFS AXI Clock.

            - description: Aggregate2 UFS AXI Clock.

            - description: Aggregate2 USB3 AXI Clock.

            - description: Config NoC USB2 AXI Clock.

        clock-names:

          items:

            - const: bus

            - const: bus_a

            - const: ipa

            - const: ufs_axi

            - const: aggre2_ufs_axi

            - const: aggre2_usb3_axi

            - const: cfg_noc_usb2_axi



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdm660-bimc

              - qcom,sdm660-cnoc

              - qcom,sdm660-gnoc
@@ -91,6 +117,7 @@ examples: 
  - |

      #include <dt-bindings/clock/qcom,rpmcc.h>

      #include <dt-bindings/clock/qcom,mmcc-sdm660.h>

      #include <dt-bindings/clock/qcom,gcc-sdm660.h>



      bimc: interconnect@1008000 {

              compatible = "qcom,sdm660-bimc";
@@ -123,9 +150,20 @@ examples: 
              compatible = "qcom,sdm660-a2noc";

              reg = <0x01704000 0xc100>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clock-names = "bus",

                            "bus_a",

                            "ipa",

                            "ufs_axi",

                            "aggre2_ufs_axi",

                            "aggre2_usb3_axi",

                            "cfg_noc_usb2_axi";

              clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,

                       <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>;

                       <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>,

                       <&rpmcc RPM_SMD_IPA_CLK>,

                       <&gcc GCC_UFS_AXI_CLK>,

                       <&gcc GCC_AGGRE2_UFS_AXI_CLK>,

                       <&gcc GCC_AGGRE2_USB3_AXI_CLK>,

                       <&gcc GCC_CFG_NOC_USB2_AXI_CLK>;

      };



      mnoc: interconnect@1745000 {