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

Commit 60fdd931 authored by Alex Dubov's avatar Alex Dubov Committed by Linus Torvalds
Browse files

memstick: add support for JMicron jmb38x MemoryStick host controller 



Signed-off-by: default avatarAlex 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 59367258

drivers/memstick/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ menuconfig MEMSTICK 
	  Sony MemoryStick is a proprietary storage/extension card protocol.

	  Sony MemoryStick is a proprietary storage/extension card protocol.





	  If you want MemoryStick support, you should say Y here and also

	  If you want MemoryStick support, you should say Y here and also

	  to the specific driver for your MMC interface.

	  to the specific driver for your MemoryStick interface.





if MEMSTICK

if MEMSTICK

drivers/memstick/host/Kconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -20,3 +20,13 @@ config MEMSTICK_TIFM_MS 
          To compile this driver as a module, choose M here: the

          To compile this driver as a module, choose M here: the

	  module will be called tifm_ms.

	  module will be called tifm_ms.





config MEMSTICK_JMICRON_38X

	tristate "JMicron JMB38X MemoryStick interface support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && PCI



	help

	  Say Y here if you want to be able to access MemoryStick cards with

	  the JMicron(R) JMB38X MemoryStick card reader.



          To compile this driver as a module, choose M here: the

	  module will be called jmb38x_ms.

drivers/memstick/host/Makefile

+3 −3
Original line number Original line Diff line number Diff line
@@ -7,4 +7,4 @@ ifeq ($(CONFIG_MEMSTICK_DEBUG),y) 
endif

endif





obj-$(CONFIG_MEMSTICK_TIFM_MS)		+= tifm_ms.o

obj-$(CONFIG_MEMSTICK_TIFM_MS)		+= tifm_ms.o

obj-$(CONFIG_MEMSTICK_JMICRON_38X)	+= jmb38x_ms.o

drivers/memstick/host/jmb38x_ms.c

0 → 100644
+945 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/pci_ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -2184,6 +2184,7 @@ 
#define PCI_DEVICE_ID_JMICRON_JMB366	0x2366

#define PCI_DEVICE_ID_JMICRON_JMB366	0x2366

#define PCI_DEVICE_ID_JMICRON_JMB368	0x2368

#define PCI_DEVICE_ID_JMICRON_JMB368	0x2368

#define PCI_DEVICE_ID_JMICRON_JMB38X_SD	0x2381

#define PCI_DEVICE_ID_JMICRON_JMB38X_SD	0x2381

#define PCI_DEVICE_ID_JMICRON_JMB38X_MS	0x2383





#define PCI_VENDOR_ID_KORENIX		0x1982

#define PCI_VENDOR_ID_KORENIX		0x1982

#define PCI_DEVICE_ID_KORENIX_JETCARDF0	0x1600

#define PCI_DEVICE_ID_KORENIX_JETCARDF0	0x1600