| Message ID | 20221111021633.39908-2-yung-chuan.liao@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soundwire: revisit support for clock registers | expand |
On 11-11-22, 10:16, 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. > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Reviewed-by: Rander Wang <rander.wang@intel.com> > Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> > Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> > --- > drivers/soundwire/bus.c | 4 ++-- > include/linux/soundwire/sdw.h | 2 -- > sound/soc/codecs/rt1316-sdw.c | 1 - > sound/soc/codecs/rt711-sdca-sdw.c | 1 - The change lgtm, but needs ACK from Mark. Please split the ASoC bit to separate patch and copy Mark (that can be first patch here) > 4 files changed, 2 insertions(+), 6 deletions(-) > > 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 ed0a11436362..8b27401237f7 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/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c > index 4120842fe699..6ca8795eed68 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; > > -- > 2.25.1
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 ed0a11436362..8b27401237f7 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/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c index 4120842fe699..6ca8795eed68 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;