Hi Mark,
On 18-08-20, 22:06, Bard Liao wrote:
> From: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
>
> Add a slave-level property and program the SCP_INT1_MASK as desired by
> the codec driver. Since there is no DisCo property this has to be an
> implementation-specific firmware property or hard-coded in the driver.
>
> The only functionality change is that implementation-defined
> interrupts are no longer set for amplifiers - those interrupts are
> typically for jack detection or acoustic event detection/hotwording.
>
> Tested-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
> Reviewed-by: Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx>
> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@xxxxxxxxxxxxxxx>
> Signed-off-by: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx>
> ---
> drivers/soundwire/bus.c | 12 ++++++------
> include/linux/soundwire/sdw.h | 2 ++
> sound/soc/codecs/max98373-sdw.c | 3 +++
> sound/soc/codecs/rt1308-sdw.c | 2 ++
> sound/soc/codecs/rt5682-sdw.c | 4 ++++
> sound/soc/codecs/rt700-sdw.c | 4 ++++
> sound/soc/codecs/rt711-sdw.c | 4 ++++
> sound/soc/codecs/rt715-sdw.c | 4 ++++
> sound/soc/codecs/wsa881x.c | 1 +
This touches codecs, can you Ack it please
Ideally this should have been split up to header, the codec updates and
finally the bus change!
> 9 files changed, 30 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
> index e6e0fb9a81b4..3b6a87bc254e 100644
> --- a/drivers/soundwire/bus.c
> +++ b/drivers/soundwire/bus.c
> @@ -1184,13 +1184,13 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
> return ret;
>
> /*
> - * Set bus clash, parity and SCP implementation
> - * defined interrupt mask
> - * TODO: Read implementation defined interrupt mask
> - * from Slave property
> + * Set SCP_INT1_MASK register, typically bus clash and
> + * implementation-defined interrupt mask. The Parity detection
> + * may not always be correct on startup so its use is
> + * device-dependent, it might e.g. only be enabled in
> + * steady-state after a couple of frames.
> */
> - val = SDW_SCP_INT1_IMPL_DEF | SDW_SCP_INT1_BUS_CLASH |
> - SDW_SCP_INT1_PARITY;
> + val = slave->prop.scp_int1_mask;
>
> /* Enable SCP interrupts */
> ret = sdw_update(slave, SDW_SCP_INTMASK1, val, val);
> diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
> index 76052f12c9f7..6d91f2ca20b2 100644
> --- a/include/linux/soundwire/sdw.h
> +++ b/include/linux/soundwire/sdw.h
> @@ -355,6 +355,7 @@ struct sdw_dpn_prop {
> * @dp0_prop: Data Port 0 properties
> * @src_dpn_prop: Source Data Port N properties
> * @sink_dpn_prop: Sink Data Port N properties
> + * @scp_int1_mask: SCP_INT1_MASK desired settings
> */
> struct sdw_slave_prop {
> u32 mipi_revision;
> @@ -376,6 +377,7 @@ struct sdw_slave_prop {
> struct sdw_dp0_prop *dp0_prop;
> struct sdw_dpn_prop *src_dpn_prop;
> struct sdw_dpn_prop *sink_dpn_prop;
> + u8 scp_int1_mask;
> };
>
> /**
> diff --git a/sound/soc/codecs/max98373-sdw.c b/sound/soc/codecs/max98373-sdw.c
> index 5fe724728e84..17fd1989e873 100644
> --- a/sound/soc/codecs/max98373-sdw.c
> +++ b/sound/soc/codecs/max98373-sdw.c
> @@ -15,6 +15,7 @@
> #include <linux/of.h>
> #include <linux/soundwire/sdw.h>
> #include <linux/soundwire/sdw_type.h>
> +#include <linux/soundwire/sdw_registers.h>
> #include "max98373.h"
> #include "max98373-sdw.h"
>
> @@ -287,6 +288,8 @@ static int max98373_read_prop(struct sdw_slave *slave)
> unsigned long addr;
> struct sdw_dpn_prop *dpn;
>
> + prop->scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY;
> +
> /* BITMAP: 00001000 Dataport 3 is active */
> prop->source_ports = BIT(3);
> /* BITMAP: 00000010 Dataport 1 is active */
> diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c
> index b0ba0d2acbdd..5cf10fd447eb 100644
> --- a/sound/soc/codecs/rt1308-sdw.c
> +++ b/sound/soc/codecs/rt1308-sdw.c
> @@ -123,6 +123,8 @@ static int rt1308_read_prop(struct sdw_slave *slave)
> unsigned long addr;
> struct sdw_dpn_prop *dpn;
>
> + prop->scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY;
> +
> prop->paging_support = true;
>
> /* first we need to allocate memory for set bits in port lists */
> diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c
> index 94bf6bee78e6..544073975020 100644
> --- a/sound/soc/codecs/rt5682-sdw.c
> +++ b/sound/soc/codecs/rt5682-sdw.c
> @@ -19,6 +19,7 @@
> #include <linux/mutex.h>
> #include <linux/soundwire/sdw.h>
> #include <linux/soundwire/sdw_type.h>
> +#include <linux/soundwire/sdw_registers.h>
> #include <sound/core.h>
> #include <sound/pcm.h>
> #include <sound/pcm_params.h>
> @@ -542,6 +543,9 @@ static int rt5682_read_prop(struct sdw_slave *slave)
> unsigned long addr;
> struct sdw_dpn_prop *dpn;
>
> + prop->scp_int1_mask = SDW_SCP_INT1_IMPL_DEF | SDW_SCP_INT1_BUS_CLASH |
> + SDW_SCP_INT1_PARITY;
> +
> prop->paging_support = false;
>
> /* first we need to allocate memory for set bits in port lists */
> diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c
> index 4d14048d1197..a46b957a3f1b 100644
> --- a/sound/soc/codecs/rt700-sdw.c
> +++ b/sound/soc/codecs/rt700-sdw.c
> @@ -11,6 +11,7 @@
> #include <linux/mod_devicetable.h>
> #include <linux/soundwire/sdw.h>
> #include <linux/soundwire/sdw_type.h>
> +#include <linux/soundwire/sdw_registers.h>
> #include <linux/module.h>
> #include <linux/regmap.h>
> #include <sound/soc.h>
> @@ -338,6 +339,9 @@ static int rt700_read_prop(struct sdw_slave *slave)
> unsigned long addr;
> struct sdw_dpn_prop *dpn;
>
> + prop->scp_int1_mask = SDW_SCP_INT1_IMPL_DEF | SDW_SCP_INT1_BUS_CLASH |
> + SDW_SCP_INT1_PARITY;
> +
> prop->paging_support = false;
>
> /* first we need to allocate memory for set bits in port lists */
> diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c
> index 45b928954b58..a877e366fec5 100644
> --- a/sound/soc/codecs/rt711-sdw.c
> +++ b/sound/soc/codecs/rt711-sdw.c
> @@ -11,6 +11,7 @@
> #include <linux/mod_devicetable.h>
> #include <linux/soundwire/sdw.h>
> #include <linux/soundwire/sdw_type.h>
> +#include <linux/soundwire/sdw_registers.h>
> #include <linux/module.h>
> #include <linux/regmap.h>
> #include <sound/soc.h>
> @@ -342,6 +343,9 @@ static int rt711_read_prop(struct sdw_slave *slave)
> unsigned long addr;
> struct sdw_dpn_prop *dpn;
>
> + prop->scp_int1_mask = SDW_SCP_INT1_IMPL_DEF | SDW_SCP_INT1_BUS_CLASH |
> + SDW_SCP_INT1_PARITY;
> +
> prop->paging_support = false;
>
> /* first we need to allocate memory for set bits in port lists */
> diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c
> index d11b23d6b240..0eb8943ed6ff 100644
> --- a/sound/soc/codecs/rt715-sdw.c
> +++ b/sound/soc/codecs/rt715-sdw.c
> @@ -12,6 +12,7 @@
> #include <linux/mod_devicetable.h>
> #include <linux/soundwire/sdw.h>
> #include <linux/soundwire/sdw_type.h>
> +#include <linux/soundwire/sdw_registers.h>
> #include <linux/module.h>
> #include <linux/of.h>
> #include <linux/regmap.h>
> @@ -436,6 +437,9 @@ static int rt715_read_prop(struct sdw_slave *slave)
> unsigned long addr;
> struct sdw_dpn_prop *dpn;
>
> + prop->scp_int1_mask = SDW_SCP_INT1_IMPL_DEF | SDW_SCP_INT1_BUS_CLASH |
> + SDW_SCP_INT1_PARITY;
> +
> prop->paging_support = false;
>
> /* first we need to allocate memory for set bits in port lists */
> diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c
> index d39d479e2378..68e774e69c85 100644
> --- a/sound/soc/codecs/wsa881x.c
> +++ b/sound/soc/codecs/wsa881x.c
> @@ -1112,6 +1112,7 @@ static int wsa881x_probe(struct sdw_slave *pdev,
> wsa881x->sconfig.type = SDW_STREAM_PDM;
> pdev->prop.sink_ports = GENMASK(WSA881X_MAX_SWR_PORTS, 0);
> pdev->prop.sink_dpn_prop = wsa_sink_dpn_prop;
> + pdev->prop.scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY;
> gpiod_direction_output(wsa881x->sd_n, 1);
>
> wsa881x->regmap = devm_regmap_init_sdw(pdev, &wsa881x_regmap_config);
> --
> 2.17.1
--
~Vinod
