Commit 4c7aba46 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 

For applying more ALSA timer cleanups.
parents d2dc2a96 ba3021b2

Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
Hi6220 SoC ION

===================================================================

Required properties:

- compatible : "hisilicon,hi6220-ion"

- list of the ION heaps

	- heap name : maybe heap_sys_user@0

	- heap id   : id should be unique in the system.

	- heap base : base ddr address of the heap,0 means that

	it is dynamic.

	- heap size : memory size and 0 means it is dynamic.

	- heap type : the heap type of the heap, please also

	see the define in ion.h(drivers/staging/android/uapi/ion.h)

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

Example:

	hi6220-ion {

		compatible = "hisilicon,hi6220-ion";

		heap_sys_user@0 {

			heap-name = "sys_user";

			heap-id   = <0x0>;

			heap-base = <0x0>;

			heap-size = <0x0>;

			heap-type = "ion_system";

		};

		heap_sys_contig@0 {

			heap-name = "sys_contig";

			heap-id   = <0x1>;

			heap-base = <0x0>;

			heap-size = <0x0>;

			heap-type = "ion_system_contig";

		};

	};

Documentation/sound/hd-audio/models.rst

+65 −49
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ ALC880 
    6-jack in back, 2-jack in front

6stack-digout

    6-jack with a SPDIF out

6stack-automute

    6-jack with headphone jack detection



ALC260

======
@@ -62,6 +64,8 @@ lenovo-dock 
    Enables docking station I/O for some Lenovos

hp-gpio-led

    GPIO LED support on HP laptops

hp-dock-gpio-mic1-led

    HP dock with mic LED support

dell-headset-multi

    Headset jack, which can also be used as mic-in

dell-headset-dock
@@ -72,6 +76,12 @@ alc283-sense-combo 
    Combo jack sensing on ALC283

tpt440-dock

    Pin configs for Lenovo Thinkpad Dock support

tpt440

    Lenovo Thinkpad T440s setup

tpt460

    Lenovo Thinkpad T460/560 setup

dual-codecs

    Lenovo laptops with dual codecs



ALC66x/67x/892

==============
@@ -97,6 +107,8 @@ inv-dmic 
    Inverted internal mic workaround

dell-headset-multi

    Headset jack, which can also be used as mic-in

dual-codecs

    Lenovo laptops with dual codecs



ALC680

======
@@ -114,6 +126,8 @@ inv-dmic 
    Inverted internal mic workaround

no-primary-hp

    VAIO Z/VGC-LN51JGB workaround (for fixed speaker DAC)

dual-codecs

    ALC1220 dual codecs for Gaming mobos



ALC861/660

==========
@@ -206,65 +220,47 @@ auto 


Conexant 5045

=============

laptop-hpsense

    Laptop with HP sense (old model laptop)

laptop-micsense

    Laptop with Mic sense (old model fujitsu)

laptop-hpmicsense

    Laptop with HP and Mic senses

benq

    Benq R55E

laptop-hp530

    HP 530 laptop

test

    for testing/debugging purpose, almost all controls can be

    adjusted.  Appearing only when compiled with $CONFIG_SND_DEBUG=y

cap-mix-amp

    Fix max input level on mixer widget

toshiba-p105

    Toshiba P105 quirk

hp-530

    HP 530 quirk



Conexant 5047

=============

laptop

    Basic Laptop config 

laptop-hp

    Laptop config for some HP models (subdevice 30A5)

laptop-eapd

    Laptop config with EAPD support

test

    for testing/debugging purpose, almost all controls can be

    adjusted.  Appearing only when compiled with $CONFIG_SND_DEBUG=y

cap-mix-amp

    Fix max input level on mixer widget



Conexant 5051

=============

laptop

    Basic Laptop config (default)

hp

    HP Spartan laptop

hp-dv6736

    HP dv6736

hp-f700

    HP Compaq Presario F700

ideapad

    Lenovo IdeaPad laptop

toshiba

    Toshiba Satellite M300

lenovo-x200

    Lenovo X200 quirk



Conexant 5066

=============

laptop

    Basic Laptop config (default)

hp-laptop

    HP laptops, e g G60

asus

    Asus K52JU, Lenovo G560

dell-laptop

    Dell laptops

dell-vostro

    Dell Vostro

olpc-xo-1_5

    OLPC XO 1.5

ideapad

    Lenovo IdeaPad U150

stereo-dmic

    Workaround for inverted stereo digital mic

gpio1

    Enable GPIO1 pin

headphone-mic-pin

    Enable headphone mic NID 0x18 without detection

tp410

    Thinkpad T400 & co quirks

thinkpad

    Lenovo Thinkpad

    Thinkpad mute/mic LED quirk

lemote-a1004

    Lemote A1004 quirk

lemote-a1205

    Lemote A1205 quirk

olpc-xo

    OLPC XO quirk

mute-led-eapd

    Mute LED control via EAPD

hp-dock

    HP dock support

mute-led-gpio

    Mute LED control via GPIO



STAC9200

========
@@ -444,6 +440,8 @@ dell-eq 
    Dell desktops/laptops

