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

Commit 51def0be authored by Tomas Winkler's avatar Tomas Winkler Committed by David S. Miller
Browse files

imwc3200: move iwmc3200 SDIO ids to sdio_ids.h 



1. add intel's sdio vendor id to sdio_ids.h
2. move iwmc3200 sdio devices' ids to sdio_ids.h

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1896e61f

drivers/net/wimax/i2400m/sdio.c

+5 −7
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
 */



#include <linux/debugfs.h>

#include <linux/mmc/sdio_ids.h>

#include <linux/mmc/sdio.h>

#include <linux/mmc/sdio_func.h>

#include "i2400m-sdio.h"
@@ -501,15 +502,12 @@ void i2400ms_remove(struct sdio_func *func) 
	d_fnend(3, dev, "SDIO func %p\n", func);

}



enum {

	I2400MS_INTEL_VID = 0x89,

};



static

const struct sdio_device_id i2400ms_sdio_ids[] = {

	/* Intel: i2400m WiMAX over SDIO */

	{ SDIO_DEVICE(I2400MS_INTEL_VID, 0x1402) },

	{ }, 			/* end: all zeroes */

	/* Intel: i2400m WiMAX (iwmc3200) over SDIO */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,

		      SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX) },

	{ /* end: all zeroes */ },

};

MODULE_DEVICE_TABLE(sdio, i2400ms_sdio_ids);

drivers/net/wireless/iwmc3200wifi/sdio.c

+3 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <linux/debugfs.h>

#include <linux/mmc/sdio_ids.h>

#include <linux/mmc/sdio.h>

#include <linux/mmc/sdio_func.h>
@@ -492,7 +493,8 @@ static void iwm_sdio_remove(struct sdio_func *func) 
}



static const struct sdio_device_id iwm_sdio_ids[] = {

	{ SDIO_DEVICE(SDIO_VENDOR_ID_INTEL, SDIO_DEVICE_ID_IWM) },

	{ SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,

		      SDIO_DEVICE_ID_INTEL_IWMC3200WIFI) },

	{ /* end: all zeroes */	},

};

MODULE_DEVICE_TABLE(sdio, iwm_sdio_ids);

drivers/net/wireless/iwmc3200wifi/sdio.h

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ 
#ifndef __IWM_SDIO_H__

#define __IWM_SDIO_H__



#define SDIO_VENDOR_ID_INTEL 0x89

#define SDIO_DEVICE_ID_IWM   0x1403



#define IWM_SDIO_DATA_ADDR           0x0

#define IWM_SDIO_INTR_ENABLE_ADDR    0x14

#define IWM_SDIO_INTR_STATUS_ADDR    0x13

include/linux/mmc/sdio_ids.h

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ 
/*

 * Vendors and devices.  Sort key: vendor first, device next.

 */

#define SDIO_VENDOR_ID_INTEL			0x0089

#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX	0x1402

#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI	0x1403

#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP	0x1404

#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS	0x1405

#define SDIO_DEVICE_ID_INTEL_IWMC3200BT		0x1406



#define SDIO_VENDOR_ID_MARVELL			0x02df

#define SDIO_DEVICE_ID_MARVELL_LIBERTAS		0x9103