| Message ID | 20221118025807.534863-2-yung-chuan.liao@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/2] ASoC/soundwire: remove is_sdca boolean property | expand |
On 18-11-22, 15:39, Mark Brown wrote: > On Fri, Nov 18, 2022 at 10:58:06AM +0800, Bard Liao wrote: > > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > > > > 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. > > Acked-by: Mark Brown <broonie@kernel.org> Hey Mark, sound/soc/codecs/rt1318-sdw.c does not exist for me in sdw/next. Can I get a tag for the changes merged into ASoC for this Thanks
On Wed, Nov 23, 2022 at 08:22:14PM +0530, Vinod Koul wrote: > On 18-11-22, 15:39, Mark Brown wrote: > > On Fri, Nov 18, 2022 at 10:58:06AM +0800, Bard Liao wrote: > > > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > > > 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. > > Acked-by: Mark Brown <broonie@kernel.org> > sound/soc/codecs/rt1318-sdw.c does not exist for me in sdw/next. Can I > get a tag for the changes merged into ASoC for this Not reasonably, that's basically the entire tree since Linus doesn't like branches.
On 23-11-22, 15:25, Mark Brown wrote: > On Wed, Nov 23, 2022 at 08:22:14PM +0530, Vinod Koul wrote: > > On 18-11-22, 15:39, Mark Brown wrote: > > > On Fri, Nov 18, 2022 at 10:58:06AM +0800, Bard Liao wrote: > > > > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > > > > > 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. > > > > Acked-by: Mark Brown <broonie@kernel.org> > > > sound/soc/codecs/rt1318-sdw.c does not exist for me in sdw/next. Can I > > get a tag for the changes merged into ASoC for this > > Not reasonably, that's basically the entire tree since Linus doesn't > like branches. Okay. Anyway we are close to merge window, lets postpone this after that Thanks
diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 76515c33e639..c23275b443ac 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -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, diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index 9e4537f409c2..8fb458931772 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -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) diff --git a/sound/soc/codecs/rt1316-sdw.c b/sound/soc/codecs/rt1316-sdw.c index 2db7ee6c6d33..fbc7e9c0254d 100644 --- a/sound/soc/codecs/rt1316-sdw.c +++ b/sound/soc/codecs/rt1316-sdw.c @@ -203,7 +203,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; diff --git a/sound/soc/codecs/rt1318-sdw.c b/sound/soc/codecs/rt1318-sdw.c index f85f5ab2c6d0..8bc379215c34 100644 --- a/sound/soc/codecs/rt1318-sdw.c +++ b/sound/soc/codecs/rt1318-sdw.c @@ -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; diff --git a/sound/soc/codecs/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c index 88a8392a58ed..693e11ed8d08 100644 --- a/sound/soc/codecs/rt711-sdca-sdw.c +++ b/sound/soc/codecs/rt711-sdca-sdw.c @@ -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;