From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Apr 2018 16:26:36 +0000 (-0700)
Subject: Merge branch 'for-linus-sa1100' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Tag: v4.17-rc1~74
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/7886e8aa7ff59198271ac650878eb247627a8b9a?hp=-c

Merge branch 'for-linus-sa1100' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM SA1100 updates from Russell King:
 "We have support for arbitary MMIO registers providing platform GPIOs,
  which allows us to abstract some of the SA11x0 CF support.

  This set of updates makes that change"

* 'for-linus-sa1100' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: sa1100/simpad: switch simpad CF to use gpiod APIs
  ARM: sa1100/shannon: convert to generic CF sockets
  ARM: sa1100/nanoengine: convert to generic CF sockets
  ARM: sa1100/h3xxx: switch h3xxx PCMCIA to use gpiod APIs
  ARM: sa1100/cerf: convert to generic CF sockets
  ARM: sa1100/assabet: convert to generic CF sockets
  ARM: sa1100: provide infrastructure to support generic CF sockets
  pcmcia: sa1100: provide generic CF support
---

7886e8aa7ff59198271ac650878eb247627a8b9a
diff --combined drivers/pcmcia/Makefile
index f1f89ddb1bfd,7f501d38a7a2..28502bd159e0
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@@ -28,10 -28,13 +28,10 @@@ obj-$(CONFIG_PCMCIA_SOC_COMMON)			+= so
  obj-$(CONFIG_PCMCIA_SA11XX_BASE)		+= sa11xx_base.o
  obj-$(CONFIG_PCMCIA_SA1100)			+= sa1100_cs.o
  obj-$(CONFIG_PCMCIA_SA1111)			+= sa1111_cs.o
 -obj-$(CONFIG_M32R_PCC)				+= m32r_pcc.o
 -obj-$(CONFIG_M32R_CFC)				+= m32r_cfc.o
  obj-$(CONFIG_PCMCIA_BCM63XX)			+= bcm63xx_pcmcia.o
  obj-$(CONFIG_PCMCIA_VRC4171)			+= vrc4171_card.o
  obj-$(CONFIG_PCMCIA_VRC4173)			+= vrc4173_cardu.o
  obj-$(CONFIG_OMAP_CF)				+= omap_cf.o
 -obj-$(CONFIG_BFIN_CFPCMCIA)			+= bfin_cf_pcmcia.o
  obj-$(CONFIG_AT91_CF)				+= at91_cf.o
  obj-$(CONFIG_ELECTRA_CF)			+= electra_cf.o
  obj-$(CONFIG_PCMCIA_ALCHEMY_DEVBOARD)		+= db1xxx_ss.o
@@@ -43,13 -46,9 +43,9 @@@ sa1111_cs-$(CONFIG_SA1100_JORNADA720)		
  sa1111_cs-$(CONFIG_ARCH_LUBBOCK)		+= sa1111_lubbock.o
  
  sa1100_cs-y					+= sa1100_generic.o
- sa1100_cs-$(CONFIG_SA1100_ASSABET)		+= sa1100_assabet.o
- sa1100_cs-$(CONFIG_SA1100_CERF)			+= sa1100_cerf.o
  sa1100_cs-$(CONFIG_SA1100_COLLIE)		+= pxa2xx_sharpsl.o
  sa1100_cs-$(CONFIG_SA1100_H3100)		+= sa1100_h3600.o
  sa1100_cs-$(CONFIG_SA1100_H3600)		+= sa1100_h3600.o
- sa1100_cs-$(CONFIG_SA1100_NANOENGINE)		+= sa1100_nanoengine.o
- sa1100_cs-$(CONFIG_SA1100_SHANNON)		+= sa1100_shannon.o
  sa1100_cs-$(CONFIG_SA1100_SIMPAD)		+= sa1100_simpad.o
  
  pxa2xx_cm_x2xx_cs-y				+= pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o