[GIT PULL v2] Immutable branch between MFD, Memstick, Misc and MMC due for the v4.16 merge window
From: Lee Jones
Date: Mon Dec 04 2017 - 04:51:02 EST
All,
This pull-request v2 contains a fix-up symbol clash when built for PPC.
(Thanks to Stephen Rothwell for the patch)
The following changes since commit 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323:
Linux 4.15-rc1 (2017-11-26 16:01:47 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-memstick-misc-mmc-v4.16-1
for you to fetch changes up to 51bd7125f740a1bc9e79cd117d7d50f1dc67a446:
misc: rtsx: Fix symbol clashes (2017-12-04 09:40:38 +0000)
----------------------------------------------------------------
Immutable branch between MFD, Memstic, Misc and MMC due for the v4.16 merge window
Includes fix for symbol clash in v1.
----------------------------------------------------------------
Rui Feng (2):
misc: rtsx: Move Realtek Card Reader Driver to misc
misc: rtsx: Add support for RTS5260
Stephen Rothwell (1):
misc: rtsx: Fix symbol clashes
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/misc/cardreader/rts5260.c | 748 ++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/misc/cardreader/rts5260.h | 45 ++++
drivers/{mfd => misc/cardreader}/rtsx_pcr.c | 125 ++++++++-
drivers/{mfd => misc/cardreader}/rtsx_pcr.h | 12 +-
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 | 236 ++++++++++++++++-
include/linux/{mfd => }/rtsx_usb.h | 0
25 files changed, 1202 insertions(+), 48 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%)
create mode 100644 drivers/misc/cardreader/rts5260.c
create mode 100644 drivers/misc/cardreader/rts5260.h
rename drivers/{mfd => misc/cardreader}/rtsx_pcr.c (92%)
rename drivers/{mfd => misc/cardreader}/rtsx_pcr.h (88%)
rename drivers/{mfd => misc/cardreader}/rtsx_usb.c (99%)
rename include/linux/{mfd => }/rtsx_common.h (100%)
rename include/linux/{mfd => }/rtsx_pci.h (83%)
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