Pull request for nanoengine
Hi, The following is a compilation of all the patches I have done for the nanoengine. Some of these are also valid for SA11xx based machines like, e.g, sharp Zaurus. These are just stable and tested patches, this does not include the PCI patches. All of them have been previously submitted to LKML and all critics have been included. The patches should be well commented, in their changesets, but anyway here goes a quick summary: 1) ARM: mach-sa1100: Put nanoEngine support back in the kernel. 2) ARM: mach-sa1100: Add a defconfig for nanoEngine. 3) ARM: mach-sa1100: Fix for compiler warning of uninitialized variable. 4) ARM: mach-sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1100.c. 5) ARM: mach-sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. 6) ARM: mach-sa1100: Fix checkpatch.pl issues in drivers/rtc/rtc-sa1100.c. 7) ARM: mach-sa1100: Print the value of RTSR on /proc/drivers/rtc. - Self explanatory/trivial patches. 8) ARM: mach-sa1100: Fix for a nasty initialization bug in the RTSR. - Fixes a bug that could cause the system to hang. 9) ARM: mach-sa1100: Better use of the RTC framework for sa11xx. - This patch uses the new RTC framework to treat some common ioctl. 10) ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module. - The symbol soc_pcmcia_debug was not beeing exported. 11) ARM: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c - Trivial. 12) ARM: pcmcia: Adds nanoEngine PCMCIA support. - Adds nanoEngine PCMCIA support for two sockets. Regards, Marcelo. -- The following changes since commit aef4b9aaae1decc775778903922bd0075cce7a88: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2010-06-01 14:13:14 -0700) are available in the git repository at: g...@github.com:mrjimenez/linux-2.6.git nanoengine Marcelo Roberto Jimenez (12): ARM: mach-sa1100: Put nanoEngine support back in the kernel. ARM: mach-sa1100: Add a defconfig for nanoEngine. ARM: mach-sa1100: Fix for compiler warning of uninitialized variable. ARM: mach-sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1100.c. ARM: mach-sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. ARM: mach-sa1100: Fix checkpatch.pl issues in drivers/rtc/rtc-sa1100.c. ARM: mach-sa1100: Print the value of RTSR on /proc/drivers/rtc. ARM: mach-sa1100: Fix for a nasty initialization bug in the RTSR. ARM: mach-sa1100: Better use of the RTC framework for sa11xx. ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module. ARM: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c ARM: pcmcia: Adds nanoEngine PCMCIA support. arch/arm/configs/nanoengine_defconfig | 1396 arch/arm/mach-sa1100/Kconfig |8 + arch/arm/mach-sa1100/Makefile |2 + arch/arm/mach-sa1100/cpu-sa1100.c | 56 +- arch/arm/mach-sa1100/cpu-sa1110.c | 51 +- arch/arm/mach-sa1100/include/mach/nanoengine.h | 30 + arch/arm/mach-sa1100/nanoengine.c | 115 ++ drivers/pcmcia/Makefile|3 +- drivers/pcmcia/sa1100_generic.c|3 + drivers/pcmcia/sa1100_generic.h|1 + drivers/pcmcia/sa1100_nanoengine.c | 219 drivers/pcmcia/soc_common.c| 129 ++- drivers/rtc/rtc-sa1100.c | 153 ++- 13 files changed, 2021 insertions(+), 145 deletions(-) create mode 100644 arch/arm/configs/nanoengine_defconfig create mode 100644 arch/arm/mach-sa1100/include/mach/nanoengine.h create mode 100644 arch/arm/mach-sa1100/nanoengine.c create mode 100644 drivers/pcmcia/sa1100_nanoengine.c ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH] ARM: pcmcia: Adds nanoEngine PCMCIA support.
This patch adds nanoEngine PCMCIA support, with support for two sockets.
In order to have a fully functional pcmcia subsystem in a BSE nanoEngine board
you should carefully read this:
http://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/
Signed-off-by: Marcelo Roberto Jimenez
Acked-by: Dominik Brodowski
---
arch/arm/mach-sa1100/include/mach/nanoengine.h | 30
arch/arm/mach-sa1100/nanoengine.c |2 +-
drivers/pcmcia/Makefile|3 +-
drivers/pcmcia/sa1100_generic.c|3 +
drivers/pcmcia/sa1100_generic.h|1 +
drivers/pcmcia/sa1100_nanoengine.c | 219
6 files changed, 256 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/mach-sa1100/include/mach/nanoengine.h
create mode 100644 drivers/pcmcia/sa1100_nanoengine.c
diff --git a/arch/arm/mach-sa1100/include/mach/nanoengine.h
b/arch/arm/mach-sa1100/include/mach/nanoengine.h
new file mode 100644
index 000..0537766
--- /dev/null
+++ b/arch/arm/mach-sa1100/include/mach/nanoengine.h
@@ -0,0 +1,30 @@
+/*
+ * arch/arm/mach-sa1100/include/mach/nanoengine.h
+ *
+ * This file contains the hardware specific definitions for nanoEngine.
+ * Only include this file from SA1100-specific files.
+ *
+ * Copyright (C) 2010 Marcelo Roberto Jimenez
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#ifndef __ASM_ARCH_NANOENGINE_H
+#define __ASM_ARCH_NANOENGINE_H
+
+#define GPIO_PC_READY0 GPIO_GPIO(11) /* ready for socket 0 (active high)*/
+#define GPIO_PC_READY1 GPIO_GPIO(12) /* ready for socket 1 (active high) */
+#define GPIO_PC_CD0GPIO_GPIO(13) /* detect for socket 0 (active low) */
+#define GPIO_PC_CD1GPIO_GPIO(14) /* detect for socket 1 (active low) */
+#define GPIO_PC_RESET0 GPIO_GPIO(15) /* reset socket 0 */
+#define GPIO_PC_RESET1 GPIO_GPIO(16) /* reset socket 1 */
+
+#define NANOENGINE_IRQ_GPIO_PC_READY0 IRQ_GPIO11
+#define NANOENGINE_IRQ_GPIO_PC_READY1 IRQ_GPIO12
+#define NANOENGINE_IRQ_GPIO_PC_CD0 IRQ_GPIO13
+#define NANOENGINE_IRQ_GPIO_PC_CD1 IRQ_GPIO14
+
+#endif
+
diff --git a/arch/arm/mach-sa1100/nanoengine.c
b/arch/arm/mach-sa1100/nanoengine.c
index 73a7922..36cdc8a 100644
--- a/arch/arm/mach-sa1100/nanoengine.c
+++ b/arch/arm/mach-sa1100/nanoengine.c
@@ -3,7 +3,7 @@
*
* Bright Star Engineering's nanoEngine board init code.
*
- * Copyright (C) 2009 Marcelo Roberto Jimenez
+ * Copyright (C) 2010 Marcelo Roberto Jimenez
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 381b031..e12a721 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -48,8 +48,9 @@ sa_cs-$(CONFIG_SA1100_JORNADA720) +=
sa1100_jornada720.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_COLLIE) += pxa2xx_sharpsl.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
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 5188962..a1fce5d 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -54,6 +54,9 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
#if defined(CONFIG_SA1100_H3100) || defined(CONFIG_SA1100_H3600)
pcmcia_h3600_init,
#endif
+#ifdef CONFIG_SA1100_NANOENGINE
+ pcmcia_nanoengine_init,
+#endif
#ifdef CONFIG_SA1100_SHANNON
pcmcia_shannon_init,
#endif
diff --git a/drivers/pcmcia/sa1100_generic.h b/drivers/pcmcia/sa1100_generic.h
index 794f96a..adb08db 100644
--- a/drivers/pcmcia/sa1100_generic.h
+++ b/drivers/pcmcia/sa1100_generic.h
@@ -13,6 +13,7 @@ extern int pcmcia_freebird_init(struct device *);
extern int pcmcia_gcplus_init(struct device *);
extern int pcmcia_graphicsmaster_init(struct device *);
extern int pcmcia_h3600_init(struct device *);
+extern int pcmcia_nanoengine_init(struct device *);
extern int pcmcia_pangolin_init(struct device *);
extern int pcmcia_pfs168_init(struct device *);
extern int pcmcia_shannon_init(struct device *);
diff --git a/drivers/pcmcia/sa1100_nanoengine.c
b/drivers/pcmcia/sa1100_nanoengine.c
new file mode 100644
index 000..3d2652e
--- /dev/null
+++ b/drivers/pcmcia/sa1100_nanoengine.c
@@ -0,0 +1,219 @@
+/*
+ * drivers/pcmcia/sa1100_nanoeng
[PATCH] ARM: pcmcia: Adds nanoEngine PCMCIA support.
This patch adds nanoEngine PCMCIA support, with support for two sockets.
In order to have a fully functional pcmcia subsystem in a BSE nanoEngine board
you should carefully read this:
http://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/
Signed-off-by: Marcelo Roberto Jimenez
---
arch/arm/mach-sa1100/include/mach/nanoengine.h | 30
arch/arm/mach-sa1100/nanoengine.c |2 +-
drivers/pcmcia/Makefile|1 +
drivers/pcmcia/sa1100_generic.c|3 +
drivers/pcmcia/sa1100_generic.h|1 +
drivers/pcmcia/sa1100_nanoengine.c | 218
6 files changed, 254 insertions(+), 1 deletions(-)
create mode 100644 arch/arm/mach-sa1100/include/mach/nanoengine.h
create mode 100644 drivers/pcmcia/sa1100_nanoengine.c
diff --git a/arch/arm/mach-sa1100/include/mach/nanoengine.h
b/arch/arm/mach-sa1100/include/mach/nanoengine.h
new file mode 100644
index 000..0537766
--- /dev/null
+++ b/arch/arm/mach-sa1100/include/mach/nanoengine.h
@@ -0,0 +1,30 @@
+/*
+ * arch/arm/mach-sa1100/include/mach/nanoengine.h
+ *
+ * This file contains the hardware specific definitions for nanoEngine.
+ * Only include this file from SA1100-specific files.
+ *
+ * Copyright (C) 2010 Marcelo Roberto Jimenez
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#ifndef __ASM_ARCH_NANOENGINE_H
+#define __ASM_ARCH_NANOENGINE_H
+
+#define GPIO_PC_READY0 GPIO_GPIO(11) /* ready for socket 0 (active high)*/
+#define GPIO_PC_READY1 GPIO_GPIO(12) /* ready for socket 1 (active high) */
+#define GPIO_PC_CD0GPIO_GPIO(13) /* detect for socket 0 (active low) */
+#define GPIO_PC_CD1GPIO_GPIO(14) /* detect for socket 1 (active low) */
+#define GPIO_PC_RESET0 GPIO_GPIO(15) /* reset socket 0 */
+#define GPIO_PC_RESET1 GPIO_GPIO(16) /* reset socket 1 */
+
+#define NANOENGINE_IRQ_GPIO_PC_READY0 IRQ_GPIO11
+#define NANOENGINE_IRQ_GPIO_PC_READY1 IRQ_GPIO12
+#define NANOENGINE_IRQ_GPIO_PC_CD0 IRQ_GPIO13
+#define NANOENGINE_IRQ_GPIO_PC_CD1 IRQ_GPIO14
+
+#endif
+
diff --git a/arch/arm/mach-sa1100/nanoengine.c
b/arch/arm/mach-sa1100/nanoengine.c
index 73a7922..36cdc8a 100644
--- a/arch/arm/mach-sa1100/nanoengine.c
+++ b/arch/arm/mach-sa1100/nanoengine.c
@@ -3,7 +3,7 @@
*
* Bright Star Engineering's nanoEngine board init code.
*
- * Copyright (C) 2009 Marcelo Roberto Jimenez
+ * Copyright (C) 2010 Marcelo Roberto Jimenez
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 381b031..bb9fa64 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -50,6 +50,7 @@ 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_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
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 5188962..a1fce5d 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -54,6 +54,9 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
#if defined(CONFIG_SA1100_H3100) || defined(CONFIG_SA1100_H3600)
pcmcia_h3600_init,
#endif
+#ifdef CONFIG_SA1100_NANOENGINE
+ pcmcia_nanoengine_init,
+#endif
#ifdef CONFIG_SA1100_SHANNON
pcmcia_shannon_init,
#endif
diff --git a/drivers/pcmcia/sa1100_generic.h b/drivers/pcmcia/sa1100_generic.h
index 794f96a..adb08db 100644
--- a/drivers/pcmcia/sa1100_generic.h
+++ b/drivers/pcmcia/sa1100_generic.h
@@ -13,6 +13,7 @@ extern int pcmcia_freebird_init(struct device *);
extern int pcmcia_gcplus_init(struct device *);
extern int pcmcia_graphicsmaster_init(struct device *);
extern int pcmcia_h3600_init(struct device *);
+extern int pcmcia_nanoengine_init(struct device *);
extern int pcmcia_pangolin_init(struct device *);
extern int pcmcia_pfs168_init(struct device *);
extern int pcmcia_shannon_init(struct device *);
diff --git a/drivers/pcmcia/sa1100_nanoengine.c
b/drivers/pcmcia/sa1100_nanoengine.c
new file mode 100644
index 000..2f164e6
--- /dev/null
+++ b/drivers/pcmcia/sa1100_nanoengine.c
@@ -0,0 +1,218 @@
+/*
+ * drivers/pcmcia/sa1100_nanoengine.c
+ *
+ * PCMCIA implementation routines for BSI nanoEngine.
+ *
+ * In order to have a fully functional pcmcia subsystem in a BSE nanoEngine
+ * board you should carefully read this:
+ * http://cambuca.ldhs.cetuc.puc-rio.br/nanoe
[PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
This patch fixes checkpatch.pl issues in soc_common.c.
Signed-off-by: Marcelo Roberto Jimenez
---
drivers/pcmcia/soc_common.c | 128 +++
1 files changed, 68 insertions(+), 60 deletions(-)
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index fd4c25a..25c5b50 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -31,20 +31,20 @@
==*/
-#include
-#include
+#include
#include
+#include
+#include
+#include
#include
-#include
#include
+#include
+#include
#include
-#include
-#include
#include
-#include
+#include
#include
-#include
#include
#include "soc_common.h"
@@ -69,7 +69,8 @@ EXPORT_SYMBOL(soc_pcmcia_debug);
#endif
-#define to_soc_pcmcia_socket(x)container_of(x, struct
soc_pcmcia_socket, socket)
+#define to_soc_pcmcia_socket(x)\
+ container_of(x, struct soc_pcmcia_socket, socket)
static unsigned short
calc_speed(unsigned short *spds, int num, unsigned short dflt)
@@ -86,11 +87,15 @@ calc_speed(unsigned short *spds, int num, unsigned short
dflt)
return speed;
}
-void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *skt, struct
soc_pcmcia_timing *timing)
+void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *skt,
+ struct soc_pcmcia_timing *timing)
{
- timing->io = calc_speed(skt->spd_io, MAX_IO_WIN, SOC_PCMCIA_IO_ACCESS);
- timing->mem = calc_speed(skt->spd_mem, MAX_WIN,
SOC_PCMCIA_3V_MEM_ACCESS);
- timing->attr = calc_speed(skt->spd_attr, MAX_WIN,
SOC_PCMCIA_3V_MEM_ACCESS);
+ timing->io =
+ calc_speed(skt->spd_io, MAX_IO_WIN, SOC_PCMCIA_IO_ACCESS);
+ timing->mem =
+ calc_speed(skt->spd_mem, MAX_WIN, SOC_PCMCIA_3V_MEM_ACCESS);
+ timing->attr =
+ calc_speed(skt->spd_attr, MAX_WIN, SOC_PCMCIA_3V_MEM_ACCESS);
}
EXPORT_SYMBOL(soc_common_pcmcia_get_timing);
@@ -132,8 +137,8 @@ static unsigned int soc_common_pcmcia_skt_state(struct
soc_pcmcia_socket *skt)
*
* Convert PCMCIA socket state to our socket configure structure.
*/
-static int
-soc_common_pcmcia_config_skt(struct soc_pcmcia_socket *skt, socket_state_t
*state)
+static int soc_common_pcmcia_config_skt(
+ struct soc_pcmcia_socket *skt, socket_state_t *state)
{
int ret;
@@ -145,7 +150,8 @@ soc_common_pcmcia_config_skt(struct soc_pcmcia_socket *skt,
socket_state_t *stat
*/
if (skt->irq_state != 1 && state->io_irq) {
skt->irq_state = 1;
- set_irq_type(skt->socket.pci_irq,
IRQ_TYPE_EDGE_FALLING);
+ set_irq_type(skt->socket.pci_irq,
+ IRQ_TYPE_EDGE_FALLING);
} else if (skt->irq_state == 1 && state->io_irq == 0) {
skt->irq_state = 0;
set_irq_type(skt->socket.pci_irq, IRQ_TYPE_NONE);
@@ -299,24 +305,24 @@ soc_common_pcmcia_get_status(struct pcmcia_socket *sock,
unsigned int *status)
* of power configuration, reset, &c. We also record the value of
* `state' in order to regurgitate it to the PCMCIA core later.
*/
-static int
-soc_common_pcmcia_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
+static int soc_common_pcmcia_set_socket(
+ struct pcmcia_socket *sock, socket_state_t *state)
{
struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock);
- debug(skt, 2, "mask: %s%s%s%s%s%sflags: %s%s%s%s%s%sVcc %d Vpp %d irq
%d\n",
- (state->csc_mask==0)?" ":"",
- (state->csc_mask&SS_DETECT)?"DETECT ":"",
- (state->csc_mask&SS_READY)?"READY ":"",
- (state->csc_mask&SS_BATDEAD)?"BATDEAD ":"",
- (state->csc_mask&SS_BATWARN)?"BATWARN ":"",
- (state->csc_mask&SS_STSCHG)?"STSCHG ":"",
- (state->flags==0)?" ":"",
- (state->flags&SS_PWR_AUTO)?"PWR_AUTO ":"",
- (state->flags&SS_IOCARD)?"IOCARD ":"",
- (state->flags&SS_RESET)?"RESET ":"",
- (state->flags&SS_SPKR_ENA)?"SPKR_ENA ":"",
- (state->flags&SS_OUTPUT_ENA)?"OUTPUT_ENA ":"",
+ debug(skt, 2, "mask: %s%s%s%s%s%s flags: %s%s%s%s%s%s Vcc %d Vpp %d irq
%d\n",
+ (state->csc_mask == 0)
[PATCH 1/2] ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module.
This patch fixes a compilation issue when compiling PCMCIA SA1100 support as a module with PCMCIA_DEBUG enabled. The symbol soc_pcmcia_debug was not beeing exported. Signed-off-by: Marcelo Roberto Jimenez --- drivers/pcmcia/soc_common.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 6f1a86b..fd4c25a 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -65,6 +65,7 @@ void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func, va_end(args); } } +EXPORT_SYMBOL(soc_pcmcia_debug); #endif -- 1.7.0.3 ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
This patch fixes checkpatch.pl issues in soc_common.c.
Signed-off-by: Marcelo Roberto Jimenez
---
drivers/pcmcia/soc_common.c | 129 +++
1 files changed, 69 insertions(+), 60 deletions(-)
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index fd4c25a..22af8d2 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -31,20 +31,20 @@
==*/
-#include
-#include
+#include
#include
+#include
+#include
+#include
#include
-#include
#include
+#include
+#include
#include
-#include
-#include
#include
-#include
+#include
#include
-#include
#include
#include "soc_common.h"
@@ -69,7 +69,8 @@ EXPORT_SYMBOL(soc_pcmcia_debug);
#endif
-#define to_soc_pcmcia_socket(x)container_of(x, struct
soc_pcmcia_socket, socket)
+#define to_soc_pcmcia_socket(x)\
+ container_of(x, struct soc_pcmcia_socket, socket)
static unsigned short
calc_speed(unsigned short *spds, int num, unsigned short dflt)
@@ -86,11 +87,15 @@ calc_speed(unsigned short *spds, int num, unsigned short
dflt)
return speed;
}
-void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *skt, struct
soc_pcmcia_timing *timing)
+void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *skt,
+ struct soc_pcmcia_timing *timing)
{
- timing->io = calc_speed(skt->spd_io, MAX_IO_WIN, SOC_PCMCIA_IO_ACCESS);
- timing->mem = calc_speed(skt->spd_mem, MAX_WIN,
SOC_PCMCIA_3V_MEM_ACCESS);
- timing->attr = calc_speed(skt->spd_attr, MAX_WIN,
SOC_PCMCIA_3V_MEM_ACCESS);
+ timing->io =
+ calc_speed(skt->spd_io, MAX_IO_WIN, SOC_PCMCIA_IO_ACCESS);
+ timing->mem =
+ calc_speed(skt->spd_mem, MAX_WIN, SOC_PCMCIA_3V_MEM_ACCESS);
+ timing->attr =
+ calc_speed(skt->spd_attr, MAX_WIN, SOC_PCMCIA_3V_MEM_ACCESS);
}
EXPORT_SYMBOL(soc_common_pcmcia_get_timing);
@@ -132,8 +137,8 @@ static unsigned int soc_common_pcmcia_skt_state(struct
soc_pcmcia_socket *skt)
*
* Convert PCMCIA socket state to our socket configure structure.
*/
-static int
-soc_common_pcmcia_config_skt(struct soc_pcmcia_socket *skt, socket_state_t
*state)
+static int soc_common_pcmcia_config_skt(
+ struct soc_pcmcia_socket *skt, socket_state_t *state)
{
int ret;
@@ -145,7 +150,8 @@ soc_common_pcmcia_config_skt(struct soc_pcmcia_socket *skt,
socket_state_t *stat
*/
if (skt->irq_state != 1 && state->io_irq) {
skt->irq_state = 1;
- set_irq_type(skt->socket.pci_irq,
IRQ_TYPE_EDGE_FALLING);
+ set_irq_type(skt->socket.pci_irq,
+ IRQ_TYPE_EDGE_FALLING);
} else if (skt->irq_state == 1 && state->io_irq == 0) {
skt->irq_state = 0;
set_irq_type(skt->socket.pci_irq, IRQ_TYPE_NONE);
@@ -299,24 +305,25 @@ soc_common_pcmcia_get_status(struct pcmcia_socket *sock,
unsigned int *status)
* of power configuration, reset, &c. We also record the value of
* `state' in order to regurgitate it to the PCMCIA core later.
*/
-static int
-soc_common_pcmcia_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
+static int soc_common_pcmcia_set_socket(
+ struct pcmcia_socket *sock, socket_state_t *state)
{
struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock);
- debug(skt, 2, "mask: %s%s%s%s%s%sflags: %s%s%s%s%s%sVcc %d Vpp %d irq
%d\n",
- (state->csc_mask==0)?" ":"",
- (state->csc_mask&SS_DETECT)?"DETECT ":"",
- (state->csc_mask&SS_READY)?"READY ":"",
- (state->csc_mask&SS_BATDEAD)?"BATDEAD ":"",
- (state->csc_mask&SS_BATWARN)?"BATWARN ":"",
- (state->csc_mask&SS_STSCHG)?"STSCHG ":"",
- (state->flags==0)?" ":"",
- (state->flags&SS_PWR_AUTO)?"PWR_AUTO ":"",
- (state->flags&SS_IOCARD)?"IOCARD ":"",
- (state->flags&SS_RESET)?"RESET ":"",
- (state->flags&SS_SPKR_ENA)?"SPKR_ENA ":"",
- (state->flags&SS_OUTPUT_ENA)?"OUTPUT_ENA ":"",
+ debug(skt, 2, "mask: %s%s%s%s%s%s "
+ "flags: %s%s%s%s%s%s Vcc %d Vpp %d irq %d\n",
+ (state->csc_mask
