[PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[rui_feng]

From: Rui Feng <rui_feng@realsil.com.cn>

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: Rui Feng <rui_feng@realsil.com.cn>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Daniel Bristot de Oliveira <bristot@redhat.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>

v7 changes:
* update missing modification in memstic
* add Acked-by
---
 drivers/memstick/host/Kconfig               |  4 ++--
 drivers/memstick/host/rtsx_pci_ms.c         |  2 +-
 drivers/memstick/host/rtsx_usb_ms.c         |  2 +-
 drivers/mfd/Kconfig                         | 21 ---------------------
 drivers/mfd/Makefile                        |  4 ----
 drivers/misc/Kconfig                        |  5 +++++
 drivers/misc/Makefile                       |  1 +
 drivers/misc/cardreader/Kconfig             | 20 ++++++++++++++++++++
 drivers/misc/cardreader/Makefile            |  4 ++++
 drivers/{mfd => misc/cardreader}/rtl8411.c  |  2 +-
 drivers/{mfd => misc/cardreader}/rts5209.c  |  2 +-
 drivers/{mfd => misc/cardreader}/rts5227.c  |  2 +-
 drivers/{mfd => misc/cardreader}/rts5229.c  |  2 +-
 drivers/{mfd => misc/cardreader}/rts5249.c  |  3 +--
 drivers/{mfd => misc/cardreader}/rtsx_pcr.c |  2 +-
 drivers/{mfd => misc/cardreader}/rtsx_pcr.h |  2 +-
 drivers/{mfd => misc/cardreader}/rtsx_usb.c |  2 +-
 drivers/mmc/host/Kconfig                    |  4 ++--
 drivers/mmc/host/rtsx_pci_sdmmc.c           |  2 +-
 drivers/mmc/host/rtsx_usb_sdmmc.c           |  2 +-
 include/linux/{mfd => }/rtsx_common.h       |  0
 include/linux/{mfd => }/rtsx_pci.h          |  2 +-
 include/linux/{mfd => }/rtsx_usb.h          |  0
 23 files changed, 47 insertions(+), 43 deletions(-)
 create mode 100644 drivers/misc/cardreader/Kconfig
 create mode 100644 drivers/misc/cardreader/Makefile
 rename drivers/{mfd => misc/cardreader}/rtl8411.c (99%)
 rename drivers/{mfd => misc/cardreader}/rts5209.c (99%)
 rename drivers/{mfd => misc/cardreader}/rts5227.c (99%)
 rename drivers/{mfd => misc/cardreader}/rts5229.c (99%)
 rename drivers/{mfd => misc/cardreader}/rts5249.c (99%)
 rename drivers/{mfd => misc/cardreader}/rtsx_pcr.c (99%)
 rename drivers/{mfd => misc/cardreader}/rtsx_pcr.h (99%)
 rename drivers/{mfd => misc/cardreader}/rtsx_usb.c (99%)
 rename include/linux/{mfd => }/rtsx_common.h (100%)
 rename include/linux/{mfd => }/rtsx_pci.h (99%)
 rename include/linux/{mfd => }/rtsx_usb.h (100%)

diff --git a/drivers/memstick/host/Kconfig b/drivers/memstick/host/Kconfig
index 7310e32..aa2b078 100644
--- a/drivers/memstick/host/Kconfig
+++ b/drivers/memstick/host/Kconfig
@@ -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
diff --git a/drivers/memstick/host/rtsx_pci_ms.c b/drivers/memstick/host/rtsx_pci_ms.c
index 818fa94..a44b457 100644
--- a/drivers/memstick/host/rtsx_pci_ms.c
+++ b/drivers/memstick/host/rtsx_pci_ms.c
@@ -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 {
diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c
index 2e3cf01..4f64563 100644
--- a/drivers/memstick/host/rtsx_usb_ms.c
+++ b/drivers/memstick/host/rtsx_usb_ms.c
@@ -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>
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index fc5e4fe..80fd23f 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -916,17 +916,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
@@ -940,16 +929,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
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 8703ff1..921eb99 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -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
 
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 8136dc7..b328552 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -506,6 +506,10 @@ config PCI_ENDPOINT_TEST
            Enable this configuration option to enable the host side test driver
            for PCI Endpoint.
 
+config MISC_RTSX
+	tristate
+	default MISC_RTSX_PCI || MISC_RTSX_USB
+
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"
@@ -518,4 +522,5 @@ source "drivers/misc/mic/Kconfig"
 source "drivers/misc/genwqe/Kconfig"
 source "drivers/misc/echo/Kconfig"
 source "drivers/misc/cxl/Kconfig"
+source "drivers/misc/cardreader/Kconfig"
 endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index ad0e64f..fa440bb 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_CXL_BASE)		+= cxl/
 obj-$(CONFIG_ASPEED_LPC_CTRL)	+= aspeed-lpc-ctrl.o
 obj-$(CONFIG_ASPEED_LPC_SNOOP)	+= aspeed-lpc-snoop.o
 obj-$(CONFIG_PCI_ENDPOINT_TEST)	+= pci_endpoint_test.o
+obj-$(CONFIG_MISC_RTSX)	+= cardreader/
 
 lkdtm-$(CONFIG_LKDTM)		+= lkdtm_core.o
 lkdtm-$(CONFIG_LKDTM)		+= lkdtm_bugs.o
diff --git a/drivers/misc/cardreader/Kconfig b/drivers/misc/cardreader/Kconfig
new file mode 100644
index 0000000..e7d835a
--- /dev/null
+++ b/drivers/misc/cardreader/Kconfig
@@ -0,0 +1,20 @@
+config MISC_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.
+	  Realtek card readers support access to many types of memory cards,
+	  such as Memory Stick, Memory Stick Pro, Secure Digital and
+	  MultiMediaCard.
+
+config MISC_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.
diff --git a/drivers/misc/cardreader/Makefile b/drivers/misc/cardreader/Makefile
new file mode 100644
index 0000000..78337b2
--- /dev/null
+++ b/drivers/misc/cardreader/Makefile
@@ -0,0 +1,4 @@
+rtsx_pci-objs := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o
+
+obj-$(CONFIG_MISC_RTSX_PCI)	+= rtsx_pci.o
+obj-$(CONFIG_MISC_RTSX_USB)	+= rtsx_usb.o
diff --git a/drivers/mfd/rtl8411.c b/drivers/misc/cardreader/rtl8411.c
similarity index 99%
rename from drivers/mfd/rtl8411.c
rename to drivers/misc/cardreader/rtl8411.c
index b3ae659..434fd07 100644
--- a/drivers/mfd/rtl8411.c
+++ b/drivers/misc/cardreader/rtl8411.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #include "rtsx_pcr.h"
 
diff --git a/drivers/mfd/rts5209.c b/drivers/misc/cardreader/rts5209.c
similarity index 99%
rename from drivers/mfd/rts5209.c
rename to drivers/misc/cardreader/rts5209.c
index b95beec..ce68c48 100644
--- a/drivers/mfd/rts5209.c
+++ b/drivers/misc/cardreader/rts5209.c
@@ -21,7 +21,7 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #include "rtsx_pcr.h"
 
diff --git a/drivers/mfd/rts5227.c b/drivers/misc/cardreader/rts5227.c
similarity index 99%
rename from drivers/mfd/rts5227.c
rename to drivers/misc/cardreader/rts5227.c
index ff296a4..024dcba 100644
--- a/drivers/mfd/rts5227.c
+++ b/drivers/misc/cardreader/rts5227.c
@@ -22,7 +22,7 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #include "rtsx_pcr.h"
 
diff --git a/drivers/mfd/rts5229.c b/drivers/misc/cardreader/rts5229.c
similarity index 99%
rename from drivers/mfd/rts5229.c
rename to drivers/misc/cardreader/rts5229.c
index 9ed9dc8..9119261 100644
--- a/drivers/mfd/rts5229.c
+++ b/drivers/misc/cardreader/rts5229.c
@@ -21,7 +21,7 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #include "rtsx_pcr.h"
 
diff --git a/drivers/mfd/rts5249.c b/drivers/misc/cardreader/rts5249.c
similarity index 99%
rename from drivers/mfd/rts5249.c
rename to drivers/misc/cardreader/rts5249.c
index 7fcf37b..dbe013a 100644
--- a/drivers/mfd/rts5249.c
+++ b/drivers/misc/cardreader/rts5249.c
@@ -21,7 +21,7 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #include "rtsx_pcr.h"
 
@@ -738,4 +738,3 @@ void rts525a_init_params(struct rtsx_pcr *pcr)
 	pcr->reg_pm_ctrl3 = RTS524A_PM_CTRL3;
 	pcr->ops = &rts525a_pcr_ops;
 }
