Skip to content

Commit

Permalink
memstick: initial commit for Sony MemoryStick support
Browse files Browse the repository at this point in the history
Sony MemoryStick cards are used in many products manufactured by Sony.
They are available both as storage and as IO expansion cards.  Currently,
only MemoryStick Pro storage cards are supported via TI FlashMedia
MemoryStick interface.

[mboton@gmail.com: biuld fix]
[akpm@linux-foundation.org: build fix]
Signed-off-by: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Miguel Boton <mboton@gmail.co>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
oakad authored and Linus Torvalds committed Feb 9, 2008
1 parent 941edd0 commit baf8532
Show file tree
Hide file tree
Showing 16 changed files with 3,093 additions and 0 deletions.
7 changes: 7 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -3627,6 +3627,13 @@ L: linux-acpi@vger.kernel.org
W: http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
S: Maintained

SONY MEMORYSTICK CARD SUPPORT
P: Alex Dubov
M: oakad@yahoo.com
L: linux-kernel@vger.kernel.org
W: http://tifmxx.berlios.de/
S: Maintained

SOUND
P: Jaroslav Kysela
M: perex@perex.cz
Expand Down
2 changes: 2 additions & 0 deletions drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ source "drivers/usb/Kconfig"

source "drivers/mmc/Kconfig"

source "drivers/memstick/Kconfig"

source "drivers/leds/Kconfig"

source "drivers/infiniband/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ obj-y += lguest/
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_CPU_IDLE) += cpuidle/
obj-$(CONFIG_MMC) += mmc/
obj-$(CONFIG_MEMSTICK) += memstick/
obj-$(CONFIG_NEW_LEDS) += leds/
obj-$(CONFIG_INFINIBAND) += infiniband/
obj-$(CONFIG_SGI_SN) += sn/
Expand Down
26 changes: 26 additions & 0 deletions drivers/memstick/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#
# MemoryStick subsystem configuration
#

menuconfig MEMSTICK
tristate "Sony MemoryStick card support (EXPERIMENTAL)"
help
Sony MemoryStick is a proprietary storage/extension card protocol.

If you want MemoryStick support, you should say Y here and also
to the specific driver for your MMC interface.

if MEMSTICK

config MEMSTICK_DEBUG
bool "MemoryStick debugging"
help
This is an option for use by developers; most people should
say N here. This enables MemoryStick core and driver debugging.


source "drivers/memstick/core/Kconfig"

source "drivers/memstick/host/Kconfig"

endif # MEMSTICK
11 changes: 11 additions & 0 deletions drivers/memstick/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#
# Makefile for the kernel MemoryStick device drivers.
#

ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG
endif

obj-$(CONFIG_MEMSTICK) += core/
obj-$(CONFIG_MEMSTICK) += host/

26 changes: 26 additions & 0 deletions drivers/memstick/core/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#
# MemoryStick core configuration
#

comment "MemoryStick drivers"

config MEMSTICK_UNSAFE_RESUME
bool "Allow unsafe resume (DANGEROUS)"
help
If you say Y here, the MemoryStick layer will assume that all
cards stayed in their respective slots during the suspend. The
normal behaviour is to remove them at suspend and
redetecting them at resume. Breaking this assumption will
in most cases result in data corruption.

This option is usually just for embedded systems which use
a MemoryStick card for rootfs. Most people should say N here.

config MSPRO_BLOCK
tristate "MemoryStick Pro block device driver"
depends on BLOCK
help
Say Y here to enable the MemoryStick Pro block device driver
support. This provides a block device driver, which you can use
to mount the filesystem. Almost everyone wishing MemoryStick
support should say Y or M here.
11 changes: 11 additions & 0 deletions drivers/memstick/core/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#
# Makefile for the kernel MemoryStick core.
#

ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG
endif

obj-$(CONFIG_MEMSTICK) += memstick.o

obj-$(CONFIG_MSPRO_BLOCK) += mspro_block.o
Loading

0 comments on commit baf8532

Please sign in to comment.