Commit e455b69d authored by Rui Feng's avatar Rui Feng Committed by Lee Jones
Browse files

misc: rtsx: Move Realtek Card Reader Driver to misc 



Because Realtek card reader drivers are pcie and usb drivers,
and they bridge mmc subsystem and memstick subsystem, they are
not mfd drivers. Greg and Lee Jones had a discussion about
where to put the drivers, the result is that misc is a good
place for them, so I move all files to misc. If I don't move
them to a right place, I can't add any patch for this driver.

Signed-off-by: default avatarRui Feng <rui_feng@realsil.com.cn>
Reviewed-by: default avatarDaniel Bristot de Oliveira <bristot@redhat.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tested-by: default avatarPerry Yuan <perry_yuan@dell.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 4fbd8d19

drivers/memstick/host/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ config MEMSTICK_R592 


config MEMSTICK_REALTEK_PCI

	tristate "Realtek PCI-E Memstick Card Interface Driver"

	depends on MFD_RTSX_PCI

	depends on MISC_RTSX_PCI

	help

	  Say Y here to include driver code to support Memstick card interface

	  of Realtek PCI-E card reader
@@ -55,7 +55,7 @@ config MEMSTICK_REALTEK_PCI 


config MEMSTICK_REALTEK_USB

	tristate "Realtek USB Memstick Card Interface Driver"

	depends on MFD_RTSX_USB

	depends on MISC_RTSX_USB

	help

	  Say Y here to include driver code to support Memstick card interface

	  of Realtek RTS5129/39 series USB card reader

drivers/memstick/host/rtsx_pci_ms.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/memstick.h>

#include <linux/mfd/rtsx_pci.h>

#include <linux/rtsx_pci.h>

#include <asm/unaligned.h>



struct realtek_pci_ms {

drivers/memstick/host/rtsx_usb_ms.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/workqueue.h>

#include <linux/memstick.h>

#include <linux/kthread.h>

#include <linux/mfd/rtsx_usb.h>

#include <linux/rtsx_usb.h>

#include <linux/pm_runtime.h>

#include <linux/mutex.h>

#include <linux/sched.h>

drivers/mfd/Kconfig

+0 −21
Original line number Diff line number Diff line
@@ -929,17 +929,6 @@ config MFD_RDC321X 
	  southbridge which provides access to GPIOs and Watchdog using the

	  southbridge PCI device configuration space.



config MFD_RTSX_PCI

	tristate "Realtek PCI-E card reader"

	depends on PCI

	select MFD_CORE

	help

	  This supports for Realtek PCI-Express card reader including rts5209,

	  rts5227, rts522A, rts5229, rts5249, rts524A, rts525A, rtl8411, etc.

	  Realtek card reader supports access to many types of memory cards,

	  such as Memory Stick, Memory Stick Pro, Secure Digital and

	  MultiMediaCard.



config MFD_RT5033

	tristate "Richtek RT5033 Power Management IC"

	depends on I2C
@@ -953,16 +942,6 @@ config MFD_RT5033 
	  sub-devices like charger, fuel gauge, flash LED, current source,

	  LDO and Buck.



config MFD_RTSX_USB

	tristate "Realtek USB card reader"

	depends on USB

	select MFD_CORE

	help

	  Select this option to get support for Realtek USB 2.0 card readers

	  including RTS5129, RTS5139, RTS5179 and RTS5170.

	  Realtek card reader supports access to many types of memory cards,

	  such as Memory Stick Pro, Secure Digital and MultiMediaCard.



config MFD_RC5T583

	bool "Ricoh RC5T583 Power Management system device"

	depends on I2C=y

drivers/mfd/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ obj-$(CONFIG_MFD_CROS_EC_I2C) += cros_ec_i2c.o 
obj-$(CONFIG_MFD_CROS_EC_SPI)	+= cros_ec_spi.o

obj-$(CONFIG_MFD_EXYNOS_LPASS)	+= exynos-lpass.o



rtsx_pci-objs			:= rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o

obj-$(CONFIG_MFD_RTSX_PCI)	+= rtsx_pci.o

obj-$(CONFIG_MFD_RTSX_USB)	+= rtsx_usb.o



obj-$(CONFIG_HTC_PASIC3)	+= htc-pasic3.o

obj-$(CONFIG_HTC_I2CPLD)	+= htc-i2cpld.o