Merge tag 'v5.6-rc5' into rdma.git for-next

Required due to dependencies in following patches. Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
2026-03-09 10:07:04 -07:00 · 2020-03-10 12:49:09 -03:00
parent 3e3cf2e82c 2c523b344d
commit 6f00a54c2c
343 changed files with 3086 additions and 1746 deletions
@@ -100,10 +100,6 @@ modules.order
 /include/ksym/
 /arch/*/include/generated/

-# Generated lkdtm tests
-/tools/testing/selftests/lkdtm/*.sh
-!/tools/testing/selftests/lkdtm/run.sh
-
 # stgit generated dirs
 patches-*

@@ -18,7 +18,7 @@ may look as follows::

 $ ls -l /sys/bus/acpi/devices/INT3404:00/
 total 0
-...
+ ...
 -r--r--r-- 1 root root 4096 Dec 13 20:38 state0
 -r--r--r-- 1 root root 4096 Dec 13 20:38 state1
 -r--r--r-- 1 root root 4096 Dec 13 20:38 state10
@@ -38,7 +38,7 @@ where each of the "state*" files represents one performance state of the fan
 and contains a colon-separated list of 5 integer numbers (fields) with the
 following interpretation::

-control_percent:trip_point_index:speed_rpm:noise_level_mdb:power_mw
+  control_percent:trip_point_index:speed_rpm:noise_level_mdb:power_mw

 * ``control_percent``: The percent value to be used to set the fan speed to a
  specific level using the _FSL object (0-100).
@@ -102,7 +102,7 @@ Required sub-node properties:
 [1] Documentation/devicetree/bindings/clock/clock-bindings.txt
 [2] Documentation/devicetree/bindings/power/power-domain.yaml
 [3] Documentation/devicetree/bindings/thermal/thermal.txt
-[4] Documentation/devicetree/bindings/sram/sram.txt
+[4] Documentation/devicetree/bindings/sram/sram.yaml
 [5] Documentation/devicetree/bindings/reset/reset.txt

 Example:
@@ -109,7 +109,7 @@ Required properties:
 [0] http://infocenter.arm.com/help/topic/com.arm.doc.dui0922b/index.html
 [1] Documentation/devicetree/bindings/clock/clock-bindings.txt
 [2] Documentation/devicetree/bindings/thermal/thermal.txt
-[3] Documentation/devicetree/bindings/sram/sram.txt
+[3] Documentation/devicetree/bindings/sram/sram.yaml
 [4] Documentation/devicetree/bindings/power/power-domain.yaml

 Example:
@@ -62,7 +62,7 @@ Timer node:

 Syscon reboot node:

-See Documentation/devicetree/bindings/power/reset/syscon-reboot.txt for the
+See Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml for the
 detailed list of properties, the two values defined below are specific to the
 BCM6328-style timer:

@@ -216,7 +216,7 @@ properties:
    $ref: '/schemas/types.yaml#/definitions/phandle-array'
    description: |
      List of phandles to idle state nodes supported
-      by this cpu (see ./idle-states.txt).
+      by this cpu (see ./idle-states.yaml).

  capacity-dmips-mhz:
    $ref: '/schemas/types.yaml#/definitions/uint32'
@@ -160,7 +160,7 @@ properties:
        items:
          - enum:
              - armadeus,imx6dl-apf6      # APF6 (Solo) SoM
-              - armadeus,imx6dl-apf6dldev # APF6 (Solo) SoM on APF6Dev board
+              - armadeus,imx6dl-apf6dev   # APF6 (Solo) SoM on APF6Dev board
              - eckelmann,imx6dl-ci4x10
              - emtrion,emcon-mx6         # emCON-MX6S or emCON-MX6DL SoM
              - emtrion,emcon-mx6-avari   # emCON-MX6S or emCON-MX6DL SoM on Avari Base
@@ -1,7 +1,7 @@
 * Hisilicon Hi3519 System Controller Block

 This bindings use the following binding:
-Documentation/devicetree/bindings/mfd/syscon.txt
+Documentation/devicetree/bindings/mfd/syscon.yaml

 Required properties:
 - compatible: "hisilicon,hi3519-sysctrl".
@@ -81,4 +81,4 @@ Example:
 		};
 	};

-[1]. Documentation/devicetree/bindings/arm/idle-states.txt
+[1]. Documentation/devicetree/bindings/arm/idle-states.yaml
@@ -17,7 +17,7 @@ am335x and am437x only:
 - pm-sram: Phandles to ocmcram nodes to be used for power management.
 	   First should be type 'protect-exec' for the driver to use to copy
 	   and run PM functions, second should be regular pool to be used for
-	   data region for code. See Documentation/devicetree/bindings/sram/sram.txt
+	   data region for code. See Documentation/devicetree/bindings/sram/sram.yaml
 	   for more details.

 Examples:
@@ -100,13 +100,14 @@ properties:
      bindings in [1]) must specify this property.

      [1] Kernel documentation - ARM idle states bindings
-        Documentation/devicetree/bindings/arm/idle-states.txt
-
-  "#power-domain-cells":
-    description:
-      The number of cells in a PM domain specifier as per binding in [3].
-      Must be 0 as to represent a single PM domain.
+        Documentation/devicetree/bindings/arm/idle-states.yaml

+patternProperties:
+  "^power-domain-":
+    allOf:
+      - $ref: "../power/power-domain.yaml#"
+    type: object
+    description: |
      ARM systems can have multiple cores, sometimes in an hierarchical
      arrangement. This often, but not always, maps directly to the processor
      power topology of the system. Individual nodes in a topology have their
@@ -122,14 +123,8 @@ properties:
      helps to implement support for OSI mode and OS implementations may choose
      to mandate it.

-      [3] Documentation/devicetree/bindings/power/power_domain.txt
-      [4] Documentation/devicetree/bindings/power/domain-idle-state.txt
-
-  power-domains:
-    $ref: '/schemas/types.yaml#/definitions/phandle-array'
-    description:
-      List of phandles and PM domain specifiers, as defined by bindings of the
-      PM domain provider.
+      [3] Documentation/devicetree/bindings/power/power-domain.yaml
+      [4] Documentation/devicetree/bindings/power/domain-idle-state.yaml

 required:
  - compatible
@@ -199,7 +194,7 @@ examples:

      CPU0: cpu@0 {
        device_type = "cpu";
-        compatible = "arm,cortex-a53", "arm,armv8";
+        compatible = "arm,cortex-a53";
        reg = <0x0>;
        enable-method = "psci";
        power-domains = <&CPU_PD0>;
@@ -208,7 +203,7 @@ examples:

      CPU1: cpu@1 {
        device_type = "cpu";
-        compatible = "arm,cortex-a57", "arm,armv8";
+        compatible = "arm,cortex-a53";
        reg = <0x100>;
        enable-method = "psci";
        power-domains = <&CPU_PD1>;
@@ -224,6 +219,9 @@ examples:
          exit-latency-us = <10>;
          min-residency-us = <100>;
        };
+      };
+
+      domain-idle-states {

        CLUSTER_RET: cluster-retention {
          compatible = "domain-idle-state";
@@ -247,19 +245,19 @@ examples:
      compatible = "arm,psci-1.0";
      method = "smc";

-      CPU_PD0: cpu-pd0 {
+      CPU_PD0: power-domain-cpu0 {
        #power-domain-cells = <0>;
        domain-idle-states = <&CPU_PWRDN>;
        power-domains = <&CLUSTER_PD>;
      };

-      CPU_PD1: cpu-pd1 {
+      CPU_PD1: power-domain-cpu1 {
        #power-domain-cells = <0>;
        domain-idle-states =  <&CPU_PWRDN>;
        power-domains = <&CLUSTER_PD>;
      };

-      CLUSTER_PD: cluster-pd {
+      CLUSTER_PD: power-domain-cluster {
        #power-domain-cells = <0>;
        domain-idle-states = <&CLUSTER_RET>, <&CLUSTER_PWRDN>;
      };
@@ -52,7 +52,7 @@ required:

 examples:
  - |
-    mlahb: ahb {
+    mlahb: ahb@38000000 {
      compatible = "st,mlahb", "simple-bus";
      #address-cells = <1>;
      #size-cells = <1>;
@@ -70,7 +70,6 @@ examples:
        #size-cells = <0>;

        pmic@3e3 {
-            compatible = "...";
            reg = <0x3e3>;

            /* ... */