-
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
similarity index 99%
rename from drivers/mfd/rtsx_pcr.c
rename to drivers/misc/cardreader/rtsx_pcr.c
index 590fb9a..b60bd2a 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -29,7 +29,7 @@
 #include <linux/idr.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 #include <linux/mmc/card.h>
 #include <asm/unaligned.h>
 
diff --git a/drivers/mfd/rtsx_pcr.h b/drivers/misc/cardreader/rtsx_pcr.h
similarity index 99%
rename from drivers/mfd/rtsx_pcr.h
rename to drivers/misc/cardreader/rtsx_pcr.h
index ec784e0..b0691c9 100644
--- a/drivers/mfd/rtsx_pcr.h
+++ b/drivers/misc/cardreader/rtsx_pcr.h
@@ -22,7 +22,7 @@
 #ifndef __RTSX_PCR_H
 #define __RTSX_PCR_H
 
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #define MIN_DIV_N_PCR		80
 #define MAX_DIV_N_PCR		208
diff --git a/drivers/mfd/rtsx_usb.c b/drivers/misc/cardreader/rtsx_usb.c
similarity index 99%
rename from drivers/mfd/rtsx_usb.c
rename to drivers/misc/cardreader/rtsx_usb.c
index 691dab7..e881209 100644
--- a/drivers/mfd/rtsx_usb.c
+++ b/drivers/misc/cardreader/rtsx_usb.c
@@ -23,7 +23,7 @@
 #include <linux/usb.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
-#include <linux/mfd/rtsx_usb.h>
+#include <linux/rtsx_usb.h>
 
 static int polling_pipe = 1;
 module_param(polling_pipe, int, S_IRUGO | S_IWUSR);
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 8c15637..8b458b1 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -824,14 +824,14 @@ config MMC_USDHI6ROL0
 
 config MMC_REALTEK_PCI
 	tristate "Realtek PCI-E SD/MMC Card Interface Driver"
-	depends on MFD_RTSX_PCI
+	depends on MISC_RTSX_PCI
 	help
 	  Say Y here to include driver code to support SD/MMC card interface
 	  of Realtek PCI-E card reader
 
 config MMC_REALTEK_USB
 	tristate "Realtek USB SD/MMC Card Interface Driver"
-	depends on MFD_RTSX_USB
+	depends on MISC_RTSX_USB
 	help
 	  Say Y here to include driver code to support SD/MMC card interface
 	  of Realtek RTS5129/39 series card reader
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index 0848dc0..30bd808 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -30,7 +30,7 @@
 #include <linux/mmc/sd.h>
 #include <linux/mmc/sdio.h>
 #include <linux/mmc/card.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 #include <asm/unaligned.h>
 
 struct realtek_pci_sdmmc {
diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c
index 76da168..7842207 100644
--- a/drivers/mmc/host/rtsx_usb_sdmmc.c
+++ b/drivers/mmc/host/rtsx_usb_sdmmc.c
@@ -31,7 +31,7 @@
 #include <linux/scatterlist.h>
 #include <linux/pm_runtime.h>
 
-#include <linux/mfd/rtsx_usb.h>
+#include <linux/rtsx_usb.h>
 #include <asm/unaligned.h>
 
 #if defined(CONFIG_LEDS_CLASS) || (defined(CONFIG_LEDS_CLASS_MODULE) && \
diff --git a/include/linux/mfd/rtsx_common.h b/include/linux/rtsx_common.h
similarity index 100%
rename from include/linux/mfd/rtsx_common.h
rename to include/linux/rtsx_common.h
diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/rtsx_pci.h
similarity index 99%
rename from include/linux/mfd/rtsx_pci.h
rename to include/linux/rtsx_pci.h
index a2a1318..82abac7 100644
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/rtsx_pci.h
@@ -24,7 +24,7 @@
 
 #include <linux/sched.h>
 #include <linux/pci.h>
-#include <linux/mfd/rtsx_common.h>
+#include <linux/rtsx_common.h>
 
 #define MAX_RW_REG_CNT			1024
 
diff --git a/include/linux/mfd/rtsx_usb.h b/include/linux/rtsx_usb.h
similarity index 100%
rename from include/linux/mfd/rtsx_usb.h
rename to include/linux/rtsx_usb.h
-- 
1.9.1

RE: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[Perry.Yuan]

Hi Greg.
The Patches have been tested basing on V4.15-rc1 successfully.
The sdcard function is working well.

Tested-by: Perry Yuan <perry_yuan@dell.com>

keep up the good work
Perry  Yuan
Dell | Client Software Group | Firmware Principal Engineer

-----Original Message-----
From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-owner@vger.kernel.org] On Behalf Of rui_feng@realsil.com.cn
Sent: Monday, November 27, 2017 3:35 PM
To: lee.jones@linaro.org; arnd@arndb.de; gregkh@linuxfoundation.org; ulf.hansson@linaro.org
Cc: linux-kernel@vger.kernel.org; ricky_wu@realtek.com; bristot@redhat.com; Rui Feng <rui_feng@realsil.com.cn>
Subject: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

