All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@kernel.org>
To: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Daniel Mack <daniel@zonque.org>,
	Haojian Zhuang <haojian.zhuang@gmail.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
	Dominik Brodowski <linux@dominikbrodowski.net>
Subject: [PATCH 13/27] pcmcia: remove unused pxa/sa1100 drivers
Date: Thu,  5 Jan 2023 14:46:08 +0100	[thread overview]
Message-ID: <20230105134622.254560-14-arnd@kernel.org> (raw)
In-Reply-To: <20230105134622.254560-1-arnd@kernel.org>

From: Arnd Bergmann <arnd@arndb.de>

A number of boards got removed, so this code is now orphaned.

Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/pcmcia/Kconfig            |  12 +--
 drivers/pcmcia/Makefile           |   5 -
 drivers/pcmcia/pxa2xx_mainstone.c | 122 -----------------------
 drivers/pcmcia/sa1100_simpad.c    | 115 ----------------------
 drivers/pcmcia/sa1111_badge4.c    | 158 ------------------------------
 drivers/pcmcia/sa1111_lubbock.c   | 155 -----------------------------
 6 files changed, 2 insertions(+), 565 deletions(-)
 delete mode 100644 drivers/pcmcia/pxa2xx_mainstone.c
 delete mode 100644 drivers/pcmcia/sa1100_simpad.c
 delete mode 100644 drivers/pcmcia/sa1111_badge4.c
 delete mode 100644 drivers/pcmcia/sa1111_lubbock.c

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 1525023e49b6..44c16508ef14 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -194,10 +194,8 @@ config PCMCIA_SA1111
 	tristate "SA1111 support"
 	depends on ARM && SA1111 && PCMCIA
 	select PCMCIA_SOC_COMMON
-	select PCMCIA_SA11XX_BASE if ARCH_SA1100
-	select PCMCIA_PXA2XX if ARCH_LUBBOCK && SA1111
+	select PCMCIA_SA11XX_BASE
 	select PCMCIA_MAX1600 if ASSABET_NEPONSET
-	select PCMCIA_MAX1600 if ARCH_LUBBOCK && SA1111
 	help
 	  Say Y  here to include support for SA1111-based PCMCIA or CF
 	  sockets, found on the Jornada 720, Graphicsmaster and other
@@ -207,14 +205,8 @@ config PCMCIA_SA1111
 
 config PCMCIA_PXA2XX
 	tristate "PXA2xx support"
-	depends on ARM && ARCH_PXA && PCMCIA
-	depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
-		    || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
-		    || ARCOM_PCMCIA || ARCH_PXA_ESERIES \
-		    || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \
-		    || MACH_COLIBRI320 || MACH_H4700)
+	depends on ARM && ARCH_PXA && PCMCIA && PXA_SHARPSL
 	select PCMCIA_SOC_COMMON
-	select PCMCIA_MAX1600 if MACH_MAINSTONE
 	help
 	  Say Y here to include support for the PXA2xx PCMCIA controller
 
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index b3a2accf47af..c9d51b150682 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -36,17 +36,12 @@ obj-$(CONFIG_PCMCIA_MAX1600)			+= max1600.o
 
 sa1111_cs-y					+= sa1111_generic.o
 sa1111_cs-$(CONFIG_ASSABET_NEPONSET)		+= sa1111_neponset.o
-sa1111_cs-$(CONFIG_SA1100_BADGE4)		+= sa1111_badge4.o
 sa1111_cs-$(CONFIG_SA1100_JORNADA720)		+= sa1111_jornada720.o
-sa1111_cs-$(CONFIG_ARCH_LUBBOCK)		+= sa1111_lubbock.o
 
 sa1100_cs-y					+= sa1100_generic.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_SIMPAD)		+= sa1100_simpad.o
 
-pxa2xx-obj-$(CONFIG_MACH_MAINSTONE)		+= pxa2xx_mainstone.o
 pxa2xx-obj-$(CONFIG_PXA_SHARPSL)		+= pxa2xx_sharpsl.o
 obj-$(CONFIG_PCMCIA_PXA2XX)			+= pxa2xx_base.o $(pxa2xx-obj-y)
 obj-$(CONFIG_PCMCIA_XXS1500)			+= xxs1500_ss.o
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
deleted file mode 100644
index a076e4108452..000000000000
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
deleted file mode 100644
index 784ada5b8c4f..000000000000
diff --git a/drivers/pcmcia/sa1111_badge4.c b/drivers/pcmcia/sa1111_badge4.c
deleted file mode 100644
index e76d5ba921dd..000000000000
diff --git a/drivers/pcmcia/sa1111_lubbock.c b/drivers/pcmcia/sa1111_lubbock.c
deleted file mode 100644
index f1b5160cb8fa..000000000000
-- 
2.39.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@kernel.org>
To: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Daniel Mack <daniel@zonque.org>,
	Haojian Zhuang <haojian.zhuang@gmail.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
	Dominik Brodowski <linux@dominikbrodowski.net>
Subject: [PATCH 13/27] pcmcia: remove unused pxa/sa1100 drivers
Date: Thu,  5 Jan 2023 14:46:08 +0100	[thread overview]
Message-ID: <20230105134622.254560-14-arnd@kernel.org> (raw)
In-Reply-To: <20230105134622.254560-1-arnd@kernel.org>

From: Arnd Bergmann <arnd@arndb.de>

A number of boards got removed, so this code is now orphaned.

Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/pcmcia/Kconfig            |  12 +--
 drivers/pcmcia/Makefile           |   5 -
 drivers/pcmcia/pxa2xx_mainstone.c | 122 -----------------------
 drivers/pcmcia/sa1100_simpad.c    | 115 ----------------------
 drivers/pcmcia/sa1111_badge4.c    | 158 ------------------------------
 drivers/pcmcia/sa1111_lubbock.c   | 155 -----------------------------
 6 files changed, 2 insertions(+), 565 deletions(-)
 delete mode 100644 drivers/pcmcia/pxa2xx_mainstone.c
 delete mode 100644 drivers/pcmcia/sa1100_simpad.c
 delete mode 100644 drivers/pcmcia/sa1111_badge4.c
 delete mode 100644 drivers/pcmcia/sa1111_lubbock.c

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 1525023e49b6..44c16508ef14 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -194,10 +194,8 @@ config PCMCIA_SA1111
 	tristate "SA1111 support"
 	depends on ARM && SA1111 && PCMCIA
 	select PCMCIA_SOC_COMMON
-	select PCMCIA_SA11XX_BASE if ARCH_SA1100
-	select PCMCIA_PXA2XX if ARCH_LUBBOCK && SA1111
+	select PCMCIA_SA11XX_BASE
 	select PCMCIA_MAX1600 if ASSABET_NEPONSET
-	select PCMCIA_MAX1600 if ARCH_LUBBOCK && SA1111
 	help
 	  Say Y  here to include support for SA1111-based PCMCIA or CF
 	  sockets, found on the Jornada 720, Graphicsmaster and other
@@ -207,14 +205,8 @@ config PCMCIA_SA1111
 
 config PCMCIA_PXA2XX
 	tristate "PXA2xx support"
-	depends on ARM && ARCH_PXA && PCMCIA
-	depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
-		    || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
-		    || ARCOM_PCMCIA || ARCH_PXA_ESERIES \
-		    || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \
-		    || MACH_COLIBRI320 || MACH_H4700)
+	depends on ARM && ARCH_PXA && PCMCIA && PXA_SHARPSL
 	select PCMCIA_SOC_COMMON
-	select PCMCIA_MAX1600 if MACH_MAINSTONE
 	help
 	  Say Y here to include support for the PXA2xx PCMCIA controller
 
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index b3a2accf47af..c9d51b150682 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -36,17 +36,12 @@ obj-$(CONFIG_PCMCIA_MAX1600)			+= max1600.o
 
 sa1111_cs-y					+= sa1111_generic.o
 sa1111_cs-$(CONFIG_ASSABET_NEPONSET)		+= sa1111_neponset.o
-sa1111_cs-$(CONFIG_SA1100_BADGE4)		+= sa1111_badge4.o
 sa1111_cs-$(CONFIG_SA1100_JORNADA720)		+= sa1111_jornada720.o
-sa1111_cs-$(CONFIG_ARCH_LUBBOCK)		+= sa1111_lubbock.o
 
 sa1100_cs-y					+= sa1100_generic.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_SIMPAD)		+= sa1100_simpad.o
 
-pxa2xx-obj-$(CONFIG_MACH_MAINSTONE)		+= pxa2xx_mainstone.o
 pxa2xx-obj-$(CONFIG_PXA_SHARPSL)		+= pxa2xx_sharpsl.o
 obj-$(CONFIG_PCMCIA_PXA2XX)			+= pxa2xx_base.o $(pxa2xx-obj-y)
 obj-$(CONFIG_PCMCIA_XXS1500)			+= xxs1500_ss.o
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
deleted file mode 100644
index a076e4108452..000000000000
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
deleted file mode 100644
index 784ada5b8c4f..000000000000
diff --git a/drivers/pcmcia/sa1111_badge4.c b/drivers/pcmcia/sa1111_badge4.c
deleted file mode 100644
index e76d5ba921dd..000000000000
diff --git a/drivers/pcmcia/sa1111_lubbock.c b/drivers/pcmcia/sa1111_lubbock.c
deleted file mode 100644
index f1b5160cb8fa..000000000000
-- 
2.39.0


  parent reply	other threads:[~2023-01-05 22:59 UTC|newest]

Thread overview: 158+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-05 13:45 [PATCH v2 00/27] ARM: pxa: remove all unused boards&drivers Arnd Bergmann
2023-01-05 13:45 ` Arnd Bergmann
2023-01-05 13:45 ` Arnd Bergmann
2023-01-05 13:45 ` [PATCH 01/27] ARM: pxa: remove unused board files Arnd Bergmann
2023-01-05 13:45   ` Arnd Bergmann
2023-01-05 15:50   ` Dmitry Baryshkov
2023-01-05 15:50     ` Dmitry Baryshkov
2023-01-05 17:05     ` Richard Purdie
2023-01-05 17:05       ` Richard Purdie
2023-01-05 22:16       ` Arnd Bergmann
2023-01-05 22:16         ` Arnd Bergmann
2023-01-05 22:45         ` Richard Purdie
2023-01-05 22:45           ` Richard Purdie
2023-01-06  9:47           ` Arnd Bergmann
2023-01-06  9:47             ` Arnd Bergmann
2023-01-06 10:06             ` Dmitry Baryshkov
2023-01-06 10:06               ` Dmitry Baryshkov
2023-01-08  9:06               ` Robert Jarzmik
2023-01-08  9:06                 ` Robert Jarzmik
2023-01-08 20:36               ` Linus Walleij
2023-01-08 20:36                 ` Linus Walleij
2023-01-08 21:05               ` Arnd Bergmann
2023-01-08 21:05                 ` Arnd Bergmann
2023-01-08 21:12                 ` Dmitry Baryshkov
2023-01-08 21:12                   ` Dmitry Baryshkov
2023-01-08 21:20                   ` Arnd Bergmann
2023-01-08 21:20                     ` Arnd Bergmann
2023-01-05 13:45 ` [PATCH 02/27] ARM: pxa: remove irda leftover Arnd Bergmann
2023-01-05 13:45   ` Arnd Bergmann
2023-01-05 13:45 ` [PATCH 03/27] ARM: pxa: remove unused pxa3xx-ulpi Arnd Bergmann
2023-01-05 13:45   ` Arnd Bergmann
2023-01-05 14:55   ` Greg Kroah-Hartman
2023-01-05 14:55     ` Greg Kroah-Hartman
2023-01-05 13:45 ` [PATCH 04/27] ARM: pxa: drop pxa310/pxa320/pxa93x support Arnd Bergmann
2023-01-05 13:45   ` Arnd Bergmann
2023-01-05 14:59   ` Ulf Hansson
2023-01-05 14:59     ` Ulf Hansson
2023-01-06  2:19   ` Viresh Kumar
2023-01-06  2:19     ` Viresh Kumar
2023-01-08  8:49   ` Robert Jarzmik
2023-01-08  8:49     ` Robert Jarzmik
2023-01-08 13:40     ` Arnd Bergmann
2023-01-08 13:40       ` Arnd Bergmann
2023-01-09 14:18       ` Arnd Bergmann
2023-01-09 14:18         ` Arnd Bergmann
2023-01-12 17:37       ` Robert Jarzmik
2023-01-12 17:37         ` Robert Jarzmik
2023-01-05 13:46 ` [PATCH 05/27] ARM: pxa: prune unused device support Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 06/27] power: remove z2_battery driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 16:35   ` Sebastian Reichel
2023-01-05 16:35     ` Sebastian Reichel
2023-01-05 13:46 ` [PATCH 07/27] power: remove tosa_battery driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 16:42   ` Sebastian Reichel
2023-01-05 16:42     ` Sebastian Reichel
2023-01-05 17:16     ` Arnd Bergmann
2023-01-05 17:16       ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 08/27] ata: remove palmld pata driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-06  6:25   ` Damien Le Moal
2023-01-06  6:25     ` Damien Le Moal
2023-01-11 17:37   ` Sergey Shtylyov
2023-01-11 17:37     ` Sergey Shtylyov
2023-01-05 13:46 ` [PATCH 09/27] backlight: remove pxa tosa support Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 14:23   ` Daniel Thompson
2023-01-05 14:23     ` Daniel Thompson
2023-01-20 14:00   ` Lee Jones
2023-01-20 14:00     ` Lee Jones
2023-01-05 13:46 ` [PATCH 10/27] input: remove pxa930_trkball driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 11/27] input: remove pxa930_rotary keyboard driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 12/27] input: remove zylonite touchscreen driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46 ` Arnd Bergmann [this message]
2023-01-05 13:46   ` [PATCH 13/27] pcmcia: remove unused pxa/sa1100 drivers Arnd Bergmann
2023-01-05 13:46 ` [PATCH 14/27] ASoC: PXA: make SND_PXA2XX_SOC_AC97 user-selectable Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 15/27] ASoC: pxa: remove unused board support Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-10 13:58   ` Mark Brown
2023-01-10 13:58     ` Mark Brown
2023-01-10 13:58     ` Mark Brown
2023-01-05 13:46 ` [PATCH 16/27] power: remove pda_power supply driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 16:39   ` Sebastian Reichel
2023-01-05 16:39     ` Sebastian Reichel
2023-01-05 13:46 ` [PATCH 17/27] rtc: remove v3020 driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 18/27] mfd: remove toshiba tmio drivers Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-20 14:55   ` Lee Jones
2023-01-20 14:55     ` Lee Jones
2023-01-05 13:46 ` [PATCH 19/27] mfd: remove ucb1400 support Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-20 14:18   ` Lee Jones
2023-01-20 14:18     ` Lee Jones
2023-01-20 14:18     ` Lee Jones
2023-01-20 14:27     ` Arnd Bergmann
2023-01-20 14:27       ` Arnd Bergmann
2023-01-20 14:27       ` Arnd Bergmann
2023-01-20 14:57       ` Lee Jones
2023-01-20 14:57         ` Lee Jones
2023-01-20 14:57         ` Lee Jones
2023-01-05 13:46 ` [PATCH 20/27] mtd: remove tmio_nand driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-07 15:41   ` Miquel Raynal
2023-01-07 15:41     ` Miquel Raynal
2023-01-07 15:41     ` Miquel Raynal
2023-01-05 13:46 ` [PATCH 21/27] mmc: remove tmio_mmc driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 15:01   ` Ulf Hansson
2023-01-05 15:01     ` Ulf Hansson
2023-01-05 15:44     ` Arnd Bergmann
2023-01-05 15:44       ` Arnd Bergmann
2023-01-16 10:48       ` Ulf Hansson
2023-01-16 10:48         ` Ulf Hansson
2023-01-05 15:14   ` Wolfram Sang
2023-01-05 15:14     ` Wolfram Sang
2023-01-05 13:46 ` [PATCH 22/27] fbdev: remove tmiofb driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-06  9:47   ` Helge Deller
2023-01-06  9:47     ` Helge Deller
2023-01-06  9:47     ` Helge Deller
2023-01-06 11:25     ` Arnd Bergmann
2023-01-06 11:25       ` Arnd Bergmann
2023-01-06 11:25       ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 23/27] fbdev: remove w100fb driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 24/27] leds: remove asic3 driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-20 14:02   ` Lee Jones
2023-01-20 14:02     ` Lee Jones
2023-01-05 13:46 ` [PATCH 25/27] usb: remove ohci-tmio driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 14:55   ` Greg Kroah-Hartman
2023-01-05 14:55     ` Greg Kroah-Hartman
2023-01-05 15:03     ` Arnd Bergmann
2023-01-05 15:03       ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 26/27] w1: remove ds1wm driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-05 13:46 ` [PATCH 27/27] mfd: remove htc-pasic3 driver Arnd Bergmann
2023-01-05 13:46   ` Arnd Bergmann
2023-01-20 14:09   ` Lee Jones
2023-01-20 14:09     ` Lee Jones
2023-01-12 20:01 ` (subset) [PATCH v2 00/27] ARM: pxa: remove all unused boards&drivers Mark Brown
2023-01-12 20:01   ` Mark Brown
2023-01-12 20:01   ` Mark Brown
2023-01-12 20:01   ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230105134622.254560-14-arnd@kernel.org \
    --to=arnd@kernel.org \
    --cc=arnd@arndb.de \
    --cc=daniel@zonque.org \
    --cc=haojian.zhuang@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@dominikbrodowski.net \
    --cc=robert.jarzmik@free.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.