Commit d08008f1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v7.0-merge-window' of... 

Merge tag 'asoc-fix-v7.0-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v7.0 merge window

A reasonably small set of fixes and quriks that came in during the merge
window, there's one more pending that I'll send tomorrow if you didn't
send a PR already.
parents d649c58b 80ca1136

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com> 
Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@futurfusion.io>

Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin.ext@nsn.com>

Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@gmx.de>

Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@nokia.com>
@@ -786,7 +787,8 @@ Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com> <subashab@codeaurora. 
Subbaraman Narayanamurthy <quic_subbaram@quicinc.com> <subbaram@codeaurora.org>

Subhash Jadavani <subhashj@codeaurora.org>

Sudarshan Rajagopalan <quic_sudaraja@quicinc.com> <sudaraja@codeaurora.org>

Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>

Sudeep Holla <sudeep.holla@kernel.org> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>

Sudeep Holla <sudeep.holla@kernel.org> <sudeep.holla@arm.com>

Sumit Garg <sumit.garg@kernel.org> <sumit.garg@linaro.org>

Sumit Semwal <sumit.semwal@ti.com>

Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>

Documentation/ABI/testing/sysfs-class-tsm

+0 −10
Original line number Diff line number Diff line
@@ -7,13 +7,3 @@ Description: 
		signals when the PCI layer is able to support establishment of

		link encryption and other device-security features coordinated

		through a platform tsm.
 


What:		/sys/class/tsm/tsmN/streamH.R.E

Contact:	linux-pci@vger.kernel.org

Description:

		(RO) When a host bridge has established a secure connection via

		the platform TSM, symlink appears. The primary function of this

		is have a system global review of TSM resource consumption

		across host bridges. The link points to the endpoint PCI device

		and matches the same link published by the host bridge. See

		Documentation/ABI/testing/sysfs-devices-pci-host-bridge.

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -3472,6 +3472,11 @@ Kernel parameters 
			If there are multiple matching configurations changing

			the same attribute, the last one is used.



	liveupdate=	[KNL,EARLY]

			Format: <bool>

			Enable Live Update Orchestrator (LUO).

			Default: off.



	load_ramdisk=	[RAM] [Deprecated]



	lockd.nlm_grace_period=P  [NFS] Assign grace period.

Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml

+3 −3
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ properties: 
  reg:

    maxItems: 1



  avdd-supply:

  AVDD-supply:

    description: Analog power supply



  dvdd-supply:

  DVDD-supply:

    description: Digital power supply



  reset-gpios:
@@ -60,7 +60,7 @@ allOf: 
      properties:

        dsd-path: false



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml

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

    maxItems: 1



  avdd-supply:

  AVDD-supply:

    description: A 1.8V supply that powers up the AVDD pin.



  dvdd-supply:

  DVDD-supply:

    description: A 1.2V supply that powers up the DVDD pin.



  reset-gpios:
@@ -32,7 +32,10 @@ required: 
  - compatible

  - reg



additionalProperties: false

allOf:

  - $ref: dai-common.yaml#



unevaluatedProperties: false



examples:

  - |