From: Rui Feng <rui_feng@realsil.com.cn>

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: Rui Feng <rui_feng@realsil.com.cn>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Daniel Bristot de Oliveira <bristot@redhat.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>

v7 changes:
* update missing modification in memstic
* add Acked-by
---
 drivers/memstick/host/Kconfig               |  4 ++--
 drivers/memstick/host/rtsx_pci_ms.c         |  2 +-
 drivers/memstick/host/rtsx_usb_ms.c         |  2 +-
 drivers/mfd/Kconfig                         | 21 ---------------------
 drivers/mfd/Makefile                        |  4 ----
 drivers/misc/Kconfig                        |  5 +++++
 drivers/misc/Makefile                       |  1 +
 drivers/misc/cardreader/Kconfig             | 20 ++++++++++++++++++++
 drivers/misc/cardreader/Makefile            |  4 ++++
 drivers/{mfd => misc/cardreader}/rtl8411.c  |  2 +-  drivers/{mfd => misc/cardreader}/rts5209.c  |  2 +-  drivers/{mfd => misc/cardreader}/rts5227.c  |  2 +-  drivers/{mfd => misc/cardreader}/rts5229.c  |  2 +-  drivers/{mfd => misc/cardreader}/rts5249.c  |  3 +--  drivers/{mfd => misc/cardreader}/rtsx_pcr.c |  2 +-  drivers/{mfd => misc/cardreader}/rtsx_pcr.h |  2 +-  drivers/{mfd => misc/cardreader}/rtsx_usb.c |  2 +-
 drivers/mmc/host/Kconfig                    |  4 ++--
 drivers/mmc/host/rtsx_pci_sdmmc.c           |  2 +-
 drivers/mmc/host/rtsx_usb_sdmmc.c           |  2 +-
 include/linux/{mfd => }/rtsx_common.h       |  0
 include/linux/{mfd => }/rtsx_pci.h          |  2 +-
 include/linux/{mfd => }/rtsx_usb.h          |  0
 23 files changed, 47 insertions(+), 43 deletions(-)  create mode 100644 drivers/misc/cardreader/Kconfig  create mode 100644 drivers/misc/cardreader/Makefile  rename drivers/{mfd => misc/cardreader}/rtl8411.c (99%)  rename drivers/{mfd => misc/cardreader}/rts5209.c (99%)  rename drivers/{mfd => misc/cardreader}/rts5227.c (99%)  rename drivers/{mfd => misc/cardreader}/rts5229.c (99%)  rename drivers/{mfd => misc/cardreader}/rts5249.c (99%)  rename drivers/{mfd => misc/cardreader}/rtsx_pcr.c (99%)  rename drivers/{mfd => misc/cardreader}/rtsx_pcr.h (99%)  rename drivers/{mfd => misc/cardreader}/rtsx_usb.c (99%)  rename include/linux/{mfd => }/rtsx_common.h (100%)  rename include/linux/{mfd => }/rtsx_pci.h (99%)  rename include/linux/{mfd => }/rtsx_usb.h (100%)

diff --git a/drivers/memstick/host/Kconfig b/drivers/memstick/host/Kconfig index 7310e32..aa2b078 100644
--- a/drivers/memstick/host/Kconfig
+++ b/drivers/memstick/host/Kconfig
@@ -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 diff --git a/drivers/memstick/host/rtsx_pci_ms.c b/drivers/memstick/host/rtsx_pci_ms.c
index 818fa94..a44b457 100644
--- a/drivers/memstick/host/rtsx_pci_ms.c
+++ b/drivers/memstick/host/rtsx_pci_ms.c
@@ -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 {
diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c
index 2e3cf01..4f64563 100644
--- a/drivers/memstick/host/rtsx_usb_ms.c
+++ b/drivers/memstick/host/rtsx_usb_ms.c
@@ -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>
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index fc5e4fe..80fd23f 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -916,17 +916,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
@@ -940,16 +929,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
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 8703ff1..921eb99 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -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
 
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 8136dc7..b328552 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -506,6 +506,10 @@ config PCI_ENDPOINT_TEST
            Enable this configuration option to enable the host side test driver
            for PCI Endpoint.
 
+config MISC_RTSX
+	tristate
+	default MISC_RTSX_PCI || MISC_RTSX_USB
+
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"
@@ -518,4 +522,5 @@ source "drivers/misc/mic/Kconfig"
 source "drivers/misc/genwqe/Kconfig"
 source "drivers/misc/echo/Kconfig"
 source "drivers/misc/cxl/Kconfig"
+source "drivers/misc/cardreader/Kconfig"
 endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index ad0e64f..fa440bb 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_CXL_BASE)		+= cxl/
 obj-$(CONFIG_ASPEED_LPC_CTRL)	+= aspeed-lpc-ctrl.o
 obj-$(CONFIG_ASPEED_LPC_SNOOP)	+= aspeed-lpc-snoop.o
 obj-$(CONFIG_PCI_ENDPOINT_TEST)	+= pci_endpoint_test.o
+obj-$(CONFIG_MISC_RTSX)	+= cardreader/
 
 lkdtm-$(CONFIG_LKDTM)		+= lkdtm_core.o
 lkdtm-$(CONFIG_LKDTM)		+= lkdtm_bugs.o
