Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5850874c authored by Siva Rebbagondla's avatar Siva Rebbagondla Committed by Kalle Valo
Browse files

rsi: remove redundant device ids 



Removing redundant device id's from both usb and sdio idtables, as rsi
driver currently supporting only one module(RS9113). Also, replaced ids
with specific defines.

Signed-off-by: default avatarSiva Rebbagondla <siva.rebbagondla@redpinesignals.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 1d219456

drivers/net/wireless/rsi/rsi_91x_sdio.c

+1 −4
Original line number Diff line number Diff line
@@ -1394,10 +1394,7 @@ static const struct dev_pm_ops rsi_pm_ops = { 
#endif



static const struct sdio_device_id rsi_dev_table[] =  {

	{ SDIO_DEVICE(0x303, 0x100) },

	{ SDIO_DEVICE(0x041B, 0x0301) },

	{ SDIO_DEVICE(0x041B, 0x0201) },

	{ SDIO_DEVICE(0x041B, 0x9330) },

	{ SDIO_DEVICE(RSI_SDIO_VID_9113, RSI_SDIO_PID_9113) },

	{ /* Blank */},

};

drivers/net/wireless/rsi/rsi_91x_usb.c

+1 −5
Original line number Diff line number Diff line
@@ -835,11 +835,7 @@ static int rsi_resume(struct usb_interface *intf) 
#endif



static const struct usb_device_id rsi_dev_table[] = {

	{ USB_DEVICE(0x0303, 0x0100) },

	{ USB_DEVICE(0x041B, 0x0301) },

	{ USB_DEVICE(0x041B, 0x0201) },

	{ USB_DEVICE(0x041B, 0x9330) },

	{ USB_DEVICE(0x1618, 0x9113) },

	{ USB_DEVICE(RSI_USB_VID_9113, RSI_USB_PID_9113) },

	{ /* Blank */},

};

drivers/net/wireless/rsi/rsi_sdio.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
#include <linux/mmc/sdio_ids.h>

#include "rsi_main.h"



#define RSI_SDIO_VID_9113    0x041B

#define RSI_SDIO_PID_9113    0x9330



enum sdio_interrupt_type {

	BUFFER_FULL         = 0x0,

	BUFFER_AVAILABLE    = 0x2,

drivers/net/wireless/rsi/rsi_usb.h

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#include "rsi_main.h"

#include "rsi_common.h"



#define RSI_USB_VID_9113	0x1618

#define RSI_USB_PID_9113	0x9113



#define USB_INTERNAL_REG_1           0x25000

#define RSI_USB_READY_MAGIC_NUM      0xab

#define FW_STATUS_REG                0x41050012