aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSean McNeil <sean@mcneil.com>2008-11-19 17:11:12 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:11:12 +0000
commit23aee12dae31a0ef3418a57936a5500a5d84811e (patch)
tree3a5e7c0493879ef4e7ed35028190bf1707181256 /arch
parentdab15c39c8e262e34b8e2cbdc1795bb230baaf6a (diff)
fix-hdq-fiq-interface.patch
Try to make sure about no compiler malarky by volatile. Change hdq busy detect. Change error handling path in hdq interface to fiq. Signed-off-by: Sean McNeil <sean@mcneil.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2440/fiq_c_isr.c4
-rw-r--r--arch/arm/mach-s3c2440/mach-gta02.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c
index 43fd6b53205..0decc35a317 100644
--- a/arch/arm/mach-s3c2440/fiq_c_isr.c
+++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
@@ -230,6 +230,8 @@ static int __init sc32440_fiq_probe(struct platform_device *pdev)
ret = sysfs_create_group(&pdev->dev.kobj, &s3c2440_fiq_attr_group);
if (ret)
return ret;
+
+ fiq_ready = 1;
/*
* if wanted, users can defer registration of devices
@@ -239,8 +241,6 @@ static int __init sc32440_fiq_probe(struct platform_device *pdev)
if (pdata->attach_child_devices)
(pdata->attach_child_devices)(&pdev->dev);
- fiq_ready = 1;
-
return 0;
}
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 6a77fd1cf08..9c9d5065c09 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -847,8 +847,8 @@ static void gta02_fiq_attach_child_devices(struct device *parent_device)
static struct resource sc32440_fiq_resources[] = {
[0] = {
.flags = IORESOURCE_IRQ,
- .start = IRQ_TIMER1,
- .end = IRQ_TIMER1,
+ .start = IRQ_TIMER3,
+ .end = IRQ_TIMER3,
},
};