diff --git a/drivers/misc/cardreader/Kconfig b/drivers/misc/cardreader/Kconfig new file mode 100644 index 0000000..e7d835a
--- /dev/null
+++ b/drivers/misc/cardreader/Kconfig
@@ -0,0 +1,20 @@
+config MISC_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.
+	  Realtek card readers support access to many types of memory cards,
+	  such as Memory Stick, Memory Stick Pro, Secure Digital and
+	  MultiMediaCard.
+
+config MISC_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.
diff --git a/drivers/misc/cardreader/Makefile b/drivers/misc/cardreader/Makefile
new file mode 100644
index 0000000..78337b2
--- /dev/null
+++ b/drivers/misc/cardreader/Makefile
@@ -0,0 +1,4 @@
+rtsx_pci-objs := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o 
+rts5249.o
+
+obj-$(CONFIG_MISC_RTSX_PCI)	+= rtsx_pci.o
+obj-$(CONFIG_MISC_RTSX_USB)	+= rtsx_usb.o
diff --git a/drivers/mfd/rtl8411.c b/drivers/misc/cardreader/rtl8411.c
similarity index 99%
rename from drivers/mfd/rtl8411.c
rename to drivers/misc/cardreader/rtl8411.c index b3ae659..434fd07 100644
--- a/drivers/mfd/rtl8411.c
+++ b/drivers/misc/cardreader/rtl8411.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #include "rtsx_pcr.h"
 
diff --git a/drivers/mfd/rts5209.c b/drivers/misc/cardreader/rts5209.c
similarity index 99%
rename from drivers/mfd/rts5209.c
rename to drivers/misc/cardreader/rts5209.c index b95beec..ce68c48 100644
--- a/drivers/mfd/rts5209.c
+++ b/drivers/misc/cardreader/rts5209.c
@@ -21,7 +21,7 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #include "rtsx_pcr.h"
 
diff --git a/drivers/mfd/rts5227.c b/drivers/misc/cardreader/rts5227.c
similarity index 99%
rename from drivers/mfd/rts5227.c
rename to drivers/misc/cardreader/rts5227.c index ff296a4..024dcba 100644
--- a/drivers/mfd/rts5227.c
+++ b/drivers/misc/cardreader/rts5227.c
@@ -22,7 +22,7 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #include "rtsx_pcr.h"
 
diff --git a/drivers/mfd/rts5229.c b/drivers/misc/cardreader/rts5229.c
similarity index 99%
rename from drivers/mfd/rts5229.c
rename to drivers/misc/cardreader/rts5229.c index 9ed9dc8..9119261 100644
--- a/drivers/mfd/rts5229.c
+++ b/drivers/misc/cardreader/rts5229.c
@@ -21,7 +21,7 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #include "rtsx_pcr.h"
 
diff --git a/drivers/mfd/rts5249.c b/drivers/misc/cardreader/rts5249.c
similarity index 99%
rename from drivers/mfd/rts5249.c
rename to drivers/misc/cardreader/rts5249.c index 7fcf37b..dbe013a 100644
--- a/drivers/mfd/rts5249.c
+++ b/drivers/misc/cardreader/rts5249.c
@@ -21,7 +21,7 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #include "rtsx_pcr.h"
 
@@ -738,4 +738,3 @@ void rts525a_init_params(struct rtsx_pcr *pcr)
 	pcr->reg_pm_ctrl3 = RTS524A_PM_CTRL3;
 	pcr->ops = &rts525a_pcr_ops;
 }
-
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
similarity index 99%
rename from drivers/mfd/rtsx_pcr.c
rename to drivers/misc/cardreader/rtsx_pcr.c
index 590fb9a..b60bd2a 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -29,7 +29,7 @@
 #include <linux/idr.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 #include <linux/mmc/card.h>
 #include <asm/unaligned.h>
 
diff --git a/drivers/mfd/rtsx_pcr.h b/drivers/misc/cardreader/rtsx_pcr.h
similarity index 99%
rename from drivers/mfd/rtsx_pcr.h
rename to drivers/misc/cardreader/rtsx_pcr.h
index ec784e0..b0691c9 100644
--- a/drivers/mfd/rtsx_pcr.h
+++ b/drivers/misc/cardreader/rtsx_pcr.h
@@ -22,7 +22,7 @@
 #ifndef __RTSX_PCR_H
 #define __RTSX_PCR_H
 
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 
 #define MIN_DIV_N_PCR		80
 #define MAX_DIV_N_PCR		208
diff --git a/drivers/mfd/rtsx_usb.c b/drivers/misc/cardreader/rtsx_usb.c
similarity index 99%
rename from drivers/mfd/rtsx_usb.c
rename to drivers/misc/cardreader/rtsx_usb.c
index 691dab7..e881209 100644
--- a/drivers/mfd/rtsx_usb.c
+++ b/drivers/misc/cardreader/rtsx_usb.c
@@ -23,7 +23,7 @@
 #include <linux/usb.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
-#include <linux/mfd/rtsx_usb.h>
+#include <linux/rtsx_usb.h>
 
 static int polling_pipe = 1;
 module_param(polling_pipe, int, S_IRUGO | S_IWUSR); diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 8c15637..8b458b1 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -824,14 +824,14 @@ config MMC_USDHI6ROL0
 
 config MMC_REALTEK_PCI
 	tristate "Realtek PCI-E SD/MMC Card Interface Driver"
-	depends on MFD_RTSX_PCI
+	depends on MISC_RTSX_PCI
 	help
 	  Say Y here to include driver code to support SD/MMC card interface
 	  of Realtek PCI-E card reader
 
 config MMC_REALTEK_USB
 	tristate "Realtek USB SD/MMC Card Interface Driver"
-	depends on MFD_RTSX_USB
+	depends on MISC_RTSX_USB
 	help
 	  Say Y here to include driver code to support SD/MMC card interface
 	  of Realtek RTS5129/39 series card reader diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index 0848dc0..30bd808 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -30,7 +30,7 @@
 #include <linux/mmc/sd.h>
 #include <linux/mmc/sdio.h>
 #include <linux/mmc/card.h>
