Commit 2dc15ff7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v6.7-2' of... 

Merge tag 'asoc-v6.7-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v6.7

More updates for v6,7 following the early merge request:

  - Fixes for handling of component name prefixing when name prefixes
    are used by the machine driver.
  - Fixes for noise when stopping some Sounwire CODECs.
  - Support for AMD ACP 6.3 and 7.0, Awinc AW88399, more Intel
    platforms and more Qualcomm SC7180 platforms.
parents c468b5dd bdb7e192

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ Matthew Wilcox <willy@infradead.org> <willy@debian.org> 
Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>

Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>

Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>

Matthieu Baerts <matttbe@kernel.org> <matthieu.baerts@tessares.net>

Matthieu CASTET <castet.matthieu@free.fr>

Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>

Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>

Documentation/ABI/testing/sysfs-class-firmware

+7 −7
Original line number Diff line number Diff line 
What: 		/sys/class/firmware/.../data

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	The data sysfs file is used for firmware-fallback and for

		firmware uploads. Cat a firmware image to this sysfs file

		after you echo 1 to the loading sysfs file. When the firmware
@@ -13,7 +13,7 @@ Description: The data sysfs file is used for firmware-fallback and for 
What: 		/sys/class/firmware/.../cancel

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Write-only. For firmware uploads, write a "1" to this file to

		request that the transfer of firmware data to the lower-level

		device be canceled. This request will be rejected (EBUSY) if
@@ -23,7 +23,7 @@ Description: Write-only. For firmware uploads, write a "1" to this file to 
What: 		/sys/class/firmware/.../error

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. Returns a string describing a failed firmware

		upload. This string will be in the form of <STATUS>:<ERROR>,

		where <STATUS> will be one of the status strings described
@@ -37,7 +37,7 @@ Description: Read-only. Returns a string describing a failed firmware 
What: 		/sys/class/firmware/.../loading

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	The loading sysfs file is used for both firmware-fallback and

		for firmware uploads. Echo 1 onto the loading file to indicate

		you are writing a firmware file to the data sysfs node. Echo
@@ -49,7 +49,7 @@ Description: The loading sysfs file is used for both firmware-fallback and 
What: 		/sys/class/firmware/.../remaining_size

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. For firmware upload, this file contains the size

		of the firmware data that remains to be transferred to the

		lower-level device driver. The size value is initialized to
@@ -62,7 +62,7 @@ Description: Read-only. For firmware upload, this file contains the size 
What: 		/sys/class/firmware/.../status

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. Returns a string describing the current status of

		a firmware upload. The string will be one of the following:

		idle, "receiving", "preparing", "transferring", "programming".
@@ -70,7 +70,7 @@ Description: Read-only. Returns a string describing the current status of 
What: 		/sys/class/firmware/.../timeout

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	This file supports the timeout mechanism for firmware

		fallback.  This file has no affect on firmware uploads. For

		more information on timeouts please see the documentation

Documentation/admin-guide/cgroup-v1/memory.rst

+7 −0
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ Brief summary of control files. 
 memory.oom_control		     set/show oom controls.

 memory.numa_stat		     show the number of memory usage per numa

				     node

 memory.kmem.limit_in_bytes          Deprecated knob to set and read the kernel

                                     memory hard limit. Kernel hard limit is not

                                     supported since 5.16. Writing any value to

                                     do file will not have any effect same as if

                                     nokmem kernel parameter was specified.

                                     Kernel memory is still charged and reported

                                     by memory.kmem.usage_in_bytes.

 memory.kmem.usage_in_bytes          show current kernel memory allocation

 memory.kmem.failcnt                 show the number of kernel memory usage

				     hits limits

Documentation/arch/arm64/cpu-feature-registers.rst

+12 −0
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ infrastructure: 
     +------------------------------+---------+---------+

     | Name                         |  bits   | visible |

     +------------------------------+---------+---------+

     | SME                          | [27-24] |    y    |

     +------------------------------+---------+---------+

     | MTE                          | [11-8]  |    y    |

     +------------------------------+---------+---------+

     | SSBS                         | [7-4]   |    y    |
@@ -288,8 +290,18 @@ infrastructure: 
     +------------------------------+---------+---------+

     | Name                         |  bits   | visible |

     +------------------------------+---------+---------+

     | CSSC                         | [55-52] |    y    |

     +------------------------------+---------+---------+

     | RPRFM                        | [51-48] |    y    |

     +------------------------------+---------+---------+

     | BC                           | [23-20] |    y    |

     +------------------------------+---------+---------+

     | MOPS                         | [19-16] |    y    |

     +------------------------------+---------+---------+

     | APA3                         | [15-12] |    y    |

     +------------------------------+---------+---------+

     | GPA3                         | [11-8]  |    y    |

     +------------------------------+---------+---------+

     | RPRES                        | [7-4]   |    y    |

     +------------------------------+---------+---------+

     | WFXT                         | [3-0]   |    y    |

Documentation/arch/arm64/elf_hwcaps.rst

+3 −0
Original line number Diff line number Diff line
@@ -305,6 +305,9 @@ HWCAP2_SMEF16F16 
HWCAP2_MOPS

    Functionality implied by ID_AA64ISAR2_EL1.MOPS == 0b0001.



HWCAP2_HBC

    Functionality implied by ID_AA64ISAR2_EL1.BC == 0b0001.



4. Unused AT_HWCAP bits

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