Re: [PATCH v3 8/9] soundwire: qcom: add auto enumeration support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On 08/03/2021 15:56, Pierre-Louis Bossart wrote:

+static int qcom_swrm_enumerate(struct sdw_bus *bus)
+{
+    struct qcom_swrm_ctrl *ctrl = to_qcom_sdw(bus);
+    struct sdw_slave *slave, *_s;
+    struct sdw_slave_id id;
+    u32 val1, val2;
+    bool found;
+    u64 addr;
+    int i;
+    char *buf1 = (char *)&val1, *buf2 = (char *)&val2;
+
+    for (i = 1; i <= SDW_MAX_DEVICES; i++) {
+        /*SCP_Devid5 - Devid 4*/
+        ctrl->reg_read(ctrl, SWRM_ENUMERATOR_SLAVE_DEV_ID_1(i), &val1);
+
+        /*SCP_Devid3 - DevId 2 Devid 1 Devid 0*/
+        ctrl->reg_read(ctrl, SWRM_ENUMERATOR_SLAVE_DEV_ID_2(i), &val2);
+
+        if (!val1 && !val2)
+            break;
+
+        addr = buf2[1] | (buf2[0] << 8) | (buf1[3] << 16) |
+            ((u64)buf1[2] << 24) | ((u64)buf1[1] << 32) |
+            ((u64)buf1[0] << 40);
+
+        sdw_extract_slave_id(bus, addr, &id);
+        found = false;
+        /* Now compare with entries */
+        list_for_each_entry_safe(slave, _s, &bus->slaves, node) {
+            if (sdw_compare_devid(slave, id) == 0) {
+                u32 status = qcom_swrm_get_n_device_status(ctrl, i);
+
+                found = true;
+                if (status == SDW_SLAVE_ATTACHED) {
+                    slave->dev_num = i;
+                    mutex_lock(&bus->bus_lock);
+                    set_bit(i, bus->assigned);
+                    mutex_unlock(&bus->bus_lock);
+
+                }

you haven't changed that part, if the device is not in DT we should still set bus->assigned::i

My bad! I missed it again!

Will fix it in next spin!


--srini



[Index of Archives]     [ALSA User]     [Linux Audio Users]     [Pulse Audio]     [Kernel Archive]     [Asterisk PBX]     [Photo Sharing]     [Linux Sound]     [Video 4 Linux]     [Gimp]     [Yosemite News]

  Powered by Linux