-#include <linux/mfd/rtsx_pci.h>
+#include <linux/rtsx_pci.h>
 #include <asm/unaligned.h>
 
 struct realtek_pci_sdmmc {
diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c
index 76da168..7842207 100644
--- a/drivers/mmc/host/rtsx_usb_sdmmc.c
+++ b/drivers/mmc/host/rtsx_usb_sdmmc.c
@@ -31,7 +31,7 @@
 #include <linux/scatterlist.h>
 #include <linux/pm_runtime.h>
 
-#include <linux/mfd/rtsx_usb.h>
+#include <linux/rtsx_usb.h>
 #include <asm/unaligned.h>
 
 #if defined(CONFIG_LEDS_CLASS) || (defined(CONFIG_LEDS_CLASS_MODULE) && \ diff --git a/include/linux/mfd/rtsx_common.h b/include/linux/rtsx_common.h similarity index 100% rename from include/linux/mfd/rtsx_common.h rename to include/linux/rtsx_common.h diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/rtsx_pci.h similarity index 99% rename from include/linux/mfd/rtsx_pci.h rename to include/linux/rtsx_pci.h index a2a1318..82abac7 100644
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/rtsx_pci.h
@@ -24,7 +24,7 @@
 
 #include <linux/sched.h>
 #include <linux/pci.h>
-#include <linux/mfd/rtsx_common.h>
+#include <linux/rtsx_common.h>
 
 #define MAX_RW_REG_CNT			1024
 
diff --git a/include/linux/mfd/rtsx_usb.h b/include/linux/rtsx_usb.h similarity index 100% rename from include/linux/mfd/rtsx_usb.h rename to include/linux/rtsx_usb.h
--
1.9.1

Re: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[Lee Jones]

On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> Hi Greg.
> The Patches have been tested basing on V4.15-rc1 successfully.
> The sdcard function is working well.

Not sure why you're a) top posting, b) doing so with an
incompatible email client and c) sending this to Greg?

There doesn't appear to be a Memstick Maintainer at the moment, which
means we have all of the Maintainer Acks we need (Arnd Acked in Greg's
place for Misc) to apply this patch.

If no one objects, I plan to take this through the MFD tree and
provide everyone else with a pull-request which they can do with as
they see fit.

> Tested-by: Perry Yuan <perry_yuan@dell.com>

Thanks for testing.

> keep up the good work
> Perry  Yuan
> Dell | Client Software Group | Firmware Principal Engineer
> 
> -----Original Message-----
> From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-owner@vger.kernel.org] On Behalf Of rui_feng@realsil.com.cn
> Sent: Monday, November 27, 2017 3:35 PM
> To: lee.jones@linaro.org; arnd@arndb.de; gregkh@linuxfoundation.org; ulf.hansson@linaro.org
> Cc: linux-kernel@vger.kernel.org; ricky_wu@realtek.com; bristot@redhat.com; Rui Feng <rui_feng@realsil.com.cn>
> Subject: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc
> 
> From: Rui Feng <rui_feng@realsil.com.cn>
> 
> 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: Rui Feng <rui_feng@realsil.com.cn>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
> Reviewed-by: Daniel Bristot de Oliveira <bristot@redhat.com>
> Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
> 
> v7 changes:
> * update missing modification in memstic
> * add Acked-by
> ---
>  drivers/memstick/host/Kconfig               |  4 ++--
>  drivers/memstick/host/rtsx_pci_ms.c         |  2 +-
>  drivers/memstick/host/rtsx_usb_ms.c         |  2 +-
>  drivers/mfd/Kconfig                         | 21 ---------------------
>  drivers/mfd/Makefile                        |  4 ----
>  drivers/misc/Kconfig                        |  5 +++++
>  drivers/misc/Makefile                       |  1 +
>  drivers/misc/cardreader/Kconfig             | 20 ++++++++++++++++++++
>  drivers/misc/cardreader/Makefile            |  4 ++++
>  drivers/{mfd => misc/cardreader}/rtl8411.c  |  2 +-  drivers/{mfd
> => misc/cardreader}/rts5209.c  |  2 +-  drivers/{mfd =>
> misc/cardreader}/rts5227.c  |  2 +-  drivers/{mfd =>
> misc/cardreader}/rts5229.c  |  2 +-  drivers/{mfd =>
> misc/cardreader}/rts5249.c  |  3 +--  drivers/{mfd =>
> misc/cardreader}/rtsx_pcr.c |  2 +-  drivers/{mfd =>
> misc/cardreader}/rtsx_pcr.h |  2 +-  drivers/{mfd =>
> misc/cardreader}/rtsx_usb.c |  2 +-
>  drivers/mmc/host/Kconfig                    |  4 ++--
>  drivers/mmc/host/rtsx_pci_sdmmc.c           |  2 +-
>  drivers/mmc/host/rtsx_usb_sdmmc.c           |  2 +-
>  include/linux/{mfd => }/rtsx_common.h       |  0
>  include/linux/{mfd => }/rtsx_pci.h          |  2 +-
>  include/linux/{mfd => }/rtsx_usb.h          |  0
>  23 files changed, 47 insertions(+), 43 deletions(-)  create mode
> 100644 drivers/misc/cardreader/Kconfig  create mode 100644
> drivers/misc/cardreader/Makefile  rename drivers/{mfd =>
> misc/cardreader}/rtl8411.c (99%)  rename drivers/{mfd =>
> misc/cardreader}/rts5209.c (99%)  rename drivers/{mfd =>
> misc/cardreader}/rts5227.c (99%)  rename drivers/{mfd =>
> misc/cardreader}/rts5229.c (99%)  rename drivers/{mfd =>
> misc/cardreader}/rts5249.c (99%)  rename drivers/{mfd =>
> misc/cardreader}/rtsx_pcr.c (99%)  rename drivers/{mfd =>
> misc/cardreader}/rtsx_pcr.h (99%)  rename drivers/{mfd =>
> misc/cardreader}/rtsx_usb.c (99%)  rename include/linux/{mfd =>
> }/rtsx_common.h (100%)  rename include/linux/{mfd => }/rtsx_pci.h
> (99%)  rename include/linux/{mfd => }/rtsx_usb.h (100%)

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[Lee Jones]

On Tue, 28 Nov 2017, Lee Jones wrote:

> On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> > Hi Greg.
> > The Patches have been tested basing on V4.15-rc1 successfully.
> > The sdcard function is working well.
> 
> Not sure why you're a) top posting, b) doing so with an
> incompatible email client and c) sending this to Greg?
> 
> There doesn't appear to be a Memstick Maintainer at the moment, which
> means we have all of the Maintainer Acks we need (Arnd Acked in Greg's
> place for Misc) to apply this patch.
> 
> If no one objects, I plan to take this through the MFD tree and
> provide everyone else with a pull-request which they can do with as
> they see fit.

OOI, where is [PATCH 2/2]?  Are there dependencies?

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

答复: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[冯锐]

