mt76: usb: add req_type to ___mt76u_wr signature

This is a preliminary patch to add usb support to mt7921 driver.

Tested-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 1b0435e..4b7a816 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -121,16 +121,14 @@ static u32 mt76u_rr_ext(struct mt76_dev *dev, u32 addr)
        return ret;
 }
 
-static void ___mt76u_wr(struct mt76_dev *dev, u8 req,
+static void ___mt76u_wr(struct mt76_dev *dev, u8 req, u8 req_type,
                        u32 addr, u32 val)
 {
        struct mt76_usb *usb = &dev->usb;
 
        put_unaligned_le32(val, usb->data);
-       __mt76u_vendor_request(dev, req,
-                              USB_DIR_OUT | USB_TYPE_VENDOR,
-                              addr >> 16, addr, usb->data,
-                              sizeof(__le32));
+       __mt76u_vendor_request(dev, req, req_type, addr >> 16,
+                              addr, usb->data, sizeof(__le32));
        trace_usb_reg_wr(dev, addr, val);
 }
 
@@ -146,7 +144,8 @@ static void __mt76u_wr(struct mt76_dev *dev, u32 addr, u32 val)
                req = MT_VEND_MULTI_WRITE;
                break;
        }
-       ___mt76u_wr(dev, req, addr & ~MT_VEND_TYPE_MASK, val);
+       ___mt76u_wr(dev, req, USB_DIR_OUT | USB_TYPE_VENDOR,
+                   addr & ~MT_VEND_TYPE_MASK, val);
 }
 
 static void mt76u_wr(struct mt76_dev *dev, u32 addr, u32 val)
@@ -159,7 +158,8 @@ static void mt76u_wr(struct mt76_dev *dev, u32 addr, u32 val)
 static void mt76u_wr_ext(struct mt76_dev *dev, u32 addr, u32 val)
 {
        mutex_lock(&dev->usb.usb_ctrl_mtx);
-       ___mt76u_wr(dev, MT_VEND_WRITE_EXT, addr, val);
+       ___mt76u_wr(dev, MT_VEND_WRITE_EXT,
+                   USB_DIR_OUT | USB_TYPE_VENDOR, addr, val);
        mutex_unlock(&dev->usb.usb_ctrl_mtx);
 }
 
@@ -180,7 +180,8 @@ static u32 mt76u_rmw_ext(struct mt76_dev *dev, u32 addr,
        mutex_lock(&dev->usb.usb_ctrl_mtx);
        val |= ___mt76u_rr(dev, MT_VEND_READ_EXT,
                           USB_DIR_IN | USB_TYPE_VENDOR, addr) & ~mask;
-       ___mt76u_wr(dev, MT_VEND_WRITE_EXT, addr, val);
+       ___mt76u_wr(dev, MT_VEND_WRITE_EXT,
+                   USB_DIR_OUT | USB_TYPE_VENDOR, addr, val);
        mutex_unlock(&dev->usb.usb_ctrl_mtx);
 
        return val;