target/linux/s3c24xx/patches-2.6.31/400-s3c-spi-gpio.patch

   1 --- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
   2 +++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
   3 @@ -21,7 +21,8 @@ struct s3c2410_spigpio_info {
   4         int                      num_chipselect;
   5         int                      bus_num;
   6
   7 -       void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs);
   8 +       int                      non_blocking_transfer;
   9 +       void (*chip_select)(struct s3c2410_spigpio_info *spi, int csid, int cs);
  10  };
  11
  12
  13 --- a/drivers/spi/spi_s3c24xx_gpio.c
  14 +++ b/drivers/spi/spi_s3c24xx_gpio.c
  15 @@ -92,7 +92,7 @@ static void s3c2410_spigpio_chipselect(s
  16         struct s3c2410_spigpio *sg = spidev_to_sg(dev);
  17
  18         if (sg->info && sg->info->chip_select)
  19 -               (sg->info->chip_select)(sg->info, value);
  20 +               (sg->info->chip_select)(sg->info, dev->chip_select, value);
  21  }
  22
  23  static int s3c2410_spigpio_probe(struct platform_device *dev)
  24 @@ -113,9 +113,11 @@ static int s3c2410_spigpio_probe(struct
  25
  26         platform_set_drvdata(dev, sp);
  27
  28 -       /* copy in the plkatform data */
  29 +       /* copy in the platform data */
  30         info = sp->info = dev->dev.platform_data;
  31
  32 +       master->num_chipselect = info->num_chipselect;
  33 +
  34         /* setup spi bitbang adaptor */
  35         sp->bitbang.master = spi_master_get(master);
  36         sp->bitbang.master->bus_num = info->bus_num;