Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ac97-mfd',... (242f66c8) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/devicetree/bindings/mfd/arizona.txt

+1 −39

Original line number	Diff line number	Diff line
		@@ -65,45 +65,6 @@ Optional properties:
		a value that is out of range for a 16 bit register then the chip default
		will be used. If present exactly five values must be specified.

		- wlf,inmode : A list of INn_MODE register values, where n is the number
		of input signals. Valid values are 0 (Differential), 1 (Single-ended) and
		2 (Digital Microphone). If absent, INn_MODE registers set to 0 by default.
		If present, values must be specified less than or equal to the number of
		input signals. If values less than the number of input signals, elements
		that have not been specified are set to 0 by default. Entries are:
		<IN1, IN2, IN3, IN4> (wm5102, wm5110, wm8280, wm8997)
		<IN1A, IN2A, IN1B, IN2B> (wm8998, wm1814)
		- wlf,out-mono : A list of boolean values indicating whether each output is
		mono or stereo. Position within the list indicates the output affected
		(eg. First entry in the list corresponds to output 1). A non-zero value
		indicates a mono output. If present, the number of values should be less
		than or equal to the number of outputs, if less values are supplied the
		additional outputs will be treated as stereo.

		- wlf,dmic-ref : DMIC reference voltage source for each input, can be
		selected from either MICVDD or one of the MICBIAS's, defines
		(ARIZONA_DMIC_xxxx) are provided in <dt-bindings/mfd/arizona.txt>. If
		present, the number of values should be less than or equal to the
		number of inputs, unspecified inputs will use the chip default.

		- wlf,max-channels-clocked : The maximum number of channels to be clocked on
		each AIF, useful for I2S systems with multiple data lines being mastered.
		Specify one cell for each AIF to be configured, specify zero for AIFs that
		should be handled normally.
		If present, number of cells must be less than or equal to the number of
		AIFs. If less than the number of AIFs, for cells that have not been
		specified the corresponding AIFs will be treated as default setting.

		- wlf,spk-fmt : PDM speaker data format, must contain 2 cells (OUT5 and OUT6).
		See the datasheet for values.
		The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
		wm8998, wm1814)

		- wlf,spk-mute : PDM speaker mute setting, must contain 2 cells (OUT5 and OUT6).
		See the datasheet for values.
		The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
		wm8998, wm1814)

		- DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if
		they are being externally supplied. As covered in
		Documentation/devicetree/bindings/regulator/regulator.txt
		@@ -112,6 +73,7 @@ Optional properties:
		Also see child specific device properties:
		Regulator - ../regulator/arizona-regulator.txt
		Extcon - ../extcon/extcon-arizona.txt
		Sound - ../sound/arizona.txt

		Example:

Documentation/devicetree/bindings/sound/wlf,arizona.txt

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		Cirrus Logic Arizona class audio SoCs

		These devices are audio SoCs with extensive digital capabilities and a range
		of analogue I/O.

		This document lists sound specific bindings, see the primary binding
		document:
		../mfd/arizona.txt

		Optional properties:

		- wlf,inmode : A list of INn_MODE register values, where n is the number
		of input signals. Valid values are 0 (Differential), 1 (Single-ended) and
		2 (Digital Microphone). If absent, INn_MODE registers set to 0 by default.
		If present, values must be specified less than or equal to the number of
		input signals. If values less than the number of input signals, elements
		that have not been specified are set to 0 by default. Entries are:
		<IN1, IN2, IN3, IN4> (wm5102, wm5110, wm8280, wm8997)
		<IN1A, IN2A, IN1B, IN2B> (wm8998, wm1814)
		- wlf,out-mono : A list of boolean values indicating whether each output is
		mono or stereo. Position within the list indicates the output affected
		(eg. First entry in the list corresponds to output 1). A non-zero value
		indicates a mono output. If present, the number of values should be less
		than or equal to the number of outputs, if less values are supplied the
		additional outputs will be treated as stereo.

		- wlf,dmic-ref : DMIC reference voltage source for each input, can be
		selected from either MICVDD or one of the MICBIAS's, defines
		(ARIZONA_DMIC_xxxx) are provided in <dt-bindings/mfd/arizona.txt>. If
		present, the number of values should be less than or equal to the
		number of inputs, unspecified inputs will use the chip default.

		- wlf,max-channels-clocked : The maximum number of channels to be clocked on
		each AIF, useful for I2S systems with multiple data lines being mastered.
		Specify one cell for each AIF to be configured, specify zero for AIFs that
		should be handled normally.
		If present, number of cells must be less than or equal to the number of
		AIFs. If less than the number of AIFs, for cells that have not been
		specified the corresponding AIFs will be treated as default setting.

		- wlf,spk-fmt : PDM speaker data format, must contain 2 cells (OUT5 and OUT6).
		See the datasheet for values.
		The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
		wm8998, wm1814)

		- wlf,spk-mute : PDM speaker mute setting, must contain 2 cells (OUT5 and OUT6).
		See the datasheet for values.
		The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,
		wm8998, wm1814)

		- wlf,out-volume-limit : The volume limit value that should be applied to each
		output channel. See the datasheet for exact values. Channels are specified
		in the order OUT1L, OUT1R, OUT2L, OUT2R, etc.

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -14597,6 +14597,7 @@ F: Documentation/devicetree/bindings/extcon/extcon-arizona.txt
		F: Documentation/devicetree/bindings/regulator/arizona-regulator.txt
		F: Documentation/devicetree/bindings/mfd/arizona.txt
		F: Documentation/devicetree/bindings/mfd/wm831x.txt
		F: Documentation/devicetree/bindings/sound/wlf,arizona.txt
		F: arch/arm/mach-s3c64xx/mach-crag6410*
		F: drivers/clk/clk-wm83*.c
		F: drivers/extcon/extcon-arizona.c

drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -371,6 +371,8 @@ static int acp_hw_init(void *handle)
		adev->acp.acp_cell[0].name = "acp_audio_dma";
		adev->acp.acp_cell[0].num_resources = 4;
		adev->acp.acp_cell[0].resources = &adev->acp.acp_res[0];
		adev->acp.acp_cell[0].platform_data = &adev->asic_type;
		adev->acp.acp_cell[0].pdata_size = sizeof(adev->asic_type);

		adev->acp.acp_cell[1].name = "designware-i2s";
		adev->acp.acp_cell[1].num_resources = 1;

drivers/gpu/drm/amd/include/amd_shared.h

+2 −27

Original line number	Diff line number	Diff line
		@@ -23,34 +23,9 @@
		#ifndef __AMD_SHARED_H__
		#define __AMD_SHARED_H__

		#define AMD_MAX_USEC_TIMEOUT 200000 /* 200 ms */
		#include <drm/amd_asic_type.h>

		/*
		* Supported ASIC types
		*/
		enum amd_asic_type {
		CHIP_TAHITI = 0,
		CHIP_PITCAIRN,
		CHIP_VERDE,
		CHIP_OLAND,
		CHIP_HAINAN,
		CHIP_BONAIRE,
		CHIP_KAVERI,
		CHIP_KABINI,
		CHIP_HAWAII,
		CHIP_MULLINS,
		CHIP_TOPAZ,
		CHIP_TONGA,
		CHIP_FIJI,
		CHIP_CARRIZO,
		CHIP_STONEY,
		CHIP_POLARIS10,
		CHIP_POLARIS11,
		CHIP_POLARIS12,
		CHIP_VEGA10,
		CHIP_RAVEN,
		CHIP_LAST,
		};
		#define AMD_MAX_USEC_TIMEOUT 200000 /* 200 ms */

		/*
		* Chip flags