Unverified Commit c073a58a authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus

parents 13311e74 a7a0a2fe

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

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -7354,7 +7354,6 @@ F: drivers/net/ethernet/freescale/fs_enet/ 
F:	include/linux/fs_enet_pd.h









FREESCALE SOC SOUND DRIVERS









M:	Timur Tabi <timur@kernel.org>









M:	Nicolin Chen <nicoleotsuka@gmail.com>









M:	Xiubo Li <Xiubo.Lee@gmail.com>









R:	Fabio Estevam <festevam@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);
































include/linux/soundwire/sdw.h



+3
−0






























Original line number
Diff line number
Diff line







@@ -1041,6 +1041,9 @@ int sdw_write_no_pm(struct sdw_slave *slave, u32 addr, u8 value);







int sdw_read_no_pm(struct sdw_slave *slave, u32 addr);









int sdw_nread(struct sdw_slave *slave, u32 addr, size_t count, u8 *val);









int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, u8 *val);









int sdw_update(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 sdw_compare_devid(struct sdw_slave *slave, struct sdw_slave_id id);









void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id);