diff options
author | Sylwester Nawrocki <sylvester.nawrocki@gmail.com> | 2012-07-13 17:48:56 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-07-13 17:48:56 +0900 |
commit | 705c75e3a1785d9d3acdf1b0b3a3afb10e943b15 (patch) | |
tree | dc7b0d7c22c97c4c0b7c50e1240072daded43f0c | |
parent | bb1488024786597ffe60971645ce9097af78f972 (diff) | |
download | op-kernel-dev-705c75e3a1785d9d3acdf1b0b3a3afb10e943b15.zip op-kernel-dev-705c75e3a1785d9d3acdf1b0b3a3afb10e943b15.tar.gz |
ARM: S3C24XX: Correct CAMIF interrupt definitions
Properly define the CAMIF interrupt resources. This device have two
interrupts - corresponding to the "codec" and "preview" data paths.
IRQ_CAM is handled internally by the architecture and demultiplexed
to IRQ_S3C2440_CAM_C and IRQ_S3C2440_CAM_P - these interrupts only
should be handled in the driver.
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/plat-samsung/devs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 1d214cb..6303974 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -126,7 +126,8 @@ struct platform_device s3c_device_adc = { #ifdef CONFIG_CPU_S3C2440 static struct resource s3c_camif_resource[] = { [0] = DEFINE_RES_MEM(S3C2440_PA_CAMIF, S3C2440_SZ_CAMIF), - [1] = DEFINE_RES_IRQ(IRQ_CAM), + [1] = DEFINE_RES_IRQ(IRQ_S3C2440_CAM_C), + [2] = DEFINE_RES_IRQ(IRQ_S3C2440_CAM_P), }; struct platform_device s3c_device_camif = { |