> On Tue, 28 Nov 2017, Lee Jones wrote:
> 
> > On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> > > Hi Greg.
> > > The Patches have been tested basing on V4.15-rc1 successfully.
> > > The sdcard function is working well.
> >
> > Not sure why you're a) top posting, b) doing so with an incompatible
> > email client and c) sending this to Greg?
> >
> > There doesn't appear to be a Memstick Maintainer at the moment, which
> > means we have all of the Maintainer Acks we need (Arnd Acked in Greg's
> > place for Misc) to apply this patch.
> >
> > If no one objects, I plan to take this through the MFD tree and
> > provide everyone else with a pull-request which they can do with as
> > they see fit.
> 
> OOI, where is [PATCH 2/2]?  Are there dependencies?
> 
[PATCH 2/2] is here:
https://patchwork.kernel.org/patch/10076009/
Because after the drivers moved from misc to mfd, the [PATCH 2/2] is only related to misc, so I send it without cc you.
If needed, I will cc you in next version.

> --
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source
> software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
> 
> ------Please consider the environment before printing this e-mail.

答复: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[冯锐]

> On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> > Hi Greg.
> > The Patches have been tested basing on V4.15-rc1 successfully.
> > The sdcard function is working well.
> 
> Not sure why you're a) top posting, b) doing so with an incompatible email
> client and c) sending this to Greg?
> 
> There doesn't appear to be a Memstick Maintainer at the moment, which
> means we have all of the Maintainer Acks we need (Arnd Acked in Greg's place
> for Misc) to apply this patch.
> 
I can't get any Memstick Maintainer by following command:

$ ./scripts/get_maintainer.pl drivers/memstick/
Jens Axboe <axboe@fb.com> (commit_signer:3/6=50%)
Arnd Bergmann <arnd@arndb.de> (commit_signer:2/6=33%,authored:1/6=17%)
Andrew Morton <akpm@linux-foundation.org> (commit_signer:1/6=17%)
Thomas Gleixner <tglx@linutronix.de> (commit_signer:1/6=17%)
Kate Stewart <kstewart@linuxfoundation.org> (commit_signer:1/6=17%)
Rui Feng <rui_feng@realsil.com.cn> (authored:1/6=17%)
Greg Kroah-Hartman <gregkh@linuxfoundation.org> (authored:1/6=17%)
linux-kernel@vger.kernel.org (open list)

I can see Arnd and Greg are also in the list, but do I need to send the patch to all people in the list?

> If no one objects, I plan to take this through the MFD tree and provide everyone
> else with a pull-request which they can do with as they see fit.
> 
> > Tested-by: Perry Yuan <perry_yuan@dell.com>
> 
> Thanks for testing.
> 
> > keep up the good work
> > Perry  Yuan
> > Dell | Client Software Group | Firmware Principal Engineer
> >
> > -----Original Message-----
> > From: linux-kernel-owner@vger.kernel.org
> > [mailto:linux-kernel-owner@vger.kernel.org] On Behalf Of
> > rui_feng@realsil.com.cn
> > Sent: Monday, November 27, 2017 3:35 PM
> > To: lee.jones@linaro.org; arnd@arndb.de; gregkh@linuxfoundation.org;
> > ulf.hansson@linaro.org
> > Cc: linux-kernel@vger.kernel.org; ricky_wu@realtek.com;
> > bristot@redhat.com; Rui Feng <rui_feng@realsil.com.cn>
> > Subject: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to
> > misc
> >
> > From: Rui Feng <rui_feng@realsil.com.cn>
> >
> > 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: Rui Feng <rui_feng@realsil.com.cn>
> > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
> > Reviewed-by: Daniel Bristot de Oliveira <bristot@redhat.com>
> > Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
> >
> > v7 changes:
> > * update missing modification in memstic
> > * add Acked-by
> > ---
> >  drivers/memstick/host/Kconfig               |  4 ++--
> >  drivers/memstick/host/rtsx_pci_ms.c         |  2 +-
> >  drivers/memstick/host/rtsx_usb_ms.c         |  2 +-
> >  drivers/mfd/Kconfig                         | 21 ---------------------
> >  drivers/mfd/Makefile                        |  4 ----
> >  drivers/misc/Kconfig                        |  5 +++++
> >  drivers/misc/Makefile                       |  1 +
> >  drivers/misc/cardreader/Kconfig             | 20
> ++++++++++++++++++++
> >  drivers/misc/cardreader/Makefile            |  4 ++++
> >  drivers/{mfd => misc/cardreader}/rtl8411.c  |  2 +-  drivers/{mfd =>
> > misc/cardreader}/rts5209.c  |  2 +-  drivers/{mfd =>
> > misc/cardreader}/rts5227.c  |  2 +-  drivers/{mfd =>
> > misc/cardreader}/rts5229.c  |  2 +-  drivers/{mfd =>
> > misc/cardreader}/rts5249.c  |  3 +--  drivers/{mfd =>
> > misc/cardreader}/rtsx_pcr.c |  2 +-  drivers/{mfd =>
> > misc/cardreader}/rtsx_pcr.h |  2 +-  drivers/{mfd =>
> > misc/cardreader}/rtsx_usb.c |  2 +-
> >  drivers/mmc/host/Kconfig                    |  4 ++--
> >  drivers/mmc/host/rtsx_pci_sdmmc.c           |  2 +-
> >  drivers/mmc/host/rtsx_usb_sdmmc.c           |  2 +-
> >  include/linux/{mfd => }/rtsx_common.h       |  0
> >  include/linux/{mfd => }/rtsx_pci.h          |  2 +-
> >  include/linux/{mfd => }/rtsx_usb.h          |  0
> >  23 files changed, 47 insertions(+), 43 deletions(-)  create mode
> > 100644 drivers/misc/cardreader/Kconfig  create mode 100644
> > drivers/misc/cardreader/Makefile  rename drivers/{mfd =>
> > misc/cardreader}/rtl8411.c (99%)  rename drivers/{mfd =>
> > misc/cardreader}/rts5209.c (99%)  rename drivers/{mfd =>
> > misc/cardreader}/rts5227.c (99%)  rename drivers/{mfd =>
> > misc/cardreader}/rts5229.c (99%)  rename drivers/{mfd =>
> > misc/cardreader}/rts5249.c (99%)  rename drivers/{mfd =>
> > misc/cardreader}/rtsx_pcr.c (99%)  rename drivers/{mfd =>
> > misc/cardreader}/rtsx_pcr.h (99%)  rename drivers/{mfd =>
> > misc/cardreader}/rtsx_usb.c (99%)  rename include/linux/{mfd =>
> > }/rtsx_common.h (100%)  rename include/linux/{mfd => }/rtsx_pci.h
> > (99%)  rename include/linux/{mfd => }/rtsx_usb.h (100%)
> 
> --
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source
> software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
> 
> ------Please consider the environment before printing this e-mail.

