target/linux/s3c24xx/patches-2.6.24/1111-This-is-gta02-and-not-gta01.-Do-not-call-the-vibrato.patch

   1 From ba854ad9250eca9dc665507f0a4a80cbc6449ff5 Mon Sep 17 00:00:00 2001
   2 From: Holger Freyther <zecke@openmoko.org>
   3 Date: Sun, 13 Apr 2008 07:25:54 +0100
   4 Subject: [PATCH] This is gta02 and not gta01. Do not call the vibrator led.
   5
   6 Signed-Off-by: Holger Freyther <zecke@openmoko.org>
   7 ---
   8  arch/arm/mach-s3c2440/mach-gta02.c |   25 ++++++++++++-------------
   9  1 files changed, 12 insertions(+), 13 deletions(-)
  10
  11 diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
  12 index 3574375..bd2888a 100644
  13 --- a/arch/arm/mach-s3c2440/mach-gta02.c
  14 +++ b/arch/arm/mach-s3c2440/mach-gta02.c
  15 @@ -67,7 +67,6 @@
  16  #include <asm/arch/spi-gpio.h>
  17  #include <asm/arch/usb-control.h>
  18
  19 -#include <asm/arch/gta01.h>
  20  #include <asm/arch/gta02.h>
  21
  22  #include <asm/plat-s3c/regs-serial.h>
  23 @@ -855,17 +854,17 @@ static struct glamo_spigpio_info glamo_spigpio_cfg = {
  24         .board_info     = gta02_spi_board_info,
  25  };
  26
  27 -static struct resource gta01_led_resources[] = {
  28 +static struct resource gta02_vibrator_resources[] = {
  29         [0] = {
  30                 .start  = GTA02_GPIO_VIBRATOR_ON,
  31                 .end    = GTA02_GPIO_VIBRATOR_ON,
  32         },
  33  };
  34
  35 -static struct platform_device gta01_led_dev = {
  36 +static struct platform_device gta02_vibrator_dev = {
  37         .name           = "neo1973-vibrator",
  38 -       .num_resources  = ARRAY_SIZE(gta01_led_resources),
  39 -       .resource       = gta01_led_resources,
  40 +       .num_resources  = ARRAY_SIZE(gta02_vibrator_resources),
  41 +       .resource       = gta02_vibrator_resources,
  42  };
  43
  44  /* SPI: Accelerometers attached to SPI of s3c244x */
  45 @@ -1090,7 +1089,7 @@ struct platform_device gta02_led_dev = {
  46         .resource       = gta02_led_resources,
  47  };
  48
  49 -static struct resource gta01_button_resources[] = {
  50 +static struct resource gta02_button_resources[] = {
  51         [0] = {
  52                 .start = GTA02_GPIO_AUX_KEY,
  53                 .end   = GTA02_GPIO_AUX_KEY,
  54 @@ -1105,13 +1104,13 @@ static struct resource gta01_button_resources[] = {
  55         },
  56  };
  57
  58 -static struct platform_device gta01_button_dev = {
  59 +static struct platform_device gta02_button_dev = {
  60         .name           = "neo1973-button",
  61 -       .num_resources  = ARRAY_SIZE(gta01_button_resources),
  62 -       .resource       = gta01_button_resources,
  63 +       .num_resources  = ARRAY_SIZE(gta02_button_resources),
  64 +       .resource       = gta02_button_resources,
  65  };
  66
  67 -static struct platform_device gta01_pm_gsm_dev = {
  68 +static struct platform_device gta02_pm_gsm_dev = {
  69         .name           = "neo1973-pm-gsm",
  70  };
  71
  72 @@ -1375,13 +1374,13 @@ static void __init gta02_machine_init(void)
  73         platform_device_register(&gta02_glamo_dev);
  74
  75         platform_device_register(&s3c_device_spi_acc);
  76 -       platform_device_register(&gta01_button_dev);
  77 -       platform_device_register(&gta01_pm_gsm_dev);
  78 +       platform_device_register(&gta02_button_dev);
  79 +       platform_device_register(&gta02_pm_gsm_dev);
  80         platform_device_register(&gta02_pm_usbhost_dev);
  81
  82         mangle_pmu_pdata_by_system_rev();
  83         platform_device_register(&gta02_pmu_dev);
  84 -       platform_device_register(&gta01_led_dev);
  85 +       platform_device_register(&gta02_vibrator_dev);
  86         platform_device_register(&gta02_led_dev);
  87
  88
  89 --
  90 1.5.6.5
  91