@@ -40,7 +40,7 @@ additionalProperties: false

 examples:
  - |
-    osc24M: clk@01c20050 {
+    osc24M: clk@1c20050 {
        #clock-cells = <0>;
        compatible = "allwinner,sun4i-a10-osc-clk";
        reg = <0x01c20050 0x4>;
@@ -41,7 +41,7 @@ additionalProperties: false

 examples:
  - |
-    clk@0600005c {
+    clk@600005c {
        #clock-cells = <0>;
        compatible = "allwinner,sun9i-a80-gt-clk";
        reg = <0x0600005c 0x4>;
@@ -42,7 +42,7 @@ properties:
      be part of GCC and hence the TSENS properties can also be part
      of the GCC/clock-controller node.
      For more details on the TSENS properties please refer
-      Documentation/devicetree/bindings/thermal/qcom-tsens.txt
+      Documentation/devicetree/bindings/thermal/qcom-tsens.yaml

  nvmem-cell-names:
    minItems: 1
@@ -49,11 +49,7 @@ examples:
        resets = <&tcon_ch0_clk 0>;

        port {
-            #address-cells = <1>;
-            #size-cells = <0>;
-
-            tve0_in_tcon0: endpoint@0 {
-                reg = <0>;
+            tve0_in_tcon0: endpoint {
                remote-endpoint = <&tcon0_out_tve0>;
            };
        };
@@ -79,21 +79,15 @@ examples:
          #size-cells = <0>;

          anx6345_in: port@0 {
-            #address-cells = <1>;
-            #size-cells = <0>;
            reg = <0>;
-            anx6345_in_tcon0: endpoint@0 {
-              reg = <0>;
+            anx6345_in_tcon0: endpoint {
              remote-endpoint = <&tcon0_out_anx6345>;
            };
          };

          anx6345_out: port@1 {
-            #address-cells = <1>;
-            #size-cells = <0>;
            reg = <1>;
-            anx6345_out_panel: endpoint@0 {
-              reg = <0>;
+            anx6345_out_panel: endpoint {
              remote-endpoint = <&panel_in_edp>;
            };
          };
@@ -37,6 +37,8 @@ examples:
    dsi@ff450000 {
        #address-cells = <1>;
        #size-cells = <0>;
+        reg = <0xff450000 0x1000>;
+
        panel@0 {
            compatible = "leadtek,ltk500hd1829";
            reg = <0>;
@@ -37,6 +37,8 @@ examples:
    dsi@ff450000 {
        #address-cells = <1>;
        #size-cells = <0>;
+        reg = <0xff450000 0x1000>;
+
        panel@0 {
            compatible = "xinpeng,xpp055c272";
            reg = <0>;
--- a/Show More
+++ b/Show More