答复: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[冯锐]

--------------------------
冯锐
电脑周边事业处
瑞晟微电子（苏州）有限公司
TEL:0512-62588966-56345
---------------------------------------------


> -----邮件原件-----
> 发件人: 冯锐
> 发送时间: 2017年11月28日 16:24
> 收件人: 'Lee Jones'
> 抄送: arnd@arndb.de; gregkh@linuxfoundation.org; ulf.hansson@linaro.org;
> linux-kernel@vger.kernel.org; ricky_wu@realtek.com; bristot@redhat.com;
> Perry.Yuan@dell.com
> 主题: 答复: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to
> misc
> 
> > On Tue, 28 Nov 2017, Lee Jones wrote:
> >
> > > On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> > > > Hi Greg.
> > > > The Patches have been tested basing on V4.15-rc1 successfully.
> > > > The sdcard function is working well.
> > >
> > > Not sure why you're a) top posting, b) doing so with an incompatible
> > > email client and c) sending this to Greg?
> > >
> > > There doesn't appear to be a Memstick Maintainer at the moment,
> > > which means we have all of the Maintainer Acks we need (Arnd Acked
> > > in Greg's place for Misc) to apply this patch.
> > >
> > > If no one objects, I plan to take this through the MFD tree and
> > > provide everyone else with a pull-request which they can do with as
> > > they see fit.
> >
> > OOI, where is [PATCH 2/2]?  Are there dependencies?
> >
> [PATCH 2/2] is here:
> https://patchwork.kernel.org/patch/10076009/
> Because after the drivers moved from misc to mfd, the [PATCH 2/2] is only
> related to misc, so I send it without cc you.
> If needed, I will cc you in next version.
> 
Sorry, "from misc to mfd" should be " from mfd to misc "
> > --
> > Lee Jones
> > Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source
> > software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
> >
> > ------Please consider the environment before printing this e-mail.

Re: 答复: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[Lee Jones]

On Tue, 28 Nov 2017, 冯锐 wrote:

> > On Tue, 28 Nov 2017, Lee Jones wrote:
> > 
> > > On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> > > > Hi Greg.
> > > > The Patches have been tested basing on V4.15-rc1 successfully.
> > > > The sdcard function is working well.
> > >
> > > Not sure why you're a) top posting, b) doing so with an incompatible
> > > email client and c) sending this to Greg?
> > >
> > > There doesn't appear to be a Memstick Maintainer at the moment, which
> > > means we have all of the Maintainer Acks we need (Arnd Acked in Greg's
> > > place for Misc) to apply this patch.
> > >
> > > If no one objects, I plan to take this through the MFD tree and
> > > provide everyone else with a pull-request which they can do with as
> > > they see fit.
> > 
> > OOI, where is [PATCH 2/2]?  Are there dependencies?
> > 
> [PATCH 2/2] is here:
> https://patchwork.kernel.org/patch/10076009/
> Because after the drivers moved from misc to mfd, the [PATCH 2/2] is only related to misc, so I send it without cc you.
> If needed, I will cc you in next version.

Please resubmit the patch-set with me in Cc and I will pick them up.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: 答复: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[gregkh]

On Tue, Nov 28, 2017 at 09:33:23AM +0000, Lee Jones wrote:
> On Tue, 28 Nov 2017, 冯锐 wrote:
> 
> > > On Tue, 28 Nov 2017, Lee Jones wrote:
> > > 
> > > > On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> > > > > Hi Greg.
> > > > > The Patches have been tested basing on V4.15-rc1 successfully.
> > > > > The sdcard function is working well.
> > > >
> > > > Not sure why you're a) top posting, b) doing so with an incompatible
> > > > email client and c) sending this to Greg?
> > > >
> > > > There doesn't appear to be a Memstick Maintainer at the moment, which
> > > > means we have all of the Maintainer Acks we need (Arnd Acked in Greg's
> > > > place for Misc) to apply this patch.
> > > >
> > > > If no one objects, I plan to take this through the MFD tree and
> > > > provide everyone else with a pull-request which they can do with as
> > > > they see fit.
> > > 
> > > OOI, where is [PATCH 2/2]?  Are there dependencies?
> > > 
> > [PATCH 2/2] is here:
> > https://patchwork.kernel.org/patch/10076009/
> > Because after the drivers moved from misc to mfd, the [PATCH 2/2] is only related to misc, so I send it without cc you.
> > If needed, I will cc you in next version.
> 
> Please resubmit the patch-set with me in Cc and I will pick them up.

Can I just get an ack and I can take both of them?  Or if you want to do
it as it touches mfd, I can provide my ack for both of these:

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

This back-and-forth has gone on a long time :)

greg k-h

Re: 答复: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[Lee Jones]

On Tue, 28 Nov 2017, gregkh@linuxfoundation.org wrote:

> On Tue, Nov 28, 2017 at 09:33:23AM +0000, Lee Jones wrote:
> > On Tue, 28 Nov 2017, 冯锐 wrote:
> > 
> > > > On Tue, 28 Nov 2017, Lee Jones wrote:
> > > > 
> > > > > On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> > > > > > Hi Greg.
> > > > > > The Patches have been tested basing on V4.15-rc1 successfully.
> > > > > > The sdcard function is working well.
> > > > >
> > > > > Not sure why you're a) top posting, b) doing so with an incompatible
> > > > > email client and c) sending this to Greg?
> > > > >
> > > > > There doesn't appear to be a Memstick Maintainer at the moment, which
> > > > > means we have all of the Maintainer Acks we need (Arnd Acked in Greg's
> > > > > place for Misc) to apply this patch.
> > > > >
> > > > > If no one objects, I plan to take this through the MFD tree and
> > > > > provide everyone else with a pull-request which they can do with as
> > > > > they see fit.
> > > > 
> > > > OOI, where is [PATCH 2/2]?  Are there dependencies?
> > > > 
> > > [PATCH 2/2] is here:
> > > https://patchwork.kernel.org/patch/10076009/
> > > Because after the drivers moved from misc to mfd, the [PATCH 2/2] is only related to misc, so I send it without cc you.
> > > If needed, I will cc you in next version.
> > 
> > Please resubmit the patch-set with me in Cc and I will pick them up.
> 
> Can I just get an ack and I can take both of them?  Or if you want to do
> it as it touches mfd, I can provide my ack for both of these:

