diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index 519ef14a8f4955..e113ecc7e4af15 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -1996,12 +1996,21 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
 			 unsigned int num_ports,
 			 struct sdw_stream_runtime *stream)
 {
+	struct sdw_slave_prop *slave_prop = &slave->prop;
+	int available_bandwidth[SDW_MAX_LANES];
+	struct sdw_bus *bus = slave->bus;
 	struct sdw_slave_runtime *s_rt;
 	struct sdw_master_runtime *m_rt;
+	struct sdw_port_runtime *p_rt;
 	bool alloc_master_rt = false;
 	bool alloc_slave_rt = false;
-
+	int lane[SDW_MAX_LANES];
+	int required_bandwidth;
+	int port_index = 0;
+	int ch_count;
+	int m_lane;
 	int ret;
+	int i;
 
 	mutex_lock(&slave->bus->bus_lock);
 
@@ -2045,6 +2054,40 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
 			goto alloc_error;
 	}
 
+	slave_prop = &s_rt->slave->prop;
+	if (!slave_prop->lane_control_support)
+		goto skip_lane_allocation;
+
+	for (i = 0; i < SDW_MAX_LANES; i++)
+		available_bandwidth[i] = bus->params.max_dr_freq - bus->params.bandwidth[i];
+
+	/* find available lane */
+	for (port_index = 0; port_index < num_ports; port_index++) {
+		ch_count = hweight32(port_config[port_index].ch_mask);
+		required_bandwidth = stream_config->frame_rate * ch_count *
+				     stream_config->bps;
+		for (i = 0; i < SDW_MAX_LANES; i++) {
+			if (!(port_config[port_index].lane_mask & BIT(i)))
+				continue;
+
+			m_lane = slave_prop->lane_maps[i];
+			/* Check if m_lane has enough bandwidth */
+			if (available_bandwidth[m_lane] >= required_bandwidth) {
+				lane[port_index] = i;
+				available_bandwidth[m_lane] -= required_bandwidth;
+				break;
+			}
+		}
+		if (i == SDW_MAX_LANES) {
+			ret = -EINVAL;
+			dev_err(&slave->dev, "No available lane for port %d\n",
+				port_config[port_index].num);
+			goto unlock;
+		}
+	}
+
+skip_lane_allocation:
+
 	ret =  sdw_master_rt_config(m_rt, stream_config);
 	if (ret)
 		goto unlock;
@@ -2061,6 +2104,13 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
 	if (ret)
 		goto unlock;
 
+	/* p_rt->lane will not be set in sdw_slave_port_config, set it here */
+	i = 0;
+	list_for_each_entry(p_rt, &s_rt->port_list, port_node) {
+		p_rt->lane = lane[i];
+		i++;
+	}
+
 	/*
 	 * Change stream state to CONFIGURED on first Slave add.
 	 * Bus is not aware of number of Slave(s) in a stream at this