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

Merge tag 'asoc-v4.16' of... 

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

ASoC: Updates for v4.16

Quite a big update here, mostly in new device support and some big
updates for older drivers too.  The main core work continues to be
Morimoto-san's efforts on modernising drivers to use the component
layer.

 - Lots more updates from Morimoto-san to move more things into the
   component level.
 - Large cleanups of some of the TI CODEC drivers from Andrew F. Davis.
 - Even more quirks and cleanups of quirks for x86 systems.
 - Refactoring of the Freescale SSI driver from Nicolin Chen in
   preparation for some more substantive improvements which are
   currently in review.
 - New drivers for Allwinner A83T, Maxim MAX89373, SocioNext UiniPhier
   EVEA Tempo Semiconductor TSCS42xx and TI PCM816x, TAS5722 and TAS6424
   devices.
parents 7a0a8716 b762408d

Documentation/admin-guide/kernel-parameters.rst

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ parameter is applicable:: 
	IPV6	IPv6 support is enabled.

	ISAPNP	ISA PnP code is enabled.

	ISDN	Appropriate ISDN support is enabled.

	ISOL	CPU Isolation is enabled.

	JOY	Appropriate joystick support is enabled.

	KGDB	Kernel debugger support is enabled.

	KVM	Kernel Virtual Machine support is enabled.

Documentation/admin-guide/kernel-parameters.txt

+15 −3
Original line number Diff line number Diff line
@@ -328,11 +328,15 @@ 
			not play well with APC CPU idle - disable it if you have

			APC and your system crashes randomly.



	apic=		[APIC,X86-32] Advanced Programmable Interrupt Controller

	apic=		[APIC,X86] Advanced Programmable Interrupt Controller

			Change the output verbosity whilst booting

			Format: { quiet (default) | verbose | debug }

			Change the amount of debugging information output

			when initialising the APIC and IO-APIC components.

			For X86-32, this can also be used to specify an APIC

			driver name.

			Format: apic=driver_name

			Examples: apic=bigsmp



	apic_extnmi=	[APIC,X86] External NMI delivery setting

			Format: { bsp (default) | all | none }
@@ -1737,7 +1741,7 @@ 
	isapnp=		[ISAPNP]

			Format: <RDP>,<reset>,<pci_scan>,<verbosity>



	isolcpus=	[KNL,SMP] Isolate a given set of CPUs from disturbance.

	isolcpus=	[KNL,SMP,ISOL] Isolate a given set of CPUs from disturbance.

			[Deprecated - use cpusets instead]

			Format: [flag-list,]<cpu-list>
@@ -2662,7 +2666,7 @@ 
			Valid arguments: on, off

			Default: on



	nohz_full=	[KNL,BOOT]

	nohz_full=	[KNL,BOOT,SMP,ISOL]

			The argument is a cpu list, as described above.

			In kernels built with CONFIG_NO_HZ_FULL=y, set

			the specified list of CPUs whose tick will be stopped
@@ -2708,6 +2712,8 @@ 
			steal time is computed, but won't influence scheduler

			behaviour



	nopti		[X86-64] Disable kernel page table isolation



	nolapic		[X86-32,APIC] Do not enable or use the local APIC.



	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.
@@ -3282,6 +3288,12 @@ 
	pt.		[PARIDE]

			See Documentation/blockdev/paride.txt.



	pti=		[X86_64]

			Control user/kernel address space isolation:

			on - enable

			off - disable

			auto - default setting



	pty.legacy_count=

			[KNL] Number of legacy pty's. Overwrites compiled-in

			default number.

Documentation/admin-guide/thunderbolt.rst

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ If supported by your machine this will be exposed by the WMI bus with 
a sysfs attribute called "force_power".



For example the intel-wmi-thunderbolt driver exposes this attribute in:

  /sys/devices/platform/PNP0C14:00/wmi_bus/wmi_bus-PNP0C14:00/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power

  /sys/bus/wmi/devices/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power



  To force the power to on, write 1 to this attribute file.

  To disable force power, write 0 to this attribute file.

Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ Required properties: 
                 at25df321a

                 at25df641

                 at26df081a

                 en25s64

                 mr25h128

                 mr25h256

                 mr25h10
@@ -33,7 +32,6 @@ Required properties: 
                 s25fl008k

                 s25fl064k

                 sst25vf040b

                 sst25wf040b

                 m25p40

                 m25p80

                 m25p16

Documentation/devicetree/bindings/sound/max98373.txt

0 → 100644
+40 −0
Original line number Diff line number Diff line 
Maxim Integrated MAX98373 Speaker Amplifier



This device supports I2C.



Required properties:



 - compatible : "maxim,max98373"



 - reg : the I2C address of the device.



Optional properties:



  - maxim,vmon-slot-no : slot number used to send voltage information

                   or in inteleave mode this will be used as

                   interleave slot.

                   slot range : 0 ~ 15,  Default : 0



  - maxim,imon-slot-no : slot number used to send current information

                   slot range : 0 ~ 15,  Default : 0



  - maxim,spkfb-slot-no : slot number used to send speaker feedback information

                   slot range : 0 ~ 15,  Default : 0



  - maxim,interleave-mode : For cases where a single combined channel

		   for the I/V sense data is not sufficient, the device can also be configured

		   to share a single data output channel on alternating frames.

		   In this configuration, the current and voltage data will be frame interleaved

		   on a single output channel.

                   Boolean, define to enable the interleave mode, Default : false



Example:



codec: max98373@31 {

   compatible = "maxim,max98373";

   reg = <0x31>;

   maxim,vmon-slot-no = <0>;

   maxim,imon-slot-no = <1>;

   maxim,spkfb-slot-no = <2>;

   maxim,interleave-mode;

};