Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3479/1: Corgi SSP: Fix potential concurrent access problem
[ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure
+15
-14
+12
arch/arm/common/scoop.c
+12
arch/arm/common/scoop.c
···
18
18
#include <asm/io.h>
19
19
#include <asm/hardware/scoop.h>
20
20
21
+
/* PCMCIA to Scoop linkage
22
+
23
+
There is no easy way to link multiple scoop devices into one
24
+
single entity for the pxa2xx_pcmcia device so this structure
25
+
is used which is setup by the platform code.
26
+
27
+
This file is never modular so this symbol is always
28
+
accessile to the board support files.
29
+
*/
30
+
struct scoop_pcmcia_config *platform_scoop_config;
31
+
EXPORT_SYMBOL(platform_scoop_config);
32
+
21
33
#define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr)))
22
34
23
35
struct scoop_dev {
+3
-6
arch/arm/mach-pxa/corgi_ssp.c
+3
-6
arch/arm/mach-pxa/corgi_ssp.c
···
196
196
int ret;
197
197
198
198
/* Chip Select - Disable All */
199
-
GPDR(ssp_machinfo->cs_lcdcon) |= GPIO_bit(ssp_machinfo->cs_lcdcon); /* output */
200
-
GPSR(ssp_machinfo->cs_lcdcon) = GPIO_bit(ssp_machinfo->cs_lcdcon); /* High - Disable LCD Control/Timing Gen */
201
-
GPDR(ssp_machinfo->cs_max1111) |= GPIO_bit(ssp_machinfo->cs_max1111); /* output */
202
-
GPSR(ssp_machinfo->cs_max1111) = GPIO_bit(ssp_machinfo->cs_max1111); /* High - Disable MAX1111*/
203
-
GPDR(ssp_machinfo->cs_ads7846) |= GPIO_bit(ssp_machinfo->cs_ads7846); /* output */
204
-
GPSR(ssp_machinfo->cs_ads7846) = GPIO_bit(ssp_machinfo->cs_ads7846); /* High - Disable ADS7846*/
199
+
pxa_gpio_mode(ssp_machinfo->cs_lcdcon | GPIO_OUT | GPIO_DFLT_HIGH);
200
+
pxa_gpio_mode(ssp_machinfo->cs_max1111 | GPIO_OUT | GPIO_DFLT_HIGH);
201
+
pxa_gpio_mode(ssp_machinfo->cs_ads7846 | GPIO_OUT | GPIO_DFLT_HIGH);
205
202
206
203
ret = ssp_init(&corgi_ssp_dev, ssp_machinfo->port, 0);
207
204
-8
drivers/pcmcia/pxa2xx_sharpsl.c
-8
drivers/pcmcia/pxa2xx_sharpsl.c
···
26
26
#include "soc_common.h"
27
27
28
28
#define NO_KEEP_VS 0x0001
29
-
30
-
/* PCMCIA to Scoop linkage
31
-
32
-
There is no easy way to link multiple scoop devices into one
33
-
single entity for the pxa2xx_pcmcia device so this structure
34
-
is used which is setup by the platform code
35
-
*/
36
-
struct scoop_pcmcia_config *platform_scoop_config;
37
29
#define SCOOP_DEV platform_scoop_config->devs
38
30
39
31
static void sharpsl_pcmcia_init_reset(struct soc_pcmcia_socket *skt)