soundwire: rename/clarify MIPI DisCo properties
The existing definitions are ambiguous and possibly misleading. For DP0, 'flow-control' is only relevant for the BRA protocol and should not be confused with async modes explicitly not supported for DP0, add prefix to follow MIPI DisCo definition The use of 'device_interrupts' is also questionable. The MIPI SoundWire spec defines Slave-, DP0- and DPN-level implementation-defined interrupts. Using the 'device' prefix in the last two cases is misleading, not only is the term 'device' overloaded but these properties are only valid at the DP0 and DPn levels. Rename to follow the MIPI definitions, no need to be creative here. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Vinod Koul <vkoul@kernel.org>
Šī revīzija ir iekļauta:

revīziju iesūtīja
Vinod Koul

vecāks
f6686a7d02
revīzija
8acbbfec28
@@ -648,7 +648,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
|
||||
return 0;
|
||||
|
||||
/* Enable DP0 interrupts */
|
||||
val = prop->dp0_prop->device_interrupts;
|
||||
val = prop->dp0_prop->imp_def_interrupts;
|
||||
val |= SDW_DP0_INT_PORT_READY | SDW_DP0_INT_BRA_FAILURE;
|
||||
|
||||
ret = sdw_update(slave, SDW_DP0_INTMASK, val, val);
|
||||
|
@@ -150,13 +150,13 @@ static int sdw_slave_read_dp0(struct sdw_slave *slave,
|
||||
dp0->words, dp0->num_words);
|
||||
}
|
||||
|
||||
dp0->flow_controlled = fwnode_property_read_bool(port,
|
||||
dp0->BRA_flow_controlled = fwnode_property_read_bool(port,
|
||||
"mipi-sdw-bra-flow-controlled");
|
||||
|
||||
dp0->simple_ch_prep_sm = fwnode_property_read_bool(port,
|
||||
"mipi-sdw-simplified-channel-prepare-sm");
|
||||
|
||||
dp0->device_interrupts = fwnode_property_read_bool(port,
|
||||
dp0->imp_def_interrupts = fwnode_property_read_bool(port,
|
||||
"mipi-sdw-imp-def-dp0-interrupts-supported");
|
||||
|
||||
return 0;
|
||||
@@ -225,7 +225,7 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave,
|
||||
|
||||
fwnode_property_read_u32(node,
|
||||
"mipi-sdw-imp-def-dpn-interrupts-supported",
|
||||
&dpn[i].device_interrupts);
|
||||
&dpn[i].imp_def_interrupts);
|
||||
|
||||
fwnode_property_read_u32(node, "mipi-sdw-min-channel-number",
|
||||
&dpn[i].min_ch);
|
||||
|
@@ -439,7 +439,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,
|
||||
|
||||
prep_ch.bank = bus->params.next_bank;
|
||||
|
||||
if (dpn_prop->device_interrupts || !dpn_prop->simple_ch_prep_sm)
|
||||
if (dpn_prop->imp_def_interrupts || !dpn_prop->simple_ch_prep_sm)
|
||||
intr = true;
|
||||
|
||||
/*
|
||||
@@ -449,7 +449,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,
|
||||
*/
|
||||
if (prep && intr) {
|
||||
ret = sdw_configure_dpn_intr(s_rt->slave, p_rt->num, prep,
|
||||
dpn_prop->device_interrupts);
|
||||
dpn_prop->imp_def_interrupts);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
@@ -493,7 +493,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,
|
||||
/* Disable interrupt after Port de-prepare */
|
||||
if (!prep && intr)
|
||||
ret = sdw_configure_dpn_intr(s_rt->slave, p_rt->num, prep,
|
||||
dpn_prop->device_interrupts);
|
||||
dpn_prop->imp_def_interrupts);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user