Skip to content

Commit

Permalink
Revert "soundwire: mipi-disco: add new properties from 2.0 spec"
Browse files Browse the repository at this point in the history
This reverts commit e87ce12.
  • Loading branch information
bardliao committed Sep 11, 2024
1 parent 46d9f99 commit 01d84e0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
13 changes: 0 additions & 13 deletions drivers/soundwire/mipi_disco.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,19 +430,6 @@ int sdw_slave_read_prop(struct sdw_slave *slave)
device_property_read_u32(dev, "mipi-sdw-sink-port-list",
&prop->sink_ports);

device_property_read_u32(dev, "mipi-sdw-sdca-interrupt-register-list",
&prop->sdca_interrupt_register_list);

/*
* The specification defines the property value as boolean, but
* the value can be defined as zero. This is not aligned the
* implementation of device_property_read_bool() which only checks
* the presence of the property.
* Let's use read_u8 to work-around this conceptual disconnect.
*/
device_property_read_u8(dev, "mipi-sdw-commit-register-supported",
&prop->commit_register_supported);

/*
* Read dp0 properties - we don't rely on the 'mipi-sdw-dp-0-supported'
* property since the 'mipi-sdw-dp0-subproperties' property is logically
Expand Down
7 changes: 1 addition & 6 deletions include/linux/soundwire/sdw.h
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,8 @@ struct sdw_dpn_prop {
* @master_count: Number of Masters present on this Slave
* @source_ports: Bitmap identifying source ports
* @sink_ports: Bitmap identifying sink ports
* @quirks: bitmask identifying deltas from the MIPI specification
* @sdca_interrupt_register_list: indicates which sets of SDCA interrupt status
* and masks are supported
* @commit_register_supported: is PCP_Commit register supported
* @scp_int1_mask: SCP_INT1_MASK desired settings
* @quirks: bitmask identifying deltas from the MIPI specification
* @clock_reg_supported: the Peripheral implements the clock base and scale
* registers introduced with the SoundWire 1.2 specification. SDCA devices
* do not need to set this boolean property as the registers are required.
Expand All @@ -374,8 +371,6 @@ struct sdw_slave_prop {
u32 source_ports;
u32 sink_ports;
u32 quirks;
u32 sdca_interrupt_register_list;
u8 commit_register_supported;
u8 scp_int1_mask;
bool clock_reg_supported;
bool use_domain_irq;
Expand Down

0 comments on commit 01d84e0

Please sign in to comment.