alienware

    Alienware M17x

asus-mobo

    Pin configs for ASUS mobo with 5.1/SPDIF out

auto

    BIOS setup (default)
@@ -477,6 +475,8 @@ hp-envy-ts-bass 
    Pin fixup for HP Envy TS bass speaker (NID 0x10)

hp-bnb13-eq

    Hardware equalizer setup for HP laptops

hp-envy-ts-bass

    HP Envy TS bass support

auto

    BIOS setup (default)
@@ -496,10 +496,22 @@ auto 


Cirrus Logic CS4206/4207

========================

mbp53

    MacBook Pro 5,3

mbp55

    MacBook Pro 5,5

imac27

    IMac 27 Inch

imac27_122

    iMac 12,2

apple

    Generic Apple quirk

mbp101

    MacBookPro 10,1

mbp81

    MacBookPro 8,1

mba42

    MacBookAir 4,2

auto

    BIOS setup (default)
@@ -509,6 +521,10 @@ mba6 
    MacBook Air 6,1 and 6,2

gpio0

    Enable GPIO 0 amp

mbp11

    MacBookPro 11,2

macmini

    MacMini 7,1

auto

    BIOS setup (default)

Documentation/usb/typec.rst

+2 −4
Original line number Diff line number Diff line
@@ -114,8 +114,7 @@ the details during registration. The class offers the following API for 
registering/unregistering cables and their plugs:



.. kernel-doc:: drivers/usb/typec/typec.c

   :functions: typec_register_cable typec_unregister_cable typec_register_plug

   typec_unregister_plug

   :functions: typec_register_cable typec_unregister_cable typec_register_plug typec_unregister_plug



The class will provide a handle to struct typec_cable and struct typec_plug if

the registration is successful, or NULL if it isn't.
@@ -137,8 +136,7 @@ during connection of a partner or cable, the port driver must use the following 
APIs to report it to the class:



.. kernel-doc:: drivers/usb/typec/typec.c

   :functions: typec_set_data_role typec_set_pwr_role typec_set_vconn_role

   typec_set_pwr_opmode

   :functions: typec_set_data_role typec_set_pwr_role typec_set_vconn_role typec_set_pwr_opmode



Alternate Modes

~~~~~~~~~~~~~~~

Documentation/watchdog/watchdog-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ nowayout: Watchdog cannot be stopped once started 
-------------------------------------------------

iTCO_wdt:

heartbeat: Watchdog heartbeat in seconds.

	(2<heartbeat<39 (TCO v1) or 613 (TCO v2), default=30)

	(5<=heartbeat<=74 (TCO v1) or 1226 (TCO v2), default=30)

nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

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

MAINTAINERS

+10 −7
Original line number Diff line number Diff line
@@ -846,7 +846,6 @@ M: Laura Abbott <labbott@redhat.com> 
M:	Sumit Semwal <sumit.semwal@linaro.org>

L:	devel@driverdev.osuosl.org

S:	Supported

F:	Documentation/devicetree/bindings/staging/ion/

F:	drivers/staging/android/ion

F:	drivers/staging/android/uapi/ion.h

F:	drivers/staging/android/uapi/ion_test.h
@@ -3116,6 +3115,14 @@ F: drivers/net/ieee802154/cc2520.c 
F:	include/linux/spi/cc2520.h

F:	Documentation/devicetree/bindings/net/ieee802154/cc2520.txt



CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER

M:	Gilad Ben-Yossef <gilad@benyossef.com>

L:	linux-crypto@vger.kernel.org

L:	driverdev-devel@linuxdriverproject.org

S:	Supported

F:	drivers/staging/ccree/

W:	https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family



CEC FRAMEWORK

M:	Hans Verkuil <hans.verkuil@cisco.com>

L:	linux-media@vger.kernel.org
@@ -5695,7 +5702,7 @@ M: Alex Elder <elder@kernel.org> 
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

S:	Maintained

F:	drivers/staging/greybus/

L:	greybus-dev@lists.linaro.org

L:	greybus-dev@lists.linaro.org (moderated for non-subscribers)



GREYBUS AUDIO PROTOCOLS DRIVERS

M:	Vaibhav Agarwal <vaibhav.sr@gmail.com>
@@ -9553,10 +9560,6 @@ F: drivers/net/wireless/intersil/orinoco/ 


OSD LIBRARY and FILESYSTEM

M:	Boaz Harrosh <ooo@electrozaur.com>

M:	Benny Halevy <bhalevy@primarydata.com>

L:	osd-dev@open-osd.org

W:	http://open-osd.org

T:	git git://git.open-osd.org/open-osd.git

S:	Maintained

F:	drivers/scsi/osd/

F:	include/scsi/osd_*
@@ -13858,7 +13861,7 @@ S: Odd fixes 
F:	drivers/net/wireless/wl3501*



WOLFSON MICROELECTRONICS DRIVERS

L:	patches@opensource.wolfsonmicro.com

L:	patches@opensource.cirrus.com

T:	git https://github.com/CirrusLogic/linux-drivers.git

W:	https://github.com/CirrusLogic/linux-drivers/wiki

S:	Supported