Commit 8930c8aa authored by Takashi Iwai's avatar Takashi Iwai Committed by Linus Torvalds
Browse files

memstick: add support for JMicron JMB 385 and 390 controllers 



Signed-off-by: default avatarAries Lee <arieslee@jmicron.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Cc: Alex Dubov <oakad@yahoo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 68860b96

drivers/memstick/host/jmb38x_ms.c

+15 −2
Original line number Diff line number Diff line
@@ -765,6 +765,8 @@ static int jmb38x_ms_set_param(struct memstick_host *msh, 
#define  PMOS0_SW_LED_POLARITY_ENABLE	0x80

#define  PMOS0_ACTIVE_BITS (PMOS0_ENABLE | PMOS0_EN_OVERCURRENT_DEBOUNCE | \

			    PMOS0_OVERCURRENT_LEVEL_2_4V)

#define PCI_PMOS1_CONTROL		0xbd

#define  PMOS1_ACTIVE_BITS		0x4a

#define PCI_CLOCK_CTL			0xb9



static int jmb38x_ms_pmos(struct pci_dev *pdev, int flag)
@@ -779,6 +781,16 @@ static int jmb38x_ms_pmos(struct pci_dev *pdev, int flag) 
	pci_write_config_byte(pdev, PCI_PMOS0_CONTROL, val);

	dev_dbg(&pdev->dev, "JMB38x: set PMOS0 val 0x%x\n", val);



	if (pci_resource_flags(pdev, 1)) {

		pci_read_config_byte(pdev, PCI_PMOS1_CONTROL, &val);

		if (flag)

			val |= PMOS1_ACTIVE_BITS;

		else

			val &= ~PMOS1_ACTIVE_BITS;

		pci_write_config_byte(pdev, PCI_PMOS1_CONTROL, val);

		dev_dbg(&pdev->dev, "JMB38x: set PMOS1 val 0x%x\n", val);

	}



	pci_read_config_byte(pdev, PCI_CLOCK_CTL, &val);

	pci_write_config_byte(pdev, PCI_CLOCK_CTL, val & ~0x0f);

	pci_write_config_byte(pdev, PCI_CLOCK_CTL, val | 0x01);
@@ -1018,8 +1030,9 @@ static void jmb38x_ms_remove(struct pci_dev *dev) 
}



static struct pci_device_id jmb38x_ms_id_tbl [] = {

	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_MS, PCI_ANY_ID,

	  PCI_ANY_ID, 0, 0, 0 },

	{ PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_MS) },

	{ PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMB385_MS) },

	{ PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMB390_MS) },

	{ }

};

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -2369,8 +2369,10 @@ 
#define PCI_DEVICE_ID_JMICRON_JMB38X_SD	0x2381

#define PCI_DEVICE_ID_JMICRON_JMB38X_MMC 0x2382

#define PCI_DEVICE_ID_JMICRON_JMB38X_MS	0x2383

#define PCI_DEVICE_ID_JMICRON_JMB385_MS	0x2388

#define PCI_DEVICE_ID_JMICRON_JMB388_SD	0x2391

#define PCI_DEVICE_ID_JMICRON_JMB388_ESD 0x2392

#define PCI_DEVICE_ID_JMICRON_JMB390_MS	0x2393



#define PCI_VENDOR_ID_KORENIX		0x1982

#define PCI_DEVICE_ID_KORENIX_JETCARDF0	0x1600