Unverified Commit d38ebaf2 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

soundwire: export sdw_update() and sdw_update_no_pm() 



We currently export sdw_read() and sdw_write() but the sdw_update()
and sdw_update_no_pm() are currently available only to the bus
code. This was missed in an earlier contribution.

Export both functions so that codec drivers can perform
read-modify-write operations without duplicating the code.

Fixes: b04c975e ('soundwire: bus: use sdw_update_no_pm when initializing a device')
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <bard.liao@intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Acked-By: default avatarVinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20210614180815.153711-2-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fac165f2

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);