I'd prefer to take them through my tree and send out a pull-request.

Unless of course you're willing to do the same?  In which case:

Acked-by: Lee Jones <lee.jones@linaro.org>

> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> This back-and-forth has gone on a long time :)

We've been waiting for Acks mainly, and one of the patches from this
submission wasn't sent to me, hence the request above.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

答复: 答复: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[冯锐]

> On Tue, Nov 28, 2017 at 09:33:23AM +0000, Lee Jones wrote:
> > On Tue, 28 Nov 2017, 冯锐 wrote:
> >
> > > > On Tue, 28 Nov 2017, Lee Jones wrote:
> > > >
> > > > > On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> > > > > > Hi Greg.
> > > > > > The Patches have been tested basing on V4.15-rc1 successfully.
> > > > > > The sdcard function is working well.
> > > > >
> > > > > Not sure why you're a) top posting, b) doing so with an
> > > > > incompatible email client and c) sending this to Greg?
> > > > >
> > > > > There doesn't appear to be a Memstick Maintainer at the moment,
> > > > > which means we have all of the Maintainer Acks we need (Arnd
> > > > > Acked in Greg's place for Misc) to apply this patch.
> > > > >
> > > > > If no one objects, I plan to take this through the MFD tree and
> > > > > provide everyone else with a pull-request which they can do with
> > > > > as they see fit.
> > > >
> > > > OOI, where is [PATCH 2/2]?  Are there dependencies?
> > > >
> > > [PATCH 2/2] is here:
> > > https://patchwork.kernel.org/patch/10076009/
> > > Because after the drivers moved from misc to mfd, the [PATCH 2/2] is only
> related to misc, so I send it without cc you.
> > > If needed, I will cc you in next version.
> >
> > Please resubmit the patch-set with me in Cc and I will pick them up.
> 
> Can I just get an ack and I can take both of them?  Or if you want to do it as it
> touches mfd, I can provide my ack for both of these:
> 
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
Do you mean I can add "Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" in both patches?

> This back-and-forth has gone on a long time :)
> 
> greg k-h
> 
> ------Please consider the environment before printing this e-mail.

Re: 答复: 答复: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[Lee Jones]

On Wed, 29 Nov 2017, 冯锐 wrote:

> > On Tue, Nov 28, 2017 at 09:33:23AM +0000, Lee Jones wrote:
> > > On Tue, 28 Nov 2017, 冯锐 wrote:
> > >
> > > > > On Tue, 28 Nov 2017, Lee Jones wrote:
> > > > >
> > > > > > On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> > > > > > > Hi Greg.
> > > > > > > The Patches have been tested basing on V4.15-rc1 successfully.
> > > > > > > The sdcard function is working well.
> > > > > >
> > > > > > Not sure why you're a) top posting, b) doing so with an
> > > > > > incompatible email client and c) sending this to Greg?
> > > > > >
> > > > > > There doesn't appear to be a Memstick Maintainer at the moment,
> > > > > > which means we have all of the Maintainer Acks we need (Arnd
> > > > > > Acked in Greg's place for Misc) to apply this patch.
> > > > > >
> > > > > > If no one objects, I plan to take this through the MFD tree and
> > > > > > provide everyone else with a pull-request which they can do with
> > > > > > as they see fit.
> > > > >
> > > > > OOI, where is [PATCH 2/2]?  Are there dependencies?
> > > > >
> > > > [PATCH 2/2] is here:
> > > > https://patchwork.kernel.org/patch/10076009/
> > > > Because after the drivers moved from misc to mfd, the [PATCH 2/2] is only
> > related to misc, so I send it without cc you.
> > > > If needed, I will cc you in next version.
> > >
> > > Please resubmit the patch-set with me in Cc and I will pick them up.
> > 
> > Can I just get an ack and I can take both of them?  Or if you want to do it as it
> > touches mfd, I can provide my ack for both of these:
> > 
> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > 
> Do you mean I can add "Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" in both patches?

Yes.  Then please resend them both so we can finally pick these up.

> > This back-and-forth has gone on a long time :)
> > 
> > greg k-h
> > 
> > ------Please consider the environment before printing this e-mail.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: 答复: 答复: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc

[Lee Jones]

On Wed, 29 Nov 2017, Lee Jones wrote:

> On Wed, 29 Nov 2017, 冯锐 wrote:
> 
> > > On Tue, Nov 28, 2017 at 09:33:23AM +0000, Lee Jones wrote:
> > > > On Tue, 28 Nov 2017, 冯锐 wrote:
> > > >
> > > > > > On Tue, 28 Nov 2017, Lee Jones wrote:
> > > > > >
> > > > > > > On Tue, 28 Nov 2017, Perry.Yuan@dell.com wrote:
> > > > > > > > Hi Greg.
> > > > > > > > The Patches have been tested basing on V4.15-rc1 successfully.
> > > > > > > > The sdcard function is working well.
> > > > > > >
> > > > > > > Not sure why you're a) top posting, b) doing so with an
> > > > > > > incompatible email client and c) sending this to Greg?
> > > > > > >
> > > > > > > There doesn't appear to be a Memstick Maintainer at the moment,
> > > > > > > which means we have all of the Maintainer Acks we need (Arnd
> > > > > > > Acked in Greg's place for Misc) to apply this patch.
> > > > > > >
> > > > > > > If no one objects, I plan to take this through the MFD tree and
> > > > > > > provide everyone else with a pull-request which they can do with
> > > > > > > as they see fit.
> > > > > >
> > > > > > OOI, where is [PATCH 2/2]?  Are there dependencies?
> > > > > >
> > > > > [PATCH 2/2] is here:
> > > > > https://patchwork.kernel.org/patch/10076009/
> > > > > Because after the drivers moved from misc to mfd, the [PATCH 2/2] is only
> > > related to misc, so I send it without cc you.
> > > > > If needed, I will cc you in next version.
> > > >
> > > > Please resubmit the patch-set with me in Cc and I will pick them up.
> > > 
> > > Can I just get an ack and I can take both of them?  Or if you want to do it as it
> > > touches mfd, I can provide my ack for both of these:
> > > 
> > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > 
> > Do you mean I can add "Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" in both patches?
> 
> Yes.  Then please resend them both so we can finally pick these up.

Never mind.  I see that you've already done it.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog