Skip to content

Commit 1cfd8c2

Browse files
committed
Merge remote-tracking branch 'soundwire/next' into sound/upstream-20260304
2 parents ae78467 + 4b8fc2b commit 1cfd8c2

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

drivers/soundwire/intel_auxdevice.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ struct wake_capable_part {
5353
static struct wake_capable_part wake_capable_list[] = {
5454
{0x01fa, 0x4243},
5555
{0x01fa, 0x4245},
56+
{0x01fa, 0x4747},
5657
{0x025d, 0x5682},
5758
{0x025d, 0x700},
5859
{0x025d, 0x711},

drivers/soundwire/slave.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ static bool find_slave(struct sdw_bus *bus,
115115
u64 addr;
116116
int ret;
117117

118+
if (acpi_bus_get_status(adev) || !acpi_dev_ready_for_enumeration(adev))
119+
return false;
120+
118121
ret = acpi_get_local_u64_address(adev->handle, &addr);
119122
if (ret < 0)
120123
return false;

include/linux/soundwire/sdw.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ struct sdw_slave_intr_status {
532532
};
533533

534534
/**
535-
* sdw_reg_bank - SoundWire register banks
535+
* enum sdw_reg_bank - SoundWire register banks
536536
* @SDW_BANK0: Soundwire register bank 0
537537
* @SDW_BANK1: Soundwire register bank 1
538538
*/
@@ -751,7 +751,7 @@ struct sdw_port_params {
751751
* struct sdw_transport_params: Data Port Transport Parameters
752752
*
753753
* @blk_grp_ctrl_valid: Port implements block group control
754-
* @num: Port number
754+
* @port_num: Port number
755755
* @blk_grp_ctrl: Block group control value
756756
* @sample_interval: Sample interval
757757
* @offset1: Blockoffset of the payload data
@@ -782,7 +782,7 @@ struct sdw_transport_params {
782782
/**
783783
* struct sdw_enable_ch: Enable/disable Data Port channel
784784
*
785-
* @num: Port number
785+
* @port_num: Port number
786786
* @ch_mask: Active channel mask
787787
* @enable: Enable (true) /disable (false) channel
788788
*/
@@ -885,7 +885,7 @@ void sdw_bus_master_delete(struct sdw_bus *bus);
885885
void sdw_show_ping_status(struct sdw_bus *bus, bool sync_delay);
886886

887887
/**
888-
* sdw_port_config: Master or Slave Port configuration
888+
* struct sdw_port_config: Master or Slave Port configuration
889889
*
890890
* @num: Port number
891891
* @ch_mask: channels mask for port
@@ -896,7 +896,7 @@ struct sdw_port_config {
896896
};
897897

898898
/**
899-
* sdw_stream_config: Master or Slave stream configuration
899+
* struct sdw_stream_config: Master or Slave stream configuration
900900
*
901901
* @frame_rate: Audio frame rate of the stream, in Hz
902902
* @ch_count: Channel count of the stream
@@ -913,7 +913,7 @@ struct sdw_stream_config {
913913
};
914914

915915
/**
916-
* sdw_stream_state: Stream states
916+
* enum sdw_stream_state: Stream states
917917
*
918918
* @SDW_STREAM_ALLOCATED: New stream allocated.
919919
* @SDW_STREAM_CONFIGURED: Stream configured
@@ -934,7 +934,7 @@ enum sdw_stream_state {
934934
};
935935

936936
/**
937-
* sdw_stream_params: Stream parameters
937+
* struct sdw_stream_params: Stream parameters
938938
*
939939
* @rate: Sampling frequency, in Hz
940940
* @ch_count: Number of channels
@@ -947,7 +947,7 @@ struct sdw_stream_params {
947947
};
948948

949949
/**
950-
* sdw_stream_runtime: Runtime stream parameters
950+
* struct sdw_stream_runtime: Runtime stream parameters
951951
*
952952
* @name: SoundWire stream name
953953
* @params: Stream parameters
@@ -983,7 +983,7 @@ struct sdw_stream_runtime {
983983
* @defer_msg: Defer message
984984
* @params: Current bus parameters
985985
* @stream_refcount: number of streams currently using this bus
986-
* @btp_stream_refcount: number of BTP streams currently using this bus (should
986+
* @bpt_stream_refcount: number of BTP streams currently using this bus (should
987987
* be zero or one, multiple streams per link is not supported).
988988
* @bpt_stream: pointer stored to handle BTP streams.
989989
* @ops: Master callback ops

0 commit comments

Comments
 (0)