Commit c63f774c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 385910f2 608c783a

arch/arm/common/scoop.c

+12 −0
Original line number Diff line number Diff line
@@ -18,6 +18,18 @@ 
#include <asm/io.h>

#include <asm/hardware/scoop.h>



/* PCMCIA to Scoop linkage



   There is no easy way to link multiple scoop devices into one

   single entity for the pxa2xx_pcmcia device so this structure

   is used which is setup by the platform code.



   This file is never modular so this symbol is always

   accessile to the board support files.

*/

struct scoop_pcmcia_config *platform_scoop_config;

EXPORT_SYMBOL(platform_scoop_config);



#define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr)))



struct  scoop_dev {

arch/arm/mach-pxa/corgi_ssp.c

+3 −6
Original line number Diff line number Diff line
@@ -196,12 +196,9 @@ static int __init corgi_ssp_probe(struct platform_device *dev) 
	int ret;



	/* Chip Select - Disable All */

	GPDR(ssp_machinfo->cs_lcdcon) |= GPIO_bit(ssp_machinfo->cs_lcdcon); /* output */

	GPSR(ssp_machinfo->cs_lcdcon) = GPIO_bit(ssp_machinfo->cs_lcdcon);  /* High - Disable LCD Control/Timing Gen */

	GPDR(ssp_machinfo->cs_max1111) |= GPIO_bit(ssp_machinfo->cs_max1111); /* output */

	GPSR(ssp_machinfo->cs_max1111) = GPIO_bit(ssp_machinfo->cs_max1111);  /* High - Disable MAX1111*/

	GPDR(ssp_machinfo->cs_ads7846) |= GPIO_bit(ssp_machinfo->cs_ads7846);  /* output */

	GPSR(ssp_machinfo->cs_ads7846) = GPIO_bit(ssp_machinfo->cs_ads7846);   /* High - Disable ADS7846*/

	pxa_gpio_mode(ssp_machinfo->cs_lcdcon  | GPIO_OUT | GPIO_DFLT_HIGH);

        pxa_gpio_mode(ssp_machinfo->cs_max1111 | GPIO_OUT | GPIO_DFLT_HIGH);

        pxa_gpio_mode(ssp_machinfo->cs_ads7846 | GPIO_OUT | GPIO_DFLT_HIGH);



	ret = ssp_init(&corgi_ssp_dev, ssp_machinfo->port, 0);

drivers/pcmcia/pxa2xx_sharpsl.c

+0 −8
Original line number Diff line number Diff line
@@ -26,14 +26,6 @@ 
#include "soc_common.h"



#define	NO_KEEP_VS 0x0001



/* PCMCIA to Scoop linkage



   There is no easy way to link multiple scoop devices into one

   single entity for the pxa2xx_pcmcia device so this structure

   is used which is setup by the platform code

*/

struct scoop_pcmcia_config *platform_scoop_config;

#define SCOOP_DEV platform_scoop_config->devs



static void sharpsl_pcmcia_init_reset(struct soc_pcmcia_socket *skt)