aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2013-03-11 11:56:31 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2013-04-05 08:28:26 -0400
commit7136619ea05c341b90d11524b696a355af86c895 (patch)
tree52b58bd9b7b59e604d520dc684fa3851851c1471 /drivers/pcmcia
parent63662139e519ce06090b2759cf4a1d291b9cc0e2 (diff)
pcmcia: remove Motorola MBX860 support
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 Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/m8xx_pcmcia.c59
1 files changed, 0 insertions, 59 deletions
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index a3a851e49321..9a12eadcf74c 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)
419 419
420#endif 420#endif
421 421
422/* ------------------------------------------------------------------------- */
423/* Motorola MBX860 */
424
425#if defined(CONFIG_MBX)
426
427#define PCMCIA_BOARD_MSG "MBX"
428
429static int voltage_set(int slot, int vcc, int vpp)
430{
431 u8 reg = 0;
432
433 switch (vcc) {
434 case 0:
435 break;
436 case 33:
437 reg |= CSR2_VCC_33;
438 break;
439 case 50:
440 reg |= CSR2_VCC_50;
441 break;
442 default:
443 return 1;
444 }
445
446 switch (vpp) {
447 case 0:
448 break;
449 case 33:
450 case 50:
451 if (vcc == vpp)
452 reg |= CSR2_VPP_VCC;
453 else
454 return 1;
455 break;
456 case 120:
457 if ((vcc == 33) || (vcc == 50))
458 reg |= CSR2_VPP_12;
459 else
460 return 1;
461 default:
462 return 1;
463 }
464
465 /* first, turn off all power */
466 out_8((u8 *) MBX_CSR2_ADDR,
467 in_8((u8 *) MBX_CSR2_ADDR) & ~(CSR2_VCC_MASK | CSR2_VPP_MASK));
468
469 /* enable new powersettings */
470 out_8((u8 *) MBX_CSR2_ADDR, in_8((u8 *) MBX_CSR2_ADDR) | reg);
471
472 return 0;
473}
474
475#define socket_get(_slot_) PCMCIA_SOCKET_KEY_5V
476#define hardware_enable(_slot_) /* No hardware to enable */
477#define hardware_disable(_slot_) /* No hardware to disable */
478
479#endif /* CONFIG_MBX */
480
481#if defined(CONFIG_PRxK) 422#if defined(CONFIG_PRxK)
482#include <asm/cpld.h> 423#include <asm/cpld.h>
483extern volatile fpga_pc_regs *fpga_pc; 424extern volatile fpga_pc_regs *fpga_pc;