From: Artem Bityutskiy <dedekind1@gmail.com>
To: MTD Maling List <linux-mtd@lists.infradead.org>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>,
linux-pcmcia@lists.infradead.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-m68k@lists.linux-m68k.org
Subject: [PATCH 04/10] pcmcia: remove Motorolla MBX860 support
Date: Tue, 12 Mar 2013 13:14:09 +0200 [thread overview]
Message-ID: <1363086855-2847-5-git-send-email-dedekind1@gmail.com> (raw)
In-Reply-To: <1363086855-2847-1-git-send-email-dedekind1@gmail.com>
From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
The CONFIG_MBX symbol is not defined anywhere in the kernel tree, which means
this platform is not supported by the Linux kernel and we can remove the
corresponding code from the 'm8xx_pcmcia' driver.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: linux-pcmcia@lists.infradead.org
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
---
drivers/pcmcia/m8xx_pcmcia.c | 59 ------------------------------------------
1 file changed, 59 deletions(-)
NOTE: this commit is independent, and I can merge it via the MTD tree with the
rest of the patches of this series. Of course, an ACK would be great to have.
And of course, if PCMCIA people wish to merge it via their tree, it is also
nice, just let me know.
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index a3a851e..9a12ead 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -419,65 +419,6 @@ static inline int voltage_set(int slot, int vcc, int vpp)
#endif
-/* ------------------------------------------------------------------------- */
-/* Motorola MBX860 */
-
-#if defined(CONFIG_MBX)
-
-#define PCMCIA_BOARD_MSG "MBX"
-
-static int voltage_set(int slot, int vcc, int vpp)
-{
- u8 reg = 0;
-
- switch (vcc) {
- case 0:
- break;
- case 33:
- reg |= CSR2_VCC_33;
- break;
- case 50:
- reg |= CSR2_VCC_50;
- break;
- default:
- return 1;
- }
-
- switch (vpp) {
- case 0:
- break;
- case 33:
- case 50:
- if (vcc == vpp)
- reg |= CSR2_VPP_VCC;
- else
- return 1;
- break;
- case 120:
- if ((vcc == 33) || (vcc == 50))
- reg |= CSR2_VPP_12;
- else
- return 1;
- default:
- return 1;
- }
-
- /* first, turn off all power */
- out_8((u8 *) MBX_CSR2_ADDR,
- in_8((u8 *) MBX_CSR2_ADDR) & ~(CSR2_VCC_MASK | CSR2_VPP_MASK));
-
- /* enable new powersettings */
- out_8((u8 *) MBX_CSR2_ADDR, in_8((u8 *) MBX_CSR2_ADDR) | reg);
-
- return 0;
-}
-
-#define socket_get(_slot_) PCMCIA_SOCKET_KEY_5V
-#define hardware_enable(_slot_) /* No hardware to enable */
-#define hardware_disable(_slot_) /* No hardware to disable */
-
-#endif /* CONFIG_MBX */
-
#if defined(CONFIG_PRxK)
#include <asm/cpld.h>
extern volatile fpga_pc_regs *fpga_pc;
--
1.7.10.4
next prev parent reply other threads:[~2013-03-12 11:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-12 11:14 [PATCH 00/10] mtd: remove dead map drivers Artem Bityutskiy
2013-03-12 11:14 ` [PATCH 03/10] mtd: remove the mbx860 map driver Artem Bityutskiy
2013-03-12 11:14 ` Artem Bityutskiy [this message]
2013-03-12 11:14 ` [PATCH 05/10] mtd: maps: kill the rpxlite " Artem Bityutskiy
2013-03-12 11:14 ` [PATCH 06/10] m68k: remove rpxlite stuff Artem Bityutskiy
2013-03-12 11:14 ` [PATCH 07/10] pcmcia: remove RPX board stuff Artem Bityutskiy
2013-03-12 11:21 ` [PATCH 00/10] mtd: remove dead map drivers Geert Uytterhoeven
2013-03-13 11:05 ` Artem Bityutskiy
-- strict thread matches above, loose matches on Subject: below --
2013-03-12 11:00 Artem Bityutskiy
2013-03-12 11:00 ` [PATCH 04/10] pcmcia: remove Motorolla MBX860 support Artem Bityutskiy
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=1363086855-2847-5-git-send-email-dedekind1@gmail.com \
--to=dedekind1@gmail.com \
--cc=artem.bityutskiy@linux.intel.com \
--cc=geert@linux-m68k.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-pcmcia@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox