Merge branch 'for-next' into for-linus (b94a62a6) · Commits · EulixOS / Software / Kernel

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/sound/audio-iio-aux.yaml

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/sound/audio-iio-aux.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Audio IIO auxiliary

		maintainers:
		- Herve Codina <herve.codina@bootlin.com>

		description:
		Auxiliary device based on Industrial I/O device channels

		allOf:
		- $ref: dai-common.yaml#

		properties:
		compatible:
		const: audio-iio-aux

		io-channels:
		description:
		Industrial I/O device channels used

		io-channel-names:
		description:
		Industrial I/O channel names related to io-channels.
		These names are used to provides sound controls, widgets and routes names.

		snd-control-invert-range:
		$ref: /schemas/types.yaml#/definitions/uint32-array
		description: \|
		A list of 0/1 flags defining whether or not the related channel is
		inverted
		items:
		enum: [0, 1]
		default: 0
		description: \|
		Invert the sound control value compared to the IIO channel raw value.
		- 1: The related sound control value is inverted meaning that the
		minimum sound control value correspond to the maximum IIO channel
		raw value and the maximum sound control value correspond to the
		minimum IIO channel raw value.
		- 0: The related sound control value is not inverted meaning that the
		minimum (resp maximum) sound control value correspond to the
		minimum (resp maximum) IIO channel raw value.

		required:
		- compatible
		- io-channels
		- io-channel-names

		unevaluatedProperties: false

		examples:
		- \|
		iio-aux {
		compatible = "audio-iio-aux";
		io-channels = <&iio 0>, <&iio 1>, <&iio 2>, <&iio 3>;
		io-channel-names = "CH0", "CH1", "CH2", "CH3";
		/* Invert CH1 and CH2 */
		snd-control-invert-range = <0 1 1 0>;
		};

Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ properties:
		- fsl,imx8mm-rpmsg-audio
		- fsl,imx8mp-rpmsg-audio
		- fsl,imx8ulp-rpmsg-audio
		- fsl,imx93-rpmsg-audio

		model:
		$ref: /schemas/types.yaml#/definitions/string

Documentation/devicetree/bindings/sound/mediatek,mt8188-afe.yaml

+7 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,12 @@ properties:
		reset-names:
		const: audiosys

		memory-region:
		maxItems: 1
		description: \|
		Shared memory region for AFE memif. A "shared-dma-pool".
		See ../reserved-memory/reserved-memory.yaml for details.

		mediatek,topckgen:
		$ref: /schemas/types.yaml#/definitions/phandle
		description: The phandle of the mediatek topckgen controller
		@@ -176,6 +182,7 @@ examples:
		interrupts = <GIC_SPI 822 IRQ_TYPE_LEVEL_HIGH 0>;
		resets = <&watchdog 14>;
		reset-names = "audiosys";
		memory-region = <&snd_dma_mem_reserved>;
		mediatek,topckgen = <&topckgen>;
		mediatek,infracfg = <&infracfg_ao>;
		power-domains = <&spm 13>; //MT8188_POWER_DOMAIN_AUDIO

Documentation/devicetree/bindings/sound/nau8821.txt

deleted100644 → 0

+0 −55

Original line number	Diff line number	Diff line
		Nuvoton NAU88L21 audio codec

		This device supports I2C only.

		Required properties:
		- compatible : Must be "nuvoton,nau8821"

		- reg : the I2C address of the device. This is either 0x1B (CSB=0) or 0x54 (CSB=1).

		Optional properties:
		- nuvoton,jkdet-enable: Enable jack detection via JKDET pin.
		- nuvoton,jkdet-pull-enable: Enable JKDET pin pull. If set - pin pull enabled,
		otherwise pin in high impedance state.
		- nuvoton,jkdet-pull-up: Pull-up JKDET pin. If set then JKDET pin is pull up, otherwise pull down.
		- nuvoton,jkdet-polarity: JKDET pin polarity. 0 - active high, 1 - active low.

		- nuvoton,vref-impedance: VREF Impedance selection
		0 - Open
		1 - 25 kOhm
		2 - 125 kOhm
		3 - 2.5 kOhm

		- nuvoton,micbias-voltage: Micbias voltage level.
		0 - VDDA
		1 - VDDA
		2 - VDDA * 1.1
		3 - VDDA * 1.2
		4 - VDDA * 1.3
		5 - VDDA * 1.4
		6 - VDDA * 1.53
		7 - VDDA * 1.53

		- nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms
		- nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms

		- nuvoton,dmic-clk-threshold: the ADC threshold of DMIC clock.
		- nuvoton,key_enable: Headset button detection switch.

		Example:

		headset: nau8821@1b {
		compatible = "nuvoton,nau8821";
		reg = <0x1b>;
		interrupt-parent = <&gpio>;
		interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
		nuvoton,jkdet-enable;
		nuvoton,jkdet-pull-enable;
		nuvoton,jkdet-pull-up;
		nuvoton,jkdet-polarity = <GPIO_ACTIVE_LOW>;
		nuvoton,vref-impedance = <2>;
		nuvoton,micbias-voltage = <6>;
		nuvoton,jack-insert-debounce = <7>;
		nuvoton,jack-eject-debounce = <7>;
		nuvoton,dmic-clk-threshold = 3072000;
		};