Skip to content

L
linux
Commit 99121c0d authored by Vitaly Bordug's avatar Vitaly Bordug Committed by Linus Torvalds
Browse files
Options

powerpc: 8xx: fix whitespace and indentation 

Rolling forward PCMCIA driver, it was discovered that the indentation in
existing one, as well as in BSP side are very odd.  This patch is just result
of Lindent run ontop of culprit files.
Signed-off-by: default avatarVitaly Bordug <vitb@kernel.crashing.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Kumar Gala <galak@gate.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2a7326b5
Hide whitespace changes
Inline Side-by-side
Showing with 336 additions and 337 deletions
arch/powerpc/platforms/8xx/mpc885ads_setup.c
View file @ 99121c0d
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <asm/prom.h> #include <asm/prom.h>
extern void cpm_reset(void); extern void cpm_reset(void);
extern void mpc8xx_show_cpuinfo(struct seq_file*); extern void mpc8xx_show_cpuinfo(struct seq_file *);
extern void mpc8xx_restart(char *cmd); extern void mpc8xx_restart(char *cmd);
extern void mpc8xx_calibrate_decr(void); extern void mpc8xx_calibrate_decr(void);
extern int mpc8xx_set_rtc_time(struct rtc_time *tm); extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
...@@ -48,9 +48,9 @@ extern void mpc8xx_get_rtc_time(struct rtc_time *tm); ...@@ -48,9 +48,9 @@ extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
extern void m8xx_pic_init(void); extern void m8xx_pic_init(void);
extern unsigned int mpc8xx_get_irq(void); extern unsigned int mpc8xx_get_irq(void);
static void init_smc1_uart_ioports(struct fs_uart_platform_info* fpi); static void init_smc1_uart_ioports(struct fs_uart_platform_info *fpi);
static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi); static void init_smc2_uart_ioports(struct fs_uart_platform_info *fpi);
static void init_scc3_ioports(struct fs_platform_info* ptr); static void init_scc3_ioports(struct fs_platform_info *ptr);
#ifdef CONFIG_PCMCIA_M8XX #ifdef CONFIG_PCMCIA_M8XX
static void pcmcia_hw_setup(int slot, int enable) static void pcmcia_hw_setup(int slot, int enable)
...@@ -73,7 +73,7 @@ static int pcmcia_set_voltage(int slot, int vcc, int vpp) ...@@ -73,7 +73,7 @@ static int pcmcia_set_voltage(int slot, int vcc, int vpp)
bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
switch(vcc) { switch (vcc) {
case 0: case 0:
break; break;
case 33: case 33:
...@@ -86,12 +86,12 @@ static int pcmcia_set_voltage(int slot, int vcc, int vpp) ...@@ -86,12 +86,12 @@ static int pcmcia_set_voltage(int slot, int vcc, int vpp)
return 1; return 1;
} }
switch(vpp) { switch (vpp) {
case 0: case 0:
break; break;
case 33: case 33:
case 50: case 50:
if(vcc == vpp) if (vcc == vpp)
reg |= BCSR1_PCCVPP1; reg |= BCSR1_PCCVPP1;
else else
return 1; return 1;
...@@ -127,7 +127,7 @@ void __init mpc885ads_board_setup(void) ...@@ -127,7 +127,7 @@ void __init mpc885ads_board_setup(void)
#endif #endif
bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
cp = (cpm8xx_t *)immr_map(im_cpm); cp = (cpm8xx_t *) immr_map(im_cpm);
if (bcsr_io == NULL) { if (bcsr_io == NULL) {
printk(KERN_CRIT "Could not remap BCSR\n"); printk(KERN_CRIT "Could not remap BCSR\n");
...@@ -140,13 +140,13 @@ void __init mpc885ads_board_setup(void) ...@@ -140,13 +140,13 @@ void __init mpc885ads_board_setup(void)
out_8(&(cp->cp_smc[0].smc_smcm), tmpval8); out_8(&(cp->cp_smc[0].smc_smcm), tmpval8);
clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN | SMCMR_TEN); /* brg1 */ clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN | SMCMR_TEN); /* brg1 */
#else #else
setbits32(bcsr_io,BCSR1_RS232EN_1); setbits32(bcsr_io, BCSR1_RS232EN_1);
out_be16(&cp->cp_smc[0].smc_smcmr, 0); out_be16(&cp->cp_smc[0].smc_smcmr, 0);
out_8(&cp->cp_smc[0].smc_smce, 0); out_8(&cp->cp_smc[0].smc_smce, 0);
#endif #endif
#ifdef CONFIG_SERIAL_CPM_SMC2 #ifdef CONFIG_SERIAL_CPM_SMC2
clrbits32(bcsr_io,BCSR1_RS232EN_2); clrbits32(bcsr_io, BCSR1_RS232EN_2);
clrbits32(&cp->cp_simode, 0xe0000000 >> 1); clrbits32(&cp->cp_simode, 0xe0000000 >> 1);
setbits32(&cp->cp_simode, 0x20000000 >> 1); /* brg2 */ setbits32(&cp->cp_simode, 0x20000000 >> 1); /* brg2 */
tmpval8 = in_8(&(cp->cp_smc[1].smc_smcm)) | (SMCM_RX | SMCM_TX); tmpval8 = in_8(&(cp->cp_smc[1].smc_smcm)) | (SMCM_RX | SMCM_TX);
...@@ -155,7 +155,7 @@ void __init mpc885ads_board_setup(void) ...@@ -155,7 +155,7 @@ void __init mpc885ads_board_setup(void)
init_smc2_uart_ioports(0); init_smc2_uart_ioports(0);
#else #else
setbits32(bcsr_io,BCSR1_RS232EN_2); setbits32(bcsr_io, BCSR1_RS232EN_2);
out_be16(&cp->cp_smc[1].smc_smcmr, 0); out_be16(&cp->cp_smc[1].smc_smcmr, 0);
out_8(&cp->cp_smc[1].smc_smce, 0); out_8(&cp->cp_smc[1].smc_smce, 0);
#endif #endif
...@@ -164,16 +164,16 @@ void __init mpc885ads_board_setup(void) ...@@ -164,16 +164,16 @@ void __init mpc885ads_board_setup(void)
#ifdef CONFIG_FS_ENET #ifdef CONFIG_FS_ENET
/* use MDC for MII (common) */ /* use MDC for MII (common) */
io_port = (iop8xx_t*)immr_map(im_ioport); io_port = (iop8xx_t *) immr_map(im_ioport);
setbits16(&io_port->iop_pdpar, 0x0080); setbits16(&io_port->iop_pdpar, 0x0080);
clrbits16(&io_port->iop_pddir, 0x0080); clrbits16(&io_port->iop_pddir, 0x0080);
bcsr_io = ioremap(BCSR5, sizeof(unsigned long)); bcsr_io = ioremap(BCSR5, sizeof(unsigned long));
clrbits32(bcsr_io,BCSR5_MII1_EN); clrbits32(bcsr_io, BCSR5_MII1_EN);
clrbits32(bcsr_io,BCSR5_MII1_RST); clrbits32(bcsr_io, BCSR5_MII1_RST);
#ifndef CONFIG_FC_ENET_HAS_SCC #ifndef CONFIG_FC_ENET_HAS_SCC
clrbits32(bcsr_io,BCSR5_MII2_EN); clrbits32(bcsr_io, BCSR5_MII2_EN);
clrbits32(bcsr_io,BCSR5_MII2_RST); clrbits32(bcsr_io, BCSR5_MII2_RST);
#endif #endif
iounmap(bcsr_io); iounmap(bcsr_io);
...@@ -182,17 +182,16 @@ void __init mpc885ads_board_setup(void) ...@@ -182,17 +182,16 @@ void __init mpc885ads_board_setup(void)
#endif #endif
#ifdef CONFIG_PCMCIA_M8XX #ifdef CONFIG_PCMCIA_M8XX
/*Set up board specific hook-ups*/ /*Set up board specific hook-ups */
m8xx_pcmcia_ops.hw_ctrl = pcmcia_hw_setup; m8xx_pcmcia_ops.hw_ctrl = pcmcia_hw_setup;
m8xx_pcmcia_ops.voltage_set = pcmcia_set_voltage; m8xx_pcmcia_ops.voltage_set = pcmcia_set_voltage;
#endif #endif
} }
static void init_fec1_ioports(struct fs_platform_info *ptr)
static void init_fec1_ioports(struct fs_platform_info* ptr)
{ {
cpm8xx_t *cp = (cpm8xx_t *)immr_map(im_cpm); cpm8xx_t *cp = (cpm8xx_t *) immr_map(im_cpm);
iop8xx_t *io_port = (iop8xx_t *)immr_map(im_ioport); iop8xx_t *io_port = (iop8xx_t *) immr_map(im_ioport);
/* configure FEC1 pins */ /* configure FEC1 pins */
setbits16(&io_port->iop_papar, 0xf830); setbits16(&io_port->iop_papar, 0xf830);
...@@ -214,11 +213,10 @@ static void init_fec1_ioports(struct fs_platform_info* ptr) ...@@ -214,11 +213,10 @@ static void init_fec1_ioports(struct fs_platform_info* ptr)
immr_unmap(cp); immr_unmap(cp);
} }
static void init_fec2_ioports(struct fs_platform_info *ptr)
static void init_fec2_ioports(struct fs_platform_info* ptr)
{ {
cpm8xx_t *cp = (cpm8xx_t *)immr_map(im_cpm); cpm8xx_t *cp = (cpm8xx_t *) immr_map(im_cpm);
iop8xx_t *io_port = (iop8xx_t *)immr_map(im_ioport); iop8xx_t *io_port = (iop8xx_t *) immr_map(im_ioport);
/* configure FEC2 pins */ /* configure FEC2 pins */
setbits32(&cp->cp_pepar, 0x0003fffc); setbits32(&cp->cp_pepar, 0x0003fffc);
...@@ -248,15 +246,15 @@ void init_fec_ioports(struct fs_platform_info *fpi) ...@@ -248,15 +246,15 @@ void init_fec_ioports(struct fs_platform_info *fpi)
} }
} }
static void init_scc3_ioports(struct fs_platform_info* fpi) static void init_scc3_ioports(struct fs_platform_info *fpi)
{ {
unsigned *bcsr_io; unsigned *bcsr_io;
iop8xx_t *io_port; iop8xx_t *io_port;
cpm8xx_t *cp; cpm8xx_t *cp;
bcsr_io = ioremap(BCSR_ADDR, BCSR_SIZE); bcsr_io = ioremap(BCSR_ADDR, BCSR_SIZE);
io_port = (iop8xx_t *)immr_map(im_ioport); io_port = (iop8xx_t *) immr_map(im_ioport);
cp = (cpm8xx_t *)immr_map(im_cpm); cp = (cpm8xx_t *) immr_map(im_cpm);
if (bcsr_io == NULL) { if (bcsr_io == NULL) {
printk(KERN_CRIT "Could not remap BCSR\n"); printk(KERN_CRIT "Could not remap BCSR\n");
...@@ -265,9 +263,9 @@ static void init_scc3_ioports(struct fs_platform_info* fpi) ...@@ -265,9 +263,9 @@ static void init_scc3_ioports(struct fs_platform_info* fpi)
/* Enable the PHY. /* Enable the PHY.
*/ */
clrbits32(bcsr_io+4, BCSR4_ETH10_RST); clrbits32(bcsr_io + 4, BCSR4_ETH10_RST);
udelay(1000); udelay(1000);
setbits32(bcsr_io+4, BCSR4_ETH10_RST); setbits32(bcsr_io + 4, BCSR4_ETH10_RST);
/* Configure port A pins for Txd and Rxd. /* Configure port A pins for Txd and Rxd.
*/ */
setbits16(&io_port->iop_papar, PA_ENET_RXD | PA_ENET_TXD); setbits16(&io_port->iop_papar, PA_ENET_RXD | PA_ENET_TXD);
...@@ -283,8 +281,7 @@ static void init_scc3_ioports(struct fs_platform_info* fpi) ...@@ -283,8 +281,7 @@ static void init_scc3_ioports(struct fs_platform_info* fpi)
*/ */
setbits32(&cp->cp_pepar, PE_ENET_TCLK | PE_ENET_RCLK); setbits32(&cp->cp_pepar, PE_ENET_TCLK | PE_ENET_RCLK);
clrbits32(&cp->cp_pepar, PE_ENET_TENA); clrbits32(&cp->cp_pepar, PE_ENET_TENA);
clrbits32(&cp->cp_pedir, clrbits32(&cp->cp_pedir, PE_ENET_TCLK | PE_ENET_RCLK | PE_ENET_TENA);
PE_ENET_TCLK | PE_ENET_RCLK | PE_ENET_TENA);
clrbits32(&cp->cp_peso, PE_ENET_TCLK | PE_ENET_RCLK); clrbits32(&cp->cp_peso, PE_ENET_TCLK | PE_ENET_RCLK);
setbits32(&cp->cp_peso, PE_ENET_TENA); setbits32(&cp->cp_peso, PE_ENET_TENA);
...@@ -308,7 +305,7 @@ static void init_scc3_ioports(struct fs_platform_info* fpi) ...@@ -308,7 +305,7 @@ static void init_scc3_ioports(struct fs_platform_info* fpi)
clrbits32(&cp->cp_pedir, PE_ENET_TENA); clrbits32(&cp->cp_pedir, PE_ENET_TENA);
setbits32(&cp->cp_peso, PE_ENET_TENA); setbits32(&cp->cp_peso, PE_ENET_TENA);
setbits32(bcsr_io+4, BCSR1_ETHEN); setbits32(bcsr_io + 4, BCSR1_ETHEN);
iounmap(bcsr_io); iounmap(bcsr_io);
immr_unmap(io_port); immr_unmap(io_port);
immr_unmap(cp); immr_unmap(cp);
...@@ -328,50 +325,48 @@ void init_scc_ioports(struct fs_platform_info *fpi) ...@@ -328,50 +325,48 @@ void init_scc_ioports(struct fs_platform_info *fpi)
} }
} }
static void init_smc1_uart_ioports(struct fs_uart_platform_info *ptr)
static void init_smc1_uart_ioports(struct fs_uart_platform_info* ptr)
{ {
unsigned *bcsr_io; unsigned *bcsr_io;
cpm8xx_t *cp; cpm8xx_t *cp;
cp = (cpm8xx_t *)immr_map(im_cpm); cp = (cpm8xx_t *) immr_map(im_cpm);
setbits32(&cp->cp_pepar, 0x000000c0); setbits32(&cp->cp_pepar, 0x000000c0);
clrbits32(&cp->cp_pedir, 0x000000c0); clrbits32(&cp->cp_pedir, 0x000000c0);
clrbits32(&cp->cp_peso, 0x00000040); clrbits32(&cp->cp_peso, 0x00000040);
setbits32(&cp->cp_peso, 0x00000080); setbits32(&cp->cp_peso, 0x00000080);
immr_unmap(cp); immr_unmap(cp);
bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
if (bcsr_io == NULL) { if (bcsr_io == NULL) {
printk(KERN_CRIT "Could not remap BCSR1\n"); printk(KERN_CRIT "Could not remap BCSR1\n");
return; return;
} }
clrbits32(bcsr_io,BCSR1_RS232EN_1); clrbits32(bcsr_io, BCSR1_RS232EN_1);
iounmap(bcsr_io); iounmap(bcsr_io);
} }
static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi) static void init_smc2_uart_ioports(struct fs_uart_platform_info *fpi)
{ {
unsigned *bcsr_io; unsigned *bcsr_io;
cpm8xx_t *cp; cpm8xx_t *cp;
cp = (cpm8xx_t *)immr_map(im_cpm); cp = (cpm8xx_t *) immr_map(im_cpm);
setbits32(&cp->cp_pepar, 0x00000c00); setbits32(&cp->cp_pepar, 0x00000c00);
clrbits32(&cp->cp_pedir, 0x00000c00); clrbits32(&cp->cp_pedir, 0x00000c00);
clrbits32(&cp->cp_peso, 0x00000400); clrbits32(&cp->cp_peso, 0x00000400);
setbits32(&cp->cp_peso, 0x00000800); setbits32(&cp->cp_peso, 0x00000800);
immr_unmap(cp); immr_unmap(cp);
bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
if (bcsr_io == NULL) { if (bcsr_io == NULL) {
printk(KERN_CRIT "Could not remap BCSR1\n"); printk(KERN_CRIT "Could not remap BCSR1\n");
return; return;
} }
clrbits32(bcsr_io,BCSR1_RS232EN_2); clrbits32(bcsr_io, BCSR1_RS232EN_2);
iounmap(bcsr_io); iounmap(bcsr_io);
} }
void init_smc_ioports(struct fs_uart_platform_info *data) void init_smc_ioports(struct fs_uart_platform_info *data)
...@@ -444,15 +439,11 @@ static int __init mpc885ads_probe(void) ...@@ -444,15 +439,11 @@ static int __init mpc885ads_probe(void)
return 1; return 1;
} }
define_machine(mpc885_ads) { define_machine(mpc885_ads)
.name = "MPC885 ADS", {
.probe = mpc885ads_probe, .name = "MPC885 ADS",.probe = mpc885ads_probe,.setup_arch =
.setup_arch = mpc885ads_setup_arch, mpc885ads_setup_arch,.init_IRQ =
.init_IRQ = m8xx_pic_init, m8xx_pic_init,.show_cpuinfo = mpc8xx_show_cpuinfo,.get_irq =
.show_cpuinfo = mpc8xx_show_cpuinfo, mpc8xx_get_irq,.restart = mpc8xx_restart,.calibrate_decr =
.get_irq = mpc8xx_get_irq, mpc8xx_calibrate_decr,.set_rtc_time =
.restart = mpc8xx_restart, mpc8xx_set_rtc_time,.get_rtc_time = mpc8xx_get_rtc_time,};
.calibrate_decr = mpc8xx_calibrate_decr,
.set_rtc_time = mpc8xx_set_rtc_time,
.get_rtc_time = mpc8xx_get_rtc_time,
};
drivers/pcmcia/m8xx_pcmcia.c
View file @ 99121c0d
...@@ -113,7 +113,7 @@ MODULE_LICENSE("Dual MPL/GPL"); ...@@ -113,7 +113,7 @@ MODULE_LICENSE("Dual MPL/GPL");
#define CONFIG_PCMCIA_SLOT_B #define CONFIG_PCMCIA_SLOT_B
#endif #endif
#endif /* !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B) */ #endif /* !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B) */
#if defined(CONFIG_PCMCIA_SLOT_A) && defined(CONFIG_PCMCIA_SLOT_B) #if defined(CONFIG_PCMCIA_SLOT_A) && defined(CONFIG_PCMCIA_SLOT_B)
...@@ -146,9 +146,9 @@ MODULE_LICENSE("Dual MPL/GPL"); ...@@ -146,9 +146,9 @@ MODULE_LICENSE("Dual MPL/GPL");
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#define PCMCIA_MEM_WIN_BASE 0xe0000000 /* base address for memory window 0 */ #define PCMCIA_MEM_WIN_BASE 0xe0000000 /* base address for memory window 0 */
#define PCMCIA_MEM_WIN_SIZE 0x04000000 /* each memory window is 64 MByte */ #define PCMCIA_MEM_WIN_SIZE 0x04000000 /* each memory window is 64 MByte */
#define PCMCIA_IO_WIN_BASE _IO_BASE /* base address for io window 0 */ #define PCMCIA_IO_WIN_BASE _IO_BASE /* base address for io window 0 */
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
static int pcmcia_schlvl; static int pcmcia_schlvl;
...@@ -169,8 +169,8 @@ static u32 *m8xx_pgcrx[2]; ...@@ -169,8 +169,8 @@ static u32 *m8xx_pgcrx[2];
*/ */
struct pcmcia_win { struct pcmcia_win {
u32 br; u32 br;
u32 or; u32 or;
}; };
/* /*
...@@ -214,7 +214,7 @@ struct pcmcia_win { ...@@ -214,7 +214,7 @@ struct pcmcia_win {
/* we keep one lookup table per socket to check flags */ /* we keep one lookup table per socket to check flags */
#define PCMCIA_EVENTS_MAX 5 /* 4 max at a time + termination */ #define PCMCIA_EVENTS_MAX 5 /* 4 max at a time + termination */
struct event_table { struct event_table {
u32 regbit; u32 regbit;
...@@ -224,8 +224,8 @@ struct event_table { ...@@ -224,8 +224,8 @@ struct event_table {
static const char driver_name[] = "m8xx-pcmcia"; static const char driver_name[] = "m8xx-pcmcia";
struct socket_info { struct socket_info {
void (*handler)(void *info, u32 events); void (*handler) (void *info, u32 events);
void *info; void *info;
u32 slot; u32 slot;
pcmconf8xx_t *pcmcia; pcmconf8xx_t *pcmcia;
...@@ -234,7 +234,7 @@ struct socket_info { ...@@ -234,7 +234,7 @@ struct socket_info {
socket_state_t state; socket_state_t state;
struct pccard_mem_map mem_win[PCMCIA_MEM_WIN_NO]; struct pccard_mem_map mem_win[PCMCIA_MEM_WIN_NO];
struct pccard_io_map io_win[PCMCIA_IO_WIN_NO]; struct pccard_io_map io_win[PCMCIA_IO_WIN_NO];
struct event_table events[PCMCIA_EVENTS_MAX]; struct event_table events[PCMCIA_EVENTS_MAX];
struct pcmcia_socket socket; struct pcmcia_socket socket;
}; };
...@@ -248,8 +248,7 @@ static struct socket_info socket[PCMCIA_SOCKETS_NO]; ...@@ -248,8 +248,7 @@ static struct socket_info socket[PCMCIA_SOCKETS_NO];
#define M8XX_SIZES_NO 32 #define M8XX_SIZES_NO 32
static const u32 m8xx_size_to_gray[M8XX_SIZES_NO] = static const u32 m8xx_size_to_gray[M8XX_SIZES_NO] = {
{
0x00000001, 0x00000002, 0x00000008, 0x00000004, 0x00000001, 0x00000002, 0x00000008, 0x00000004,
0x00000080, 0x00000040, 0x00000010, 0x00000020, 0x00000080, 0x00000040, 0x00000010, 0x00000020,
0x00008000, 0x00004000, 0x00001000, 0x00002000, 0x00008000, 0x00004000, 0x00001000, 0x00002000,
...@@ -265,7 +264,7 @@ static const u32 m8xx_size_to_gray[M8XX_SIZES_NO] = ...@@ -265,7 +264,7 @@ static const u32 m8xx_size_to_gray[M8XX_SIZES_NO] =
static irqreturn_t m8xx_interrupt(int irq, void *dev); static irqreturn_t m8xx_interrupt(int irq, void *dev);
#define PCMCIA_BMT_LIMIT (15*4) /* Bus Monitor Timeout value */ #define PCMCIA_BMT_LIMIT (15*4) /* Bus Monitor Timeout value */
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* board specific stuff: */ /* board specific stuff: */
...@@ -289,8 +288,9 @@ static int voltage_set(int slot, int vcc, int vpp) ...@@ -289,8 +288,9 @@ static int voltage_set(int slot, int vcc, int vpp)
{ {
u32 reg = 0; u32 reg = 0;
switch(vcc) { switch (vcc) {
case 0: break; case 0:
break;
case 33: case 33:
reg |= BCSR1_PCVCTL4; reg |= BCSR1_PCVCTL4;
break; break;
...@@ -301,11 +301,12 @@ static int voltage_set(int slot, int vcc, int vpp) ...@@ -301,11 +301,12 @@ static int voltage_set(int slot, int vcc, int vpp)
return 1; return 1;
} }
switch(vpp) { switch (vpp) {
case 0: break; case 0:
break;
case 33: case 33:
case 50: case 50:
if(vcc == vpp) if (vcc == vpp)
reg |= BCSR1_PCVCTL6; reg |= BCSR1_PCVCTL6;
else else
return 1; return 1;
...@@ -316,25 +317,29 @@ static int voltage_set(int slot, int vcc, int vpp) ...@@ -316,25 +317,29 @@ static int voltage_set(int slot, int vcc, int vpp)
return 1; return 1;
} }
if(!((vcc == 50) || (vcc == 0))) if (!((vcc == 50) || (vcc == 0)))
return 1; return 1;
/* first, turn off all power */ /* first, turn off all power */
out_be32(((u32 *)RPX_CSR_ADDR), in_be32(((u32 *)RPX_CSR_ADDR)) & ~(BCSR1_PCVCTL4 | BCSR1_PCVCTL5 | BCSR1_PCVCTL6 | BCSR1_PCVCTL7)); out_be32(((u32 *) RPX_CSR_ADDR),
in_be32(((u32 *) RPX_CSR_ADDR)) & ~(BCSR1_PCVCTL4 |
BCSR1_PCVCTL5 |
BCSR1_PCVCTL6 |
BCSR1_PCVCTL7));
/* enable new powersettings */ /* enable new powersettings */
out_be32(((u32 *)RPX_CSR_ADDR), in_be32(((u32 *)RPX_CSR_ADDR)) | reg); out_be32(((u32 *) RPX_CSR_ADDR), in_be32(((u32 *) RPX_CSR_ADDR)) | reg);
return 0; return 0;
} }
#define socket_get(_slot_) PCMCIA_SOCKET_KEY_5V #define socket_get(_slot_) PCMCIA_SOCKET_KEY_5V
#define hardware_enable(_slot_) /* No hardware to enable */ #define hardware_enable(_slot_) /* No hardware to enable */
#define hardware_disable(_slot_) /* No hardware to disable */ #define hardware_disable(_slot_) /* No hardware to disable */
#endif /* CONFIG_RPXCLASSIC */ #endif /* CONFIG_RPXCLASSIC */
/* FADS Boards from Motorola */ /* FADS Boards from Motorola */
...@@ -346,43 +351,45 @@ static int voltage_set(int slot, int vcc, int vpp) ...@@ -346,43 +351,45 @@ static int voltage_set(int slot, int vcc, int vpp)
{ {
u32 reg = 0; u32 reg = 0;
switch(vcc) { switch (vcc) {
case 0: case 0:
break; break;
case 33: case 33:
reg |= BCSR1_PCCVCC0; reg |= BCSR1_PCCVCC0;
break; break;
case 50: case 50:
reg |= BCSR1_PCCVCC1; reg |= BCSR1_PCCVCC1;
break; break;
default: default:
return 1; return 1;
} }
switch(vpp) { switch (vpp) {
case 0: case 0:
break; break;
case 33: case 33:
case 50: case 50:
if(vcc == vpp) if (vcc == vpp)
reg |= BCSR1_PCCVPP1; reg |= BCSR1_PCCVPP1;
else else
return 1;
break;
case 120:
if ((vcc == 33) || (vcc == 50))
reg |= BCSR1_PCCVPP0;
else
return 1;
default:
return 1; return 1;
break;
case 120:
if ((vcc == 33) || (vcc == 50))
reg |= BCSR1_PCCVPP0;
else
return 1;
default:
return 1;
} }
/* first, turn off all power */ /* first, turn off all power */
out_be32((u32 *)BCSR1, in_be32((u32 *)BCSR1) & ~(BCSR1_PCCVCC_MASK | BCSR1_PCCVPP_MASK)); out_be32((u32 *) BCSR1,
in_be32((u32 *) BCSR1) & ~(BCSR1_PCCVCC_MASK |
BCSR1_PCCVPP_MASK));
/* enable new powersettings */ /* enable new powersettings */
out_be32((u32 *)BCSR1, in_be32((u32 *)BCSR1) | reg); out_be32((u32 *) BCSR1, in_be32((u32 *) BCSR1) | reg);
return 0; return 0;
} }
...@@ -391,12 +398,12 @@ static int voltage_set(int slot, int vcc, int vpp) ...@@ -391,12 +398,12 @@ static int voltage_set(int slot, int vcc, int vpp)
static void hardware_enable(int slot) static void hardware_enable(int slot)
{ {
out_be32((u32 *)BCSR1, in_be32((u32 *)BCSR1) & ~BCSR1_PCCEN); out_be32((u32 *) BCSR1, in_be32((u32 *) BCSR1) & ~BCSR1_PCCEN);
} }
static void hardware_disable(int slot) static void hardware_disable(int slot)
{ {
out_be32((u32 *)BCSR1, in_be32((u32 *)BCSR1) | BCSR1_PCCEN); out_be32((u32 *) BCSR1, in_be32((u32 *) BCSR1) | BCSR1_PCCEN);
} }
#endif #endif
...@@ -410,7 +417,7 @@ static void hardware_disable(int slot) ...@@ -410,7 +417,7 @@ static void hardware_disable(int slot)
static inline void hardware_enable(int slot) static inline void hardware_enable(int slot)
{ {
m8xx_pcmcia_ops.hw_ctrl(slot, 1); m8xx_pcmcia_ops.hw_ctrl(slot, 1);
} }
static inline void hardware_disable(int slot) static inline void hardware_disable(int slot)
...@@ -436,52 +443,53 @@ static int voltage_set(int slot, int vcc, int vpp) ...@@ -436,52 +443,53 @@ static int voltage_set(int slot, int vcc, int vpp)
{ {
u8 reg = 0; u8 reg = 0;
switch(vcc) { switch (vcc) {
case 0: case 0:
break; break;
case 33: case 33:
reg |= CSR2_VCC_33; reg |= CSR2_VCC_33;
break; break;
case 50: case 50:
reg |= CSR2_VCC_50; reg |= CSR2_VCC_50;
break; break;
default: default:
return 1; return 1;
} }
switch(vpp) { switch (vpp) {
case 0: case 0:
break; break;
case 33: case 33:
case 50: case 50:
if(vcc == vpp) if (vcc == vpp)
reg |= CSR2_VPP_VCC; reg |= CSR2_VPP_VCC;
else else
return 1; return 1;
break; break;
case 120: case 120:
if ((vcc == 33) || (vcc == 50)) if ((vcc == 33) || (vcc == 50))
reg |= CSR2_VPP_12; reg |= CSR2_VPP_12;
else else
return 1;
default:
return 1; return 1;
default:
return 1;
} }
/* first, turn off all power */ /* first, turn off all power */
out_8((u8 *)MBX_CSR2_ADDR, in_8((u8 *)MBX_CSR2_ADDR) & ~(CSR2_VCC_MASK | CSR2_VPP_MASK)); out_8((u8 *) MBX_CSR2_ADDR,
in_8((u8 *) MBX_CSR2_ADDR) & ~(CSR2_VCC_MASK | CSR2_VPP_MASK));
/* enable new powersettings */ /* enable new powersettings */
out_8((u8 *)MBX_CSR2_ADDR, in_8((u8 *)MBX_CSR2_ADDR) | reg); out_8((u8 *) MBX_CSR2_ADDR, in_8((u8 *) MBX_CSR2_ADDR) | reg);
return 0; return 0;
} }
#define socket_get(_slot_) PCMCIA_SOCKET_KEY_5V #define socket_get(_slot_) PCMCIA_SOCKET_KEY_5V
#define hardware_enable(_slot_) /* No hardware to enable */ #define hardware_enable(_slot_) /* No hardware to enable */
#define hardware_disable(_slot_) /* No hardware to disable */ #define hardware_disable(_slot_) /* No hardware to disable */
#endif /* CONFIG_MBX */ #endif /* CONFIG_MBX */
#if defined(CONFIG_PRxK) #if defined(CONFIG_PRxK)
#include <asm/cpld.h> #include <asm/cpld.h>
...@@ -495,43 +503,46 @@ static int voltage_set(int slot, int vcc, int vpp) ...@@ -495,43 +503,46 @@ static int voltage_set(int slot, int vcc, int vpp)
u8 regread; u8 regread;
cpld_regs *ccpld = get_cpld(); cpld_regs *ccpld = get_cpld();
switch(vcc) { switch (vcc) {
case 0: case 0:
break; break;
case 33: case 33:
reg |= PCMCIA_VCC_33; reg |= PCMCIA_VCC_33;
break; break;
case 50: case 50:
reg |= PCMCIA_VCC_50; reg |= PCMCIA_VCC_50;
break; break;
default: default:
return 1; return 1;
} }
switch(vpp) { switch (vpp) {
case 0: case 0:
break; break;
case 33: case 33:
case 50: case 50:
if(vcc == vpp) if (vcc == vpp)
reg |= PCMCIA_VPP_VCC; reg |= PCMCIA_VPP_VCC;
else else
return 1;
break;
case 120:
if ((vcc == 33) || (vcc == 50))
reg |= PCMCIA_VPP_12;
else
return 1;
default:
return 1; return 1;
break;
case 120:
if ((vcc == 33) || (vcc == 50))
reg |= PCMCIA_VPP_12;
else
return 1;
default:
return 1;
} }
reg = reg >> (slot << 2); reg = reg >> (slot << 2);
regread = in_8(&ccpld->fpga_pc_ctl); regread = in_8(&ccpld->fpga_pc_ctl);
if (reg != (regread & ((PCMCIA_VCC_MASK | PCMCIA_VPP_MASK) >> (slot << 2)))) { if (reg !=
(regread & ((PCMCIA_VCC_MASK | PCMCIA_VPP_MASK) >> (slot << 2)))) {
/* enable new powersettings */ /* enable new powersettings */
regread = regread & ~((PCMCIA_VCC_MASK | PCMCIA_VPP_MASK) >> (slot << 2)); regread =
regread & ~((PCMCIA_VCC_MASK | PCMCIA_VPP_MASK) >>
(slot << 2));
out_8(&ccpld->fpga_pc_ctl, reg | regread); out_8(&ccpld->fpga_pc_ctl, reg | regread);
msleep(100); msleep(100);
} }
...@@ -540,10 +551,10 @@ static int voltage_set(int slot, int vcc, int vpp) ...@@ -540,10 +551,10 @@ static int voltage_set(int slot, int vcc, int vpp)
} }
#define socket_get(_slot_) PCMCIA_SOCKET_KEY_LV #define socket_get(_slot_) PCMCIA_SOCKET_KEY_LV
#define hardware_enable(_slot_) /* No hardware to enable */ #define hardware_enable(_slot_) /* No hardware to enable */
#define hardware_disable(_slot_) /* No hardware to disable */ #define hardware_disable(_slot_) /* No hardware to disable */
#endif /* CONFIG_PRxK */ #endif /* CONFIG_PRxK */
static u32 pending_events[PCMCIA_SOCKETS_NO]; static u32 pending_events[PCMCIA_SOCKETS_NO];
static DEFINE_SPINLOCK(pending_event_lock); static DEFINE_SPINLOCK(pending_event_lock);
...@@ -553,7 +564,7 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev) ...@@ -553,7 +564,7 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev)
struct socket_info *s; struct socket_info *s;
struct event_table *e; struct event_table *e;
unsigned int i, events, pscr, pipr, per; unsigned int i, events, pscr, pipr, per;
pcmconf8xx_t *pcmcia = socket[0].pcmcia; pcmconf8xx_t *pcmcia = socket[0].pcmcia;
dprintk("Interrupt!\n"); dprintk("Interrupt!\n");
/* get interrupt sources */ /* get interrupt sources */
...@@ -562,16 +573,16 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev) ...@@ -562,16 +573,16 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev)
pipr = in_be32(&pcmcia->pcmc_pipr); pipr = in_be32(&pcmcia->pcmc_pipr);
per = in_be32(&pcmcia->pcmc_per); per = in_be32(&pcmcia->pcmc_per);
for(i = 0; i < PCMCIA_SOCKETS_NO; i++) { for (i = 0; i < PCMCIA_SOCKETS_NO; i++) {
s = &socket[i]; s = &socket[i];
e = &s->events[0]; e = &s->events[0];
events = 0; events = 0;
while(e->regbit) { while (e->regbit) {
if(pscr & e->regbit) if (pscr & e->regbit)
events |= e->eventbit; events |= e->eventbit;
e++; e++;
} }
/* /*
...@@ -579,13 +590,11 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev) ...@@ -579,13 +590,11 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev)
* not too nice done, * not too nice done,
* we depend on that CD2 is the bit to the left of CD1... * we depend on that CD2 is the bit to the left of CD1...
*/ */
if(events & SS_DETECT) if (events & SS_DETECT)
if(((pipr & M8XX_PCMCIA_CD2(i)) >> 1) ^ if (((pipr & M8XX_PCMCIA_CD2(i)) >> 1) ^
(pipr & M8XX_PCMCIA_CD1(i))) (pipr & M8XX_PCMCIA_CD1(i))) {
{
events &= ~SS_DETECT; events &= ~SS_DETECT;
} }
#ifdef PCMCIA_GLITCHY_CD #ifdef PCMCIA_GLITCHY_CD
/* /*
* I've experienced CD problems with my ADS board. * I've experienced CD problems with my ADS board.
...@@ -593,24 +602,23 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev) ...@@ -593,24 +602,23 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev)
* real change of Card detection. * real change of Card detection.
*/ */
if((events & SS_DETECT) && if ((events & SS_DETECT) &&
((pipr & ((pipr &
(M8XX_PCMCIA_CD2(i) | M8XX_PCMCIA_CD1(i))) == 0) && (M8XX_PCMCIA_CD2(i) | M8XX_PCMCIA_CD1(i))) == 0) &&
(s->state.Vcc | s->state.Vpp)) { (s->state.Vcc | s->state.Vpp)) {
events &= ~SS_DETECT; events &= ~SS_DETECT;
/*printk( "CD glitch workaround - CD = 0x%08x!\n", /*printk( "CD glitch workaround - CD = 0x%08x!\n",
(pipr & (M8XX_PCMCIA_CD2(i) (pipr & (M8XX_PCMCIA_CD2(i)
| M8XX_PCMCIA_CD1(i))));*/ | M8XX_PCMCIA_CD1(i)))); */
} }
#endif #endif
/* call the handler */ /* call the handler */
dprintk("slot %u: events = 0x%02x, pscr = 0x%08x, " dprintk("slot %u: events = 0x%02x, pscr = 0x%08x, "
"pipr = 0x%08x\n", "pipr = 0x%08x\n", i, events, pscr, pipr);
i, events, pscr, pipr);
if(events) { if (events) {
spin_lock(&pending_event_lock); spin_lock(&pending_event_lock);
pending_events[i] |= events; pending_events[i] |= events;
spin_unlock(&pending_event_lock); spin_unlock(&pending_event_lock);
...@@ -643,11 +651,11 @@ static u32 m8xx_get_graycode(u32 size) ...@@ -643,11 +651,11 @@ static u32 m8xx_get_graycode(u32 size)
{ {
u32 k; u32 k;
for(k = 0; k < M8XX_SIZES_NO; k++) for (k = 0; k < M8XX_SIZES_NO; k++)
if(m8xx_size_to_gray[k] == size) if (m8xx_size_to_gray[k] == size)
break; break;
if((k == M8XX_SIZES_NO) || (m8xx_size_to_gray[k] == -1)) if ((k == M8XX_SIZES_NO) || (m8xx_size_to_gray[k] == -1))
k = -1; k = -1;
return k; return k;
...@@ -657,7 +665,7 @@ static u32 m8xx_get_speed(u32 ns, u32 is_io, u32 bus_freq) ...@@ -657,7 +665,7 @@ static u32 m8xx_get_speed(u32 ns, u32 is_io, u32 bus_freq)
{ {
u32 reg, clocks, psst, psl, psht; u32 reg, clocks, psst, psl, psht;
if(!ns) { if (!ns) {
/* /*
* We get called with IO maps setup to 0ns * We get called with IO maps setup to 0ns
...@@ -665,10 +673,10 @@ static u32 m8xx_get_speed(u32 ns, u32 is_io, u32 bus_freq) ...@@ -665,10 +673,10 @@ static u32 m8xx_get_speed(u32 ns, u32 is_io, u32 bus_freq)
* They should be 255ns. * They should be 255ns.
*/ */
if(is_io) if (is_io)
ns = 255; ns = 255;
else else
ns = 100; /* fast memory if 0 */ ns = 100; /* fast memory if 0 */
} }
/* /*
...@@ -679,23 +687,23 @@ static u32 m8xx_get_speed(u32 ns, u32 is_io, u32 bus_freq) ...@@ -679,23 +687,23 @@ static u32 m8xx_get_speed(u32 ns, u32 is_io, u32 bus_freq)
/* how we want to adjust the timing - in percent */ /* how we want to adjust the timing - in percent */
#define ADJ 180 /* 80 % longer accesstime - to be sure */ #define ADJ 180 /* 80 % longer accesstime - to be sure */
clocks = ((bus_freq / 1000) * ns) / 1000; clocks = ((bus_freq / 1000) * ns) / 1000;
clocks = (clocks * ADJ) / (100*1000); clocks = (clocks * ADJ) / (100 * 1000);
if(clocks >= PCMCIA_BMT_LIMIT) { if (clocks >= PCMCIA_BMT_LIMIT) {
printk( "Max access time limit reached\n"); printk("Max access time limit reached\n");
clocks = PCMCIA_BMT_LIMIT-1; clocks = PCMCIA_BMT_LIMIT - 1;
} }
psst = clocks / 7; /* setup time */ psst = clocks / 7; /* setup time */
psht = clocks / 7; /* hold time */ psht = clocks / 7; /* hold time */
psl = (clocks * 5) / 7; /* strobe length */ psl = (clocks * 5) / 7; /* strobe length */
psst += clocks - (psst + psht + psl); psst += clocks - (psst + psht + psl);
reg = psst << 12; reg = psst << 12;
reg |= psl << 7; reg |= psl << 7;
reg |= psht << 16; reg |= psht << 16;
return reg; return reg;
...@@ -710,8 +718,8 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value) ...@@ -710,8 +718,8 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value)
pipr = in_be32(&pcmcia->pcmc_pipr); pipr = in_be32(&pcmcia->pcmc_pipr);
*value = ((pipr & (M8XX_PCMCIA_CD1(lsock) *value = ((pipr & (M8XX_PCMCIA_CD1(lsock)
| M8XX_PCMCIA_CD2(lsock))) == 0) ? SS_DETECT : 0; | M8XX_PCMCIA_CD2(lsock))) == 0) ? SS_DETECT : 0;
*value |= (pipr & M8XX_PCMCIA_WP(lsock)) ? SS_WRPROT : 0; *value |= (pipr & M8XX_PCMCIA_WP(lsock)) ? SS_WRPROT : 0;
if (s->state.flags & SS_IOCARD) if (s->state.flags & SS_IOCARD)
...@@ -795,16 +803,16 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value) ...@@ -795,16 +803,16 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value)
/* read out VS1 and VS2 */ /* read out VS1 and VS2 */
reg = (pipr & M8XX_PCMCIA_VS_MASK(lsock)) reg = (pipr & M8XX_PCMCIA_VS_MASK(lsock))
>> M8XX_PCMCIA_VS_SHIFT(lsock); >> M8XX_PCMCIA_VS_SHIFT(lsock);
if(socket_get(lsock) == PCMCIA_SOCKET_KEY_LV) { if (socket_get(lsock) == PCMCIA_SOCKET_KEY_LV) {
switch(reg) { switch (reg) {
case 1: case 1:
*value |= SS_3VCARD; *value |= SS_3VCARD;
break; /* GND, NC - 3.3V only */ break; /* GND, NC - 3.3V only */
case 2: case 2:
*value |= SS_XVCARD; *value |= SS_XVCARD;
break; /* NC. GND - x.xV only */ break; /* NC. GND - x.xV only */
}; };
} }
...@@ -812,7 +820,7 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value) ...@@ -812,7 +820,7 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value)
return 0; return 0;
} }
static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state) static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t * state)
{ {
int lsock = container_of(sock, struct socket_info, socket)->slot; int lsock = container_of(sock, struct socket_info, socket)->slot;
struct socket_info *s = &socket[lsock]; struct socket_info *s = &socket[lsock];
...@@ -821,20 +829,20 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state) ...@@ -821,20 +829,20 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
unsigned long flags; unsigned long flags;
pcmconf8xx_t *pcmcia = socket[0].pcmcia; pcmconf8xx_t *pcmcia = socket[0].pcmcia;
dprintk( "SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, " dprintk("SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "
"io_irq %d, csc_mask %#2.2x)\n", lsock, state->flags, "io_irq %d, csc_mask %#2.2x)\n", lsock, state->flags,
state->Vcc, state->Vpp, state->io_irq, state->csc_mask); state->Vcc, state->Vpp, state->io_irq, state->csc_mask);
/* First, set voltage - bail out if invalid */ /* First, set voltage - bail out if invalid */
if(voltage_set(lsock, state->Vcc, state->Vpp)) if (voltage_set(lsock, state->Vcc, state->Vpp))
return -EINVAL; return -EINVAL;
/* Take care of reset... */ /* Take care of reset... */
if(state->flags & SS_RESET) if (state->flags & SS_RESET)
out_be32(M8XX_PGCRX(lsock), in_be32(M8XX_PGCRX(lsock)) | M8XX_PGCRX_CXRESET); /* active high */ out_be32(M8XX_PGCRX(lsock), in_be32(M8XX_PGCRX(lsock)) | M8XX_PGCRX_CXRESET); /* active high */
else else
out_be32(M8XX_PGCRX(lsock), in_be32(M8XX_PGCRX(lsock)) & ~M8XX_PGCRX_CXRESET); out_be32(M8XX_PGCRX(lsock),
in_be32(M8XX_PGCRX(lsock)) & ~M8XX_PGCRX_CXRESET);
/* ... and output enable. */ /* ... and output enable. */
...@@ -846,10 +854,11 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state) ...@@ -846,10 +854,11 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
no pullups are present -> the cards act wierd. no pullups are present -> the cards act wierd.
So right now the buffers are enabled if the power is on. */ So right now the buffers are enabled if the power is on. */
if(state->Vcc || state->Vpp) if (state->Vcc || state->Vpp)
out_be32(M8XX_PGCRX(lsock), in_be32(M8XX_PGCRX(lsock)) & ~M8XX_PGCRX_CXOE); /* active low */ out_be32(M8XX_PGCRX(lsock), in_be32(M8XX_PGCRX(lsock)) & ~M8XX_PGCRX_CXOE); /* active low */
else else
out_be32(M8XX_PGCRX(lsock), in_be32(M8XX_PGCRX(lsock)) | M8XX_PGCRX_CXOE); out_be32(M8XX_PGCRX(lsock),
in_be32(M8XX_PGCRX(lsock)) | M8XX_PGCRX_CXOE);
/* /*
* We'd better turn off interrupts before * We'd better turn off interrupts before
...@@ -866,17 +875,17 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state) ...@@ -866,17 +875,17 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
e = &s->events[0]; e = &s->events[0];
reg = 0; reg = 0;
if(state->csc_mask & SS_DETECT) { if (state->csc_mask & SS_DETECT) {
e->eventbit = SS_DETECT; e->eventbit = SS_DETECT;
reg |= e->regbit = (M8XX_PCMCIA_CD2(lsock) reg |= e->regbit = (M8XX_PCMCIA_CD2(lsock)
| M8XX_PCMCIA_CD1(lsock)); | M8XX_PCMCIA_CD1(lsock));
e++; e++;
} }
if(state->flags & SS_IOCARD) { if (state->flags & SS_IOCARD) {
/* /*
* I/O card * I/O card
*/ */
if(state->csc_mask & SS_STSCHG) { if (state->csc_mask & SS_STSCHG) {
e->eventbit = SS_STSCHG; e->eventbit = SS_STSCHG;
reg |= e->regbit = M8XX_PCMCIA_BVD1(lsock); reg |= e->regbit = M8XX_PCMCIA_BVD1(lsock);
e++; e++;
...@@ -884,9 +893,10 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state) ...@@ -884,9 +893,10 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
/* /*
* If io_irq is non-zero we should enable irq. * If io_irq is non-zero we should enable irq.
*/ */
if(state->io_irq) { if (state->io_irq) {
out_be32(M8XX_PGCRX(lsock), out_be32(M8XX_PGCRX(lsock),
in_be32(M8XX_PGCRX(lsock)) | mk_int_int_mask(s->hwirq) << 24); in_be32(M8XX_PGCRX(lsock)) |
mk_int_int_mask(s->hwirq) << 24);
/* /*
* Strange thing here: * Strange thing here:
* The manual does not tell us which interrupt * The manual does not tell us which interrupt
...@@ -897,33 +907,32 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state) ...@@ -897,33 +907,32 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
* have to be cleared in PSCR in the interrupt handler. * have to be cleared in PSCR in the interrupt handler.
*/ */
reg |= M8XX_PCMCIA_RDY_L(lsock); reg |= M8XX_PCMCIA_RDY_L(lsock);
} } else
else out_be32(M8XX_PGCRX(lsock),
out_be32(M8XX_PGCRX(lsock), in_be32(M8XX_PGCRX(lsock)) & 0x00ffffff); in_be32(M8XX_PGCRX(lsock)) & 0x00ffffff);
} } else {
else {
/* /*
* Memory card * Memory card
*/ */
if(state->csc_mask & SS_BATDEAD) { if (state->csc_mask & SS_BATDEAD) {
e->eventbit = SS_BATDEAD; e->eventbit = SS_BATDEAD;
reg |= e->regbit = M8XX_PCMCIA_BVD1(lsock); reg |= e->regbit = M8XX_PCMCIA_BVD1(lsock);
e++; e++;
} }
if(state->csc_mask & SS_BATWARN) { if (state->csc_mask & SS_BATWARN) {
e->eventbit = SS_BATWARN; e->eventbit = SS_BATWARN;
reg |= e->regbit = M8XX_PCMCIA_BVD2(lsock); reg |= e->regbit = M8XX_PCMCIA_BVD2(lsock);
e++; e++;
} }
/* What should I trigger on - low/high,raise,fall? */ /* What should I trigger on - low/high,raise,fall? */
if(state->csc_mask & SS_READY) { if (state->csc_mask & SS_READY) {
e->eventbit = SS_READY; e->eventbit = SS_READY;
reg |= e->regbit = 0; //?? reg |= e->regbit = 0; //??
e++; e++;
} }
} }
e->regbit = 0; /* terminate list */ e->regbit = 0; /* terminate list */
/* /*
* Clear the status changed . * Clear the status changed .
...@@ -940,7 +949,9 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state) ...@@ -940,7 +949,9 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
* Ones will enable the interrupt. * Ones will enable the interrupt.
*/ */
reg |= in_be32(&pcmcia->pcmc_per) & (M8XX_PCMCIA_MASK(0) | M8XX_PCMCIA_MASK(1)); reg |=
in_be32(&pcmcia->
pcmc_per) & (M8XX_PCMCIA_MASK(0) | M8XX_PCMCIA_MASK(1));
out_be32(&pcmcia->pcmc_per, reg); out_be32(&pcmcia->pcmc_per, reg);
spin_unlock_irqrestore(&events_lock, flags); spin_unlock_irqrestore(&events_lock, flags);
...@@ -961,67 +972,66 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) ...@@ -961,67 +972,66 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io)
unsigned int reg, winnr; unsigned int reg, winnr;
pcmconf8xx_t *pcmcia = s->pcmcia; pcmconf8xx_t *pcmcia = s->pcmcia;
#define M8XX_SIZE (io->stop - io->start + 1) #define M8XX_SIZE (io->stop - io->start + 1)
#define M8XX_BASE (PCMCIA_IO_WIN_BASE + io->start) #define M8XX_BASE (PCMCIA_IO_WIN_BASE + io->start)
dprintk( "SetIOMap(%d, %d, %#2.2x, %d ns, " dprintk("SetIOMap(%d, %d, %#2.2x, %d ns, "
"%#4.4x-%#4.4x)\n", lsock, io->map, io->flags, "%#4.4x-%#4.4x)\n", lsock, io->map, io->flags,
io->speed, io->start, io->stop); io->speed, io->start, io->stop);
if ((io->map >= PCMCIA_IO_WIN_NO) || (io->start > 0xffff) if ((io->map >= PCMCIA_IO_WIN_NO) || (io->start > 0xffff)
|| (io->stop > 0xffff) || (io->stop < io->start)) || (io->stop > 0xffff) || (io->stop < io->start))
return -EINVAL; return -EINVAL;
if((reg = m8xx_get_graycode(M8XX_SIZE)) == -1) if ((reg = m8xx_get_graycode(M8XX_SIZE)) == -1)
return -EINVAL; return -EINVAL;
if(io->flags & MAP_ACTIVE) { if (io->flags & MAP_ACTIVE) {
dprintk( "io->flags & MAP_ACTIVE\n"); dprintk("io->flags & MAP_ACTIVE\n");
winnr = (PCMCIA_MEM_WIN_NO * PCMCIA_SOCKETS_NO) winnr = (PCMCIA_MEM_WIN_NO * PCMCIA_SOCKETS_NO)
+ (lsock * PCMCIA_IO_WIN_NO) + io->map; + (lsock * PCMCIA_IO_WIN_NO) + io->map;
/* setup registers */ /* setup registers */
w = (void *) &pcmcia->pcmc_pbr0; w = (void *)&pcmcia->pcmc_pbr0;
w += winnr; w += winnr;
out_be32(&w->or, 0); /* turn off window first */ out_be32(&w->or, 0); /* turn off window first */
out_be32(&w->br, M8XX_BASE); out_be32(&w->br, M8XX_BASE);
reg <<= 27; reg <<= 27;
reg |= M8XX_PCMCIA_POR_IO |(lsock << 2); reg |= M8XX_PCMCIA_POR_IO | (lsock << 2);
reg |= m8xx_get_speed(io->speed, 1, s->bus_freq); reg |= m8xx_get_speed(io->speed, 1, s->bus_freq);
if(io->flags & MAP_WRPROT) if (io->flags & MAP_WRPROT)
reg |= M8XX_PCMCIA_POR_WRPROT; reg |= M8XX_PCMCIA_POR_WRPROT;
/*if(io->flags & (MAP_16BIT | MAP_AUTOSZ))*/ /*if(io->flags & (MAP_16BIT | MAP_AUTOSZ)) */
if(io->flags & MAP_16BIT) if (io->flags & MAP_16BIT)
reg |= M8XX_PCMCIA_POR_16BIT; reg |= M8XX_PCMCIA_POR_16BIT;
if(io->flags & MAP_ACTIVE) if (io->flags & MAP_ACTIVE)
reg |= M8XX_PCMCIA_POR_VALID; reg |= M8XX_PCMCIA_POR_VALID;
out_be32(&w->or, reg); out_be32(&w->or, reg);
dprintk("Socket %u: Mapped io window %u at %#8.8x, " dprintk("Socket %u: Mapped io window %u at %#8.8x, "
"OR = %#8.8x.\n", lsock, io->map, w->br, w->or); "OR = %#8.8x.\n", lsock, io->map, w->br, w->or);
} else { } else {
/* shutdown IO window */ /* shutdown IO window */
winnr = (PCMCIA_MEM_WIN_NO * PCMCIA_SOCKETS_NO) winnr = (PCMCIA_MEM_WIN_NO * PCMCIA_SOCKETS_NO)
+ (lsock * PCMCIA_IO_WIN_NO) + io->map; + (lsock * PCMCIA_IO_WIN_NO) + io->map;
/* setup registers */ /* setup registers */
w = (void *) &pcmcia->pcmc_pbr0; w = (void *)&pcmcia->pcmc_pbr0;
w += winnr; w += winnr;
out_be32(&w->or, 0); /* turn off window */ out_be32(&w->or, 0); /* turn off window */
out_be32(&w->br, 0); /* turn off base address */ out_be32(&w->br, 0); /* turn off base address */
dprintk("Socket %u: Unmapped io window %u at %#8.8x, " dprintk("Socket %u: Unmapped io window %u at %#8.8x, "
"OR = %#8.8x.\n", lsock, io->map, w->br, w->or); "OR = %#8.8x.\n", lsock, io->map, w->br, w->or);
...@@ -1029,15 +1039,14 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) ...@@ -1029,15 +1039,14 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io)
/* copy the struct and modify the copy */ /* copy the struct and modify the copy */
s->io_win[io->map] = *io; s->io_win[io->map] = *io;
s->io_win[io->map].flags &= (MAP_WRPROT s->io_win[io->map].flags &= (MAP_WRPROT | MAP_16BIT | MAP_ACTIVE);
| MAP_16BIT
| MAP_ACTIVE);
dprintk("SetIOMap exit\n"); dprintk("SetIOMap exit\n");
return 0; return 0;
} }
static int m8xx_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *mem) static int m8xx_set_mem_map(struct pcmcia_socket *sock,
struct pccard_mem_map *mem)
{ {
int lsock = container_of(sock, struct socket_info, socket)->slot; int lsock = container_of(sock, struct socket_info, socket)->slot;
struct socket_info *s = &socket[lsock]; struct socket_info *s = &socket[lsock];
...@@ -1046,19 +1055,19 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m ...@@ -1046,19 +1055,19 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m
unsigned int reg, winnr; unsigned int reg, winnr;
pcmconf8xx_t *pcmcia = s->pcmcia; pcmconf8xx_t *pcmcia = s->pcmcia;
dprintk( "SetMemMap(%d, %d, %#2.2x, %d ns, " dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, "
"%#5.5lx, %#5.5x)\n", lsock, mem->map, mem->flags, "%#5.5lx, %#5.5x)\n", lsock, mem->map, mem->flags,
mem->speed, mem->static_start, mem->card_start); mem->speed, mem->static_start, mem->card_start);
if ((mem->map >= PCMCIA_MEM_WIN_NO) if ((mem->map >= PCMCIA_MEM_WIN_NO)
// || ((mem->s) >= PCMCIA_MEM_WIN_SIZE) // || ((mem->s) >= PCMCIA_MEM_WIN_SIZE)
|| (mem->card_start >= 0x04000000) || (mem->card_start >= 0x04000000)
|| (mem->static_start & 0xfff) /* 4KByte resolution */ || (mem->static_start & 0xfff) /* 4KByte resolution */
|| (mem->card_start & 0xfff)) ||(mem->card_start & 0xfff))
return -EINVAL; return -EINVAL;
if((reg = m8xx_get_graycode(PCMCIA_MEM_WIN_SIZE)) == -1) { if ((reg = m8xx_get_graycode(PCMCIA_MEM_WIN_SIZE)) == -1) {
printk( "Cannot set size to 0x%08x.\n", PCMCIA_MEM_WIN_SIZE); printk("Cannot set size to 0x%08x.\n", PCMCIA_MEM_WIN_SIZE);
return -EINVAL; return -EINVAL;
} }
reg <<= 27; reg <<= 27;
...@@ -1067,50 +1076,47 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m ...@@ -1067,50 +1076,47 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m
/* Setup the window in the pcmcia controller */ /* Setup the window in the pcmcia controller */
w = (void *) &pcmcia->pcmc_pbr0; w = (void *)&pcmcia->pcmc_pbr0;
w += winnr; w += winnr;
reg |= lsock << 2; reg |= lsock << 2;
reg |= m8xx_get_speed(mem->speed, 0, s->bus_freq); reg |= m8xx_get_speed(mem->speed, 0, s->bus_freq);
if(mem->flags & MAP_ATTRIB) if (mem->flags & MAP_ATTRIB)
reg |= M8XX_PCMCIA_POR_ATTRMEM; reg |= M8XX_PCMCIA_POR_ATTRMEM;
if(mem->flags & MAP_WRPROT) if (mem->flags & MAP_WRPROT)
reg |= M8XX_PCMCIA_POR_WRPROT; reg |= M8XX_PCMCIA_POR_WRPROT;
if(mem->flags & MAP_16BIT) if (mem->flags & MAP_16BIT)
reg |= M8XX_PCMCIA_POR_16BIT; reg |= M8XX_PCMCIA_POR_16BIT;
if(mem->flags & MAP_ACTIVE) if (mem->flags & MAP_ACTIVE)
reg |= M8XX_PCMCIA_POR_VALID; reg |= M8XX_PCMCIA_POR_VALID;
out_be32(&w->or, reg); out_be32(&w->or, reg);
dprintk("Socket %u: Mapped memory window %u at %#8.8x, " dprintk("Socket %u: Mapped memory window %u at %#8.8x, "
"OR = %#8.8x.\n", lsock, mem->map, w->br, w->or); "OR = %#8.8x.\n", lsock, mem->map, w->br, w->or);
if(mem->flags & MAP_ACTIVE) { if (mem->flags & MAP_ACTIVE) {
/* get the new base address */ /* get the new base address */
mem->static_start = PCMCIA_MEM_WIN_BASE + mem->static_start = PCMCIA_MEM_WIN_BASE +
(PCMCIA_MEM_WIN_SIZE * winnr) (PCMCIA_MEM_WIN_SIZE * winnr)
+ mem->card_start; + mem->card_start;
} }
dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, " dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, "
"%#5.5lx, %#5.5x)\n", lsock, mem->map, mem->flags, "%#5.5lx, %#5.5x)\n", lsock, mem->map, mem->flags,
mem->speed, mem->static_start, mem->card_start); mem->speed, mem->static_start, mem->card_start);
/* copy the struct and modify the copy */ /* copy the struct and modify the copy */
old = &s->mem_win[mem->map]; old = &s->mem_win[mem->map];
*old = *mem; *old = *mem;
old->flags &= (MAP_ATTRIB old->flags &= (MAP_ATTRIB | MAP_WRPROT | MAP_16BIT | MAP_ACTIVE);
| MAP_WRPROT
| MAP_16BIT
| MAP_ACTIVE);
return 0; return 0;
} }
...@@ -1121,7 +1127,7 @@ static int m8xx_sock_init(struct pcmcia_socket *sock) ...@@ -1121,7 +1127,7 @@ static int m8xx_sock_init(struct pcmcia_socket *sock)
pccard_io_map io = { 0, 0, 0, 0, 1 }; pccard_io_map io = { 0, 0, 0, 0, 1 };
pccard_mem_map mem = { 0, 0, 0, 0, 0, 0 }; pccard_mem_map mem = { 0, 0, 0, 0, 0, 0 };
dprintk( "sock_init(%d)\n", s); dprintk("sock_init(%d)\n", s);
m8xx_set_socket(sock, &dead_socket); m8xx_set_socket(sock, &dead_socket);
for (i = 0; i < PCMCIA_IO_WIN_NO; i++) { for (i = 0; i < PCMCIA_IO_WIN_NO; i++) {
...@@ -1143,7 +1149,7 @@ static int m8xx_sock_suspend(struct pcmcia_socket *sock) ...@@ -1143,7 +1149,7 @@ static int m8xx_sock_suspend(struct pcmcia_socket *sock)
} }
static struct pccard_operations m8xx_services = { static struct pccard_operations m8xx_services = {
.init = m8xx_sock_init, .init = m8xx_sock_init,
.suspend = m8xx_sock_suspend, .suspend = m8xx_sock_suspend,
.get_status = m8xx_get_status, .get_status = m8xx_get_status,
.set_socket = m8xx_set_socket, .set_socket = m8xx_set_socket,
...@@ -1151,7 +1157,8 @@ static struct pccard_operations m8xx_services = { ...@@ -1151,7 +1157,8 @@ static struct pccard_operations m8xx_services = {
.set_mem_map = m8xx_set_mem_map, .set_mem_map = m8xx_set_mem_map,
}; };
static int __init m8xx_probe(struct of_device *ofdev, const struct of_device_id *match) static int __init m8xx_probe(struct of_device *ofdev,
const struct of_device_id *match)
{ {
struct pcmcia_win *w; struct pcmcia_win *w;
unsigned int i, m, hwirq; unsigned int i, m, hwirq;
...@@ -1162,49 +1169,50 @@ static int __init m8xx_probe(struct of_device *ofdev, const struct of_device_id ...@@ -1162,49 +1169,50 @@ static int __init m8xx_probe(struct of_device *ofdev, const struct of_device_id
pcmcia_info("%s\n", version); pcmcia_info("%s\n", version);
pcmcia = of_iomap(np, 0); pcmcia = of_iomap(np, 0);
if(pcmcia == NULL) if (pcmcia == NULL)
return -EINVAL; return -EINVAL;
pcmcia_schlvl = irq_of_parse_and_map(np, 0); pcmcia_schlvl = irq_of_parse_and_map(np, 0);
hwirq = irq_map[pcmcia_schlvl].hwirq; hwirq = irq_map[pcmcia_schlvl].hwirq;
if (pcmcia_schlvl < 0) if (pcmcia_schlvl < 0)
return -EINVAL; return -EINVAL;
m8xx_pgcrx[0] = &pcmcia->pcmc_pgcra; m8xx_pgcrx[0] = &pcmcia->pcmc_pgcra;
m8xx_pgcrx[1] = &pcmcia->pcmc_pgcrb; m8xx_pgcrx[1] = &pcmcia->pcmc_pgcrb;
pcmcia_info(PCMCIA_BOARD_MSG " using " PCMCIA_SLOT_MSG pcmcia_info(PCMCIA_BOARD_MSG " using " PCMCIA_SLOT_MSG
" with IRQ %u (%d). \n", pcmcia_schlvl, hwirq); " with IRQ %u (%d). \n", pcmcia_schlvl, hwirq);
/* Configure Status change interrupt */ /* Configure Status change interrupt */
if(request_irq(pcmcia_schlvl, m8xx_interrupt, IRQF_SHARED, if (request_irq(pcmcia_schlvl, m8xx_interrupt, IRQF_SHARED,
driver_name, socket)) { driver_name, socket)) {
pcmcia_error("Cannot allocate IRQ %u for SCHLVL!\n", pcmcia_error("Cannot allocate IRQ %u for SCHLVL!\n",
pcmcia_schlvl); pcmcia_schlvl);
return -1; return -1;
} }
w = (void *) &pcmcia->pcmc_pbr0; w = (void *)&pcmcia->pcmc_pbr0;
out_be32(&pcmcia->pcmc_pscr, M8XX_PCMCIA_MASK(0)| M8XX_PCMCIA_MASK(1)); out_be32(&pcmcia->pcmc_pscr, M8XX_PCMCIA_MASK(0) | M8XX_PCMCIA_MASK(1));
clrbits32(&pcmcia->pcmc_per, M8XX_PCMCIA_MASK(0) | M8XX_PCMCIA_MASK(1)); clrbits32(&pcmcia->pcmc_per, M8XX_PCMCIA_MASK(0) | M8XX_PCMCIA_MASK(1));
/* connect interrupt and disable CxOE */ /* connect interrupt and disable CxOE */
out_be32(M8XX_PGCRX(0), M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16)); out_be32(M8XX_PGCRX(0),
out_be32(M8XX_PGCRX(1), M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16)); M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16));
out_be32(M8XX_PGCRX(1),
M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16));
/* intialize the fixed memory windows */ /* intialize the fixed memory windows */
for(i = 0; i < PCMCIA_SOCKETS_NO; i++){ for (i = 0; i < PCMCIA_SOCKETS_NO; i++) {
for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) { for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) {
out_be32(&w->br, PCMCIA_MEM_WIN_BASE + out_be32(&w->br, PCMCIA_MEM_WIN_BASE +
(PCMCIA_MEM_WIN_SIZE (PCMCIA_MEM_WIN_SIZE
* (m + i * PCMCIA_MEM_WIN_NO))); * (m + i * PCMCIA_MEM_WIN_NO)));
out_be32(&w->or, 0); /* set to not valid */ out_be32(&w->or, 0); /* set to not valid */
w++; w++;
} }
...@@ -1218,10 +1226,11 @@ static int __init m8xx_probe(struct of_device *ofdev, const struct of_device_id ...@@ -1218,10 +1226,11 @@ static int __init m8xx_probe(struct of_device *ofdev, const struct of_device_id
hardware_enable(0); hardware_enable(0);
hardware_enable(1); hardware_enable(1);
for (i = 0 ; i < PCMCIA_SOCKETS_NO; i++) { for (i = 0; i < PCMCIA_SOCKETS_NO; i++) {
socket[i].slot = i; socket[i].slot = i;
socket[i].socket.owner = THIS_MODULE; socket[i].socket.owner = THIS_MODULE;
socket[i].socket.features = SS_CAP_PCCARD | SS_CAP_MEM_ALIGN | SS_CAP_STATIC_MAP; socket[i].socket.features =
SS_CAP_PCCARD | SS_CAP_MEM_ALIGN | SS_CAP_STATIC_MAP;
socket[i].socket.irq_mask = 0x000; socket[i].socket.irq_mask = 0x000;
socket[i].socket.map_size = 0x1000; socket[i].socket.map_size = 0x1000;
socket[i].socket.io_offset = 0; socket[i].socket.io_offset = 0;
...@@ -1234,7 +1243,6 @@ static int __init m8xx_probe(struct of_device *ofdev, const struct of_device_id ...@@ -1234,7 +1243,6 @@ static int __init m8xx_probe(struct of_device *ofdev, const struct of_device_id
socket[i].bus_freq = ppc_proc_freq; socket[i].bus_freq = ppc_proc_freq;
socket[i].hwirq = hwirq; socket[i].hwirq = hwirq;
} }
for (i = 0; i < PCMCIA_SOCKETS_NO; i++) { for (i = 0; i < PCMCIA_SOCKETS_NO; i++) {
...@@ -1246,25 +1254,25 @@ static int __init m8xx_probe(struct of_device *ofdev, const struct of_device_id ...@@ -1246,25 +1254,25 @@ static int __init m8xx_probe(struct of_device *ofdev, const struct of_device_id
return 0; return 0;
} }
static int m8xx_remove(struct of_device* ofdev) static int m8xx_remove(struct of_device *ofdev)
{ {
u32 m, i; u32 m, i;
struct pcmcia_win *w; struct pcmcia_win *w;
pcmconf8xx_t *pcmcia = socket[0].pcmcia; pcmconf8xx_t *pcmcia = socket[0].pcmcia;
for (i = 0; i < PCMCIA_SOCKETS_NO; i++) { for (i = 0; i < PCMCIA_SOCKETS_NO; i++) {
w = (void *) &pcmcia->pcmc_pbr0; w = (void *)&pcmcia->pcmc_pbr0;
out_be32(&pcmcia->pcmc_pscr, M8XX_PCMCIA_MASK(i)); out_be32(&pcmcia->pcmc_pscr, M8XX_PCMCIA_MASK(i));
out_be32(&pcmcia->pcmc_per, out_be32(&pcmcia->pcmc_per,
in_be32(&pcmcia->pcmc_per) & ~M8XX_PCMCIA_MASK(i)); in_be32(&pcmcia->pcmc_per) & ~M8XX_PCMCIA_MASK(i));
/* turn off interrupt and disable CxOE */ /* turn off interrupt and disable CxOE */
out_be32(M8XX_PGCRX(i), M8XX_PGCRX_CXOE); out_be32(M8XX_PGCRX(i), M8XX_PGCRX_CXOE);
/* turn off memory windows */ /* turn off memory windows */
for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) { for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) {
out_be32(&w->or, 0); /* set to not valid */ out_be32(&w->or, 0); /* set to not valid */
w++; w++;
} }
...@@ -1299,21 +1307,21 @@ static int m8xx_resume(struct platform_device *pdev) ...@@ -1299,21 +1307,21 @@ static int m8xx_resume(struct platform_device *pdev)
static struct of_device_id m8xx_pcmcia_match[] = { static struct of_device_id m8xx_pcmcia_match[] = {
{ {
.type = "pcmcia", .type = "pcmcia",
.compatible = "fsl,pq-pcmcia", .compatible = "fsl,pq-pcmcia",
}, },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, m8xx_pcmcia_match); MODULE_DEVICE_TABLE(of, m8xx_pcmcia_match);
static struct of_platform_driver m8xx_pcmcia_driver = { static struct of_platform_driver m8xx_pcmcia_driver = {
.name = (char *) driver_name, .name = (char *)driver_name,
.match_table = m8xx_pcmcia_match, .match_table = m8xx_pcmcia_match,
.probe = m8xx_probe, .probe = m8xx_probe,
.remove = m8xx_remove, .remove = m8xx_remove,
.suspend = m8xx_suspend, .suspend = m8xx_suspend,
.resume = m8xx_resume, .resume = m8xx_resume,
}; };
static int __init m8xx_init(void) static int __init m8xx_init(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7