Commit 498386d1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-next' into for-linus

parents 5c6d4f97 dfc2e8ae

Documentation/devicetree/bindings/sound/sgtl5000.yaml

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ properties: 
    $ref: "/schemas/types.yaml#/definitions/uint32"

    enum: [ 0, 1, 2, 3 ]



  port:

    $ref: audio-graph-port.yaml#

    unevaluatedProperties: false



required:

  - compatible

  - reg

Documentation/sound/hd-audio/controls.rst

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ Conexant codecs 
---------------



Auto-Mute Mode

  See Reatek codecs.

  See Realtek codecs.





Analog codecs

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7112,6 +7112,13 @@ L: linux-input@vger.kernel.org 
S:	Maintained

F:	drivers/input/joystick/fsia6b.c









FOCUSRITE SCARLETT GEN 2/3 MIXER DRIVER









M:	Geoffrey D. Bennett <g@b4.vu>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git









F:	sound/usb/mixer_scarlett_gen2.c

















FORCEDETH GIGABIT ETHERNET DRIVER









M:	Rain River <rain.1986.08.12@gmail.com>









M:	Zhu Yanjun <zyjzyj2000@gmail.com>
































drivers/soundwire/bus.c



+16
−1






























Original line number
Diff line number
Diff line







@@ -492,7 +492,7 @@ int sdw_read_no_pm(struct sdw_slave *slave, u32 addr)







}









EXPORT_SYMBOL(sdw_read_no_pm);



















static int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val)









int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val)









{









	int tmp;


















@@ -503,6 +503,21 @@ static int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val)







	tmp = (tmp & ~mask) | val;









	return sdw_write_no_pm(slave, addr, tmp);









}









EXPORT_SYMBOL(sdw_update_no_pm);



















/* Read-Modify-Write Slave register */









int sdw_update(struct sdw_slave *slave, u32 addr, u8 mask, u8 val)









{









	int tmp;



















	tmp = sdw_read(slave, addr);









	if (tmp < 0)









		return tmp;



















	tmp = (tmp & ~mask) | val;









	return sdw_write(slave, addr, tmp);









}









EXPORT_SYMBOL(sdw_update);



















/**









 * sdw_nread() - Read "n" contiguous SDW Slave registers
































drivers/soundwire/bus.h



+0
−13






























Original line number
Diff line number
Diff line







@@ -201,19 +201,6 @@ static inline void sdw_fill_port_params(struct sdw_port_params *params,







	params->data_mode = data_mode;









}



















/* Read-Modify-Write Slave register */









static inline int sdw_update(struct sdw_slave *slave, u32 addr, u8 mask, u8 val)









{









	int tmp;



















	tmp = sdw_read(slave, addr);









	if (tmp < 0)









		return tmp;



















	tmp = (tmp & ~mask) | val;









	return sdw_write(slave, addr, tmp);









}



















/* broadcast read/write for tests */









int sdw_bread_no_pm_unlocked(struct sdw_bus *bus, u16 dev_num, u32 addr);









int sdw_bwrite_no_pm_unlocked(struct sdw_bus *bus, u16 dev_num, u32 addr, u8 value);