Commit be505ba8 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

ASoC/soundwire: remove is_sdca boolean property 



The Device_ID registers already tell us if a device supports the SDCA
specification or not, in hindsight we never needed a property when the
information is reported by both hardware and ACPI.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20221118025807.534863-2-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 0603a47b

drivers/soundwire/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave) 
		goto io_err;

	}



	if (slave->prop.is_sdca) {

	if (slave->id.class_id) {

		ret = sdw_read_no_pm(slave, SDW_DP0_INT);

		if (ret < 0) {

			dev_err(&slave->dev,
@@ -1724,7 +1724,7 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave) 
			goto io_err;

		}



		if (slave->prop.is_sdca) {

		if (slave->id.class_id) {

			ret = sdw_read_no_pm(slave, SDW_DP0_INT);

			if (ret < 0) {

				dev_err(&slave->dev,

include/linux/soundwire/sdw.h

+0 −2
Original line number Diff line number Diff line
@@ -365,7 +365,6 @@ struct sdw_dpn_prop { 
 * @sink_dpn_prop: Sink Data Port N properties

 * @scp_int1_mask: SCP_INT1_MASK desired settings

 * @quirks: bitmask identifying deltas from the MIPI specification

 * @is_sdca: the Slave supports the SDCA specification

 */

struct sdw_slave_prop {

	u32 mipi_revision;
@@ -389,7 +388,6 @@ struct sdw_slave_prop { 
	struct sdw_dpn_prop *sink_dpn_prop;

	u8 scp_int1_mask;

	u32 quirks;

	bool is_sdca;

};



#define SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY	BIT(0)

sound/soc/codecs/rt1316-sdw.c

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ static int rt1316_read_prop(struct sdw_slave *slave) 


	prop->scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY;

	prop->quirks = SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY;

	prop->is_sdca = true;



	prop->paging_support = true;

sound/soc/codecs/rt1318-sdw.c

+0 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ static int rt1318_read_prop(struct sdw_slave *slave) 


	prop->scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY;

	prop->quirks = SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY;

	prop->is_sdca = true;



	prop->paging_support = true;

sound/soc/codecs/rt711-sdca-sdw.c

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ static int rt711_sdca_read_prop(struct sdw_slave *slave) 


	prop->scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY;

	prop->quirks = SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY;

	prop->is_sdca = true;



	prop->paging_support = true;