Commit c28d5d56 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge tag 'bus_remove_return_void-5.15' into next 



This helps to remove conflict on idxd driver

 Conflicts:
	drivers/dma/idxd/sysfs.c
	drivers/dma/idxd/bus.c

Greg says:

Bus: Make remove callback return void tag

Tag for other trees/branches to pull from in order to have a stable
place to build off of if they want to add new busses for 5.15.

Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parents 0e96454c fc7a6209

Documentation/ABI/testing/sysfs-ptp

+20 −0
Original line number Diff line number Diff line
@@ -33,6 +33,13 @@ Description: 
		frequency adjustment value (a positive integer) in

		parts per billion.



What:		/sys/class/ptp/ptpN/max_vclocks

Date:		May 2021

Contact:	Yangbo Lu <yangbo.lu@nxp.com>

Description:

		This file contains the maximum number of ptp vclocks.

		Write integer to re-configure it.



What:		/sys/class/ptp/ptpN/n_alarms

Date:		September 2010

Contact:	Richard Cochran <richardcochran@gmail.com>
@@ -61,6 +68,19 @@ Description: 
		This file contains the number of programmable pins

		offered by the PTP hardware clock.



What:		/sys/class/ptp/ptpN/n_vclocks

Date:		May 2021

Contact:	Yangbo Lu <yangbo.lu@nxp.com>

Description:

		This file contains the number of virtual PTP clocks in

		use.  By default, the value is 0 meaning that only the

		physical clock is in use.  Setting the value creates

		the corresponding number of virtual clocks and causes

		the physical clock to become free running.  Setting the

		value back to 0 deletes the virtual clocks and

		switches the physical clock back to normal, adjustable

		operation.



What:		/sys/class/ptp/ptpN/pins

Date:		March 2014

Contact:	Richard Cochran <richardcochran@gmail.com>

Documentation/dev-tools/kunit/running_tips.rst

+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.

Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml

+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

Documentation/devicetree/bindings/display/renesas,du.yaml

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ required: 
  - reg

  - clocks

  - interrupts

  - resets

  - ports



allOf:

Documentation/devicetree/bindings/hwmon/adt7475.yaml

+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