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

Merge tag 'asoc-v6.6-early' of... 

Merge tag 'asoc-v6.6-early' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v6.6

Here's an initial batch of updates for ASoC for this release cycle.
We've got a bunch of new drivers in here, a bit of core work from
Morimoto-san and quite a lot of janitorial work.  There's several
updates that pull in changes from other subsystems in order to build
on them:

 - An adaptor to allow use of IIO DACs and ADCs in ASoC which pulls in
   some IIO changes.
 - Create a library function for intlog10() and use it in the NAU8825
   driver.
 - Include the ASoC tests, including the topology tests, in the default
   KUnit full test coverage.  This also involves enabling UML builds of
   ALSA since that's the default KUnit test environment which pulls in
   the addition of some stubs to the driver.
 - More factoring out from Morimoto-san.
 - Convert a lot of drivers to use the more modern maple tree register
   cache.
 - Support for AMD machines with MAX98388 and NAU8821, Cirrus Logic
   CS35L36, Intel AVS machines with ES8336 and RT5663 and NXP i.MX93.
parents 2d816d4f 85d12eda

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com> 
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>

John Keeping <john@keeping.me.uk> <john@metanate.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>
@@ -454,6 +455,8 @@ Sebastian Reichel <sre@kernel.org> <sre@debian.org> 
Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>

Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

Documentation/core-api/kernel-api.rst

+5 −2
Original line number Diff line number Diff line
@@ -162,8 +162,11 @@ Base 2 log and power Functions 
.. kernel-doc:: include/linux/log2.h

   :internal:



Integer power Functions

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

Integer log and power Functions

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



.. kernel-doc:: include/linux/int_log.h

   :export:



.. kernel-doc:: lib/math/int_pow.c

   :export:

Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml

+3 −3
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ properties: 
      G coefficient for temperature equation.

      Default for series 5 = 60000

      Default for series 6 = 57400

    multipleOf: 1000

    multipleOf: 100

    minimum: 1000

    $ref: /schemas/types.yaml#/definitions/uint32
@@ -114,7 +114,7 @@ properties: 
      H coefficient for temperature equation.

      Default for series 5 = 200000

      Default for series 6 = 249400

    multipleOf: 1000

    multipleOf: 100

    minimum: 1000

    $ref: /schemas/types.yaml#/definitions/uint32
@@ -131,7 +131,7 @@ properties: 
      J coefficient for temperature equation.

      Default for series 5 = -100

      Default for series 6 = 0

    multipleOf: 1000

    multipleOf: 100

    maximum: 0

    $ref: /schemas/types.yaml#/definitions/int32

Documentation/devicetree/bindings/serial/cavium-uart.txt

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
* Universal Asynchronous Receiver/Transmitter (UART)



- compatible: "cavium,octeon-3860-uart"



  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.



- reg: The base address of the UART register bank.



- interrupts: A single interrupt specifier.



- current-speed: Optional, the current bit rate in bits per second.



Example:

	uart1: serial@1180000000c00 {

		compatible = "cavium,octeon-3860-uart","ns16550";

		reg = <0x11800 0x00000c00 0x0 0x400>;

		current-speed = <115200>;

		interrupts = <0 35>;

	};

Documentation/devicetree/bindings/serial/nxp,lpc1850-uart.txt

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
* NXP LPC1850 UART



Required properties:

- compatible	: "nxp,lpc1850-uart", "ns16550a".

- reg		: offset and length of the register set for the device.

- interrupts	: should contain uart interrupt.

- clocks	: phandle to the input clocks.

- clock-names	: required elements: "uartclk", "reg".



Optional properties:

- dmas		: Two or more DMA channel specifiers following the

		  convention outlined in bindings/dma/dma.txt

- dma-names	: Names for the dma channels, if present. There must

		  be at least one channel named "tx" for transmit

		  and named "rx" for receive.



Since it's also possible to also use the of_serial.c driver all

parameters from 8250.txt also apply but are optional.



Example:

uart0: serial@40081000 {

	compatible = "nxp,lpc1850-uart", "ns16550a";

	reg = <0x40081000 0x1000>;

	reg-shift = <2>;

	interrupts = <24>;

	clocks = <&ccu2 CLK_APB0_UART0>, <&ccu1 CLK_CPU_UART0>;

	clock-names = "uartclk", "reg";

};