aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2440
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-19 17:11:09 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:11:09 +0000
commit6d7168a4b1cfcc96b873334560431364af0a54e8 (patch)
tree5fbc3b87c3595049bf61dd97b99a6c72e40d5e4d /arch/arm/mach-s3c2440
parenta3c18d29a0edf312e929858c32f441dccef88c08 (diff)
fix-vib-parentage-to-fiq.patch
Vibrator relies on FIQ, represent that in device tree Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch/arm/mach-s3c2440')
-rw-r--r--arch/arm/mach-s3c2440/mach-gta02.c32
1 files changed, 18 insertions, 14 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 51317b4a92c..fe99bca51a5 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -833,7 +833,22 @@ struct platform_device gta02_hdq_device = {
};
#endif
-/* FIQ */
+/* vibrator (child of FIQ) */
+
+static struct resource gta02_vibrator_resources[] = {
+ [0] = {
+ .start = GTA02_GPIO_VIBRATOR_ON,
+ .end = GTA02_GPIO_VIBRATOR_ON,
+ },
+};
+
+static struct platform_device gta02_vibrator_dev = {
+ .name = "neo1973-vibrator",
+ .num_resources = ARRAY_SIZE(gta02_vibrator_resources),
+ .resource = gta02_vibrator_resources,
+};
+
+/* FIQ, used PWM regs, so not child of PWM */
static void gta02_fiq_attach_child_devices(struct device *parent_device)
{
@@ -843,6 +858,8 @@ static void gta02_fiq_attach_child_devices(struct device *parent_device)
case GTA02v6_SYSTEM_REV:
gta02_hdq_device.dev.parent = parent_device;
platform_device_register(&gta02_hdq_device);
+ gta02_vibrator_dev.dev.parent = parent_device;
+ platform_device_register(&gta02_vibrator_dev);
break;
default:
break;
@@ -1125,19 +1142,6 @@ static struct glamo_spigpio_info glamo_spigpio_cfg = {
.board_info = gta02_spi_board_info,
};
-static struct resource gta02_vibrator_resources[] = {
- [0] = {
- .start = GTA02_GPIO_VIBRATOR_ON,
- .end = GTA02_GPIO_VIBRATOR_ON,
- },
-};
-
-static struct platform_device gta02_vibrator_dev = {
- .name = "neo1973-vibrator",
- .num_resources = ARRAY_SIZE(gta02_vibrator_resources),
- .resource = gta02_vibrator_resources,
-};
-
/* SPI: Accelerometers attached to SPI of s3c244x */
/*