You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
92 lines
2.9 KiB
Diff
92 lines
2.9 KiB
Diff
From ba854ad9250eca9dc665507f0a4a80cbc6449ff5 Mon Sep 17 00:00:00 2001
|
|
From: Holger Freyther <zecke@openmoko.org>
|
|
Date: Sun, 13 Apr 2008 07:25:54 +0100
|
|
Subject: [PATCH] This is gta02 and not gta01. Do not call the vibrator led.
|
|
|
|
Signed-Off-by: Holger Freyther <zecke@openmoko.org>
|
|
---
|
|
arch/arm/mach-s3c2440/mach-gta02.c | 25 ++++++++++++-------------
|
|
1 files changed, 12 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
|
|
index 3574375..bd2888a 100644
|
|
--- a/arch/arm/mach-s3c2440/mach-gta02.c
|
|
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
|
|
@@ -67,7 +67,6 @@
|
|
#include <asm/arch/spi-gpio.h>
|
|
#include <asm/arch/usb-control.h>
|
|
|
|
-#include <asm/arch/gta01.h>
|
|
#include <asm/arch/gta02.h>
|
|
|
|
#include <asm/plat-s3c/regs-serial.h>
|
|
@@ -855,17 +854,17 @@ static struct glamo_spigpio_info glamo_spigpio_cfg = {
|
|
.board_info = gta02_spi_board_info,
|
|
};
|
|
|
|
-static struct resource gta01_led_resources[] = {
|
|
+static struct resource gta02_vibrator_resources[] = {
|
|
[0] = {
|
|
.start = GTA02_GPIO_VIBRATOR_ON,
|
|
.end = GTA02_GPIO_VIBRATOR_ON,
|
|
},
|
|
};
|
|
|
|
-static struct platform_device gta01_led_dev = {
|
|
+static struct platform_device gta02_vibrator_dev = {
|
|
.name = "neo1973-vibrator",
|
|
- .num_resources = ARRAY_SIZE(gta01_led_resources),
|
|
- .resource = gta01_led_resources,
|
|
+ .num_resources = ARRAY_SIZE(gta02_vibrator_resources),
|
|
+ .resource = gta02_vibrator_resources,
|
|
};
|
|
|
|
/* SPI: Accelerometers attached to SPI of s3c244x */
|
|
@@ -1090,7 +1089,7 @@ struct platform_device gta02_led_dev = {
|
|
.resource = gta02_led_resources,
|
|
};
|
|
|
|
-static struct resource gta01_button_resources[] = {
|
|
+static struct resource gta02_button_resources[] = {
|
|
[0] = {
|
|
.start = GTA02_GPIO_AUX_KEY,
|
|
.end = GTA02_GPIO_AUX_KEY,
|
|
@@ -1105,13 +1104,13 @@ static struct resource gta01_button_resources[] = {
|
|
},
|
|
};
|
|
|
|
-static struct platform_device gta01_button_dev = {
|
|
+static struct platform_device gta02_button_dev = {
|
|
.name = "neo1973-button",
|
|
- .num_resources = ARRAY_SIZE(gta01_button_resources),
|
|
- .resource = gta01_button_resources,
|
|
+ .num_resources = ARRAY_SIZE(gta02_button_resources),
|
|
+ .resource = gta02_button_resources,
|
|
};
|
|
|
|
-static struct platform_device gta01_pm_gsm_dev = {
|
|
+static struct platform_device gta02_pm_gsm_dev = {
|
|
.name = "neo1973-pm-gsm",
|
|
};
|
|
|
|
@@ -1375,13 +1374,13 @@ static void __init gta02_machine_init(void)
|
|
platform_device_register(>a02_glamo_dev);
|
|
|
|
platform_device_register(&s3c_device_spi_acc);
|
|
- platform_device_register(>a01_button_dev);
|
|
- platform_device_register(>a01_pm_gsm_dev);
|
|
+ platform_device_register(>a02_button_dev);
|
|
+ platform_device_register(>a02_pm_gsm_dev);
|
|
platform_device_register(>a02_pm_usbhost_dev);
|
|
|
|
mangle_pmu_pdata_by_system_rev();
|
|
platform_device_register(>a02_pmu_dev);
|
|
- platform_device_register(>a01_led_dev);
|
|
+ platform_device_register(>a02_vibrator_dev);
|
|
platform_device_register(>a02_led_dev);
|
|
|
|
|
|
--
|
|
1.5.6.5
|
|
|