Commit 5af84df9 authored by David S. Miller's avatar David S. Miller
Browse files


Conflicts are simple overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 090597b4 9f42f674
Loading
Loading
Loading
Loading
+1 −13
Original line number Diff line number Diff line
@@ -86,19 +86,7 @@ Generating code coverage reports under UML
.. note::
	TODO(brendanhiggins@google.com): There are various issues with UML and
	versions of gcc 7 and up. You're likely to run into missing ``.gcda``
	files or compile errors. We know one `faulty GCC commit
	<https://github.com/gcc-mirror/gcc/commit/8c9434c2f9358b8b8bad2c1990edf10a21645f9d>`_
	but not how we'd go about getting this fixed. The compile errors still
	need some investigation.

.. note::
	TODO(brendanhiggins@google.com): for recent versions of Linux
	(5.10-5.12, maybe earlier), there's a bug with gcov counters not being
	flushed in UML. This translates to very low (<1%) reported coverage. This is
	related to the above issue and can be worked around by replacing the
	one call to ``uml_abort()`` (it's in ``os_dump_core()``) with a plain
	``exit()``.

	files or compile errors.

This is different from the "normal" way of getting coverage information that is
documented in Documentation/dev-tools/gcov.rst.
+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ properties:

  reg:
    minItems: 1
    maxItems: 3
    items:
      - description: base register
      - description: power register
+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ required:
  - reg
  - clocks
  - interrupts
  - resets
  - ports

allOf:
+11 −11
Original line number Diff line number Diff line
@@ -39,17 +39,7 @@ properties:
  reg:
    maxItems: 1

patternProperties:
  "^adi,bypass-attenuator-in[0-4]$":
    description: |
      Configures bypassing the individual voltage input attenuator. If
      set to 1 the attenuator is bypassed if set to 0 the attenuator is
      not bypassed. If the property is absent then the attenuator
      retains it's configuration from the bios/bootloader.
    $ref: /schemas/types.yaml#/definitions/uint32
    enum: [0, 1]

  "^adi,pwm-active-state$":
  adi,pwm-active-state:
    description: |
      Integer array, represents the active state of the pwm outputs If set to 0
      the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm
@@ -61,6 +51,16 @@ patternProperties:
      enum: [0, 1]
      default: 1

patternProperties:
  "^adi,bypass-attenuator-in[0-4]$":
    description: |
      Configures bypassing the individual voltage input attenuator. If
      set to 1 the attenuator is bypassed if set to 0 the attenuator is
      not bypassed. If the property is absent then the attenuator
      retains it's configuration from the bios/bootloader.
    $ref: /schemas/types.yaml#/definitions/uint32
    enum: [0, 1]

required:
  - compatible
  - reg
+2 −4
Original line number Diff line number Diff line
@@ -52,16 +52,14 @@ properties:
        items:
          - const: marvell,ap806-smmu-500
          - const: arm,mmu-500
      - description: NVIDIA SoCs that program two ARM MMU-500s identically
        items:
      - description: NVIDIA SoCs that require memory controller interaction
          and may program multiple ARM MMU-500s identically with the memory
          controller interleaving translations between multiple instances
          for improved performance.
        items:
          - enum:
              - const: nvidia,tegra194-smmu
              - const: nvidia,tegra186-smmu
              - nvidia,tegra194-smmu
              - nvidia,tegra186-smmu
          - const: nvidia,smmu-500
      - items:
          - const: arm,mmu-500
Loading