Commit 7bec22c8 authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds

[PATCH] m32r: AR camera driver

Here is a patch for the Renesas AR camera driver for m32r.

  - AR (artificial retina) camera is newly supported.
    AR camera module: Renesas M64278E-800, VGA(640x480 pixcels)
    http://www.renesas.com/avs/resource/japan/jpn/pdf/assp/rjj01f0005_psmobile.pdfSigned-off-by: default avatarHayato Fujiwara <fujiwara@linux-m32r.org>
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 386be40d
...@@ -435,7 +435,7 @@ void __init init_IRQ(void) ...@@ -435,7 +435,7 @@ void __init init_IRQ(void)
icu_data[M32R_IRQ_INT2].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01; icu_data[M32R_IRQ_INT2].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01;
enable_m32700ut_irq(M32R_IRQ_INT2); enable_m32700ut_irq(M32R_IRQ_INT2);
//#if defined(CONFIG_M32R_AR_VGA) //#if defined(CONFIG_VIDEO_M32R_AR)
/* /*
* INT3# is used for AR * INT3# is used for AR
*/ */
...@@ -445,7 +445,7 @@ void __init init_IRQ(void) ...@@ -445,7 +445,7 @@ void __init init_IRQ(void)
irq_desc[M32R_IRQ_INT3].depth = 1; irq_desc[M32R_IRQ_INT3].depth = 1;
icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
disable_m32700ut_irq(M32R_IRQ_INT3); disable_m32700ut_irq(M32R_IRQ_INT3);
//#endif /* CONFIG_M32R_ARV */ //#endif /* CONFIG_VIDEO_M32R_AR */
} }
#define LAN_IOSTART 0x300 #define LAN_IOSTART 0x300
......
...@@ -439,7 +439,7 @@ void __init init_IRQ(void) ...@@ -439,7 +439,7 @@ void __init init_IRQ(void)
icu_data[M32R_IRQ_INT2].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01; icu_data[M32R_IRQ_INT2].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01;
enable_opsput_irq(M32R_IRQ_INT2); enable_opsput_irq(M32R_IRQ_INT2);
//#if defined(CONFIG_M32R_AR_VGA) //#if defined(CONFIG_VIDEO_M32R_AR)
/* /*
* INT3# is used for AR * INT3# is used for AR
*/ */
...@@ -449,7 +449,7 @@ void __init init_IRQ(void) ...@@ -449,7 +449,7 @@ void __init init_IRQ(void)
irq_desc[M32R_IRQ_INT3].depth = 1; irq_desc[M32R_IRQ_INT3].depth = 1;
icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
disable_opsput_irq(M32R_IRQ_INT3); disable_opsput_irq(M32R_IRQ_INT3);
//#endif /* CONFIG_M32R_ARV */ //#endif /* CONFIG_VIDEO_M32R_AR */
} }
#define LAN_IOSTART 0x300 #define LAN_IOSTART 0x300
......
...@@ -306,5 +306,18 @@ config VIDEO_OVCAMCHIP ...@@ -306,5 +306,18 @@ config VIDEO_OVCAMCHIP
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called ovcamchip module will be called ovcamchip
endmenu config VIDEO_M32R_AR
tristate "AR devices"
depends on M32R
---help---
This is a video4linux driver for the Renesas AR (Artificial Retina)
camera module.
config VIDEO_M32R_AR_M64278
tristate "Use Colour AR module M64278(VGA)"
depends on VIDEO_M32R_AR
---help---
Say Y here to use the Renesas M64278E-800 camera module,
which supports VGA(640x480 pixcels) size of images.
endmenu
...@@ -47,3 +47,5 @@ obj-$(CONFIG_TUNER_3036) += tuner-3036.o ...@@ -47,3 +47,5 @@ obj-$(CONFIG_TUNER_3036) += tuner-3036.o
obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o
obj-$(CONFIG_VIDEO_BUF) += video-buf.o obj-$(CONFIG_VIDEO_BUF) += video-buf.o
obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o
obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
This diff is collapsed.
...@@ -433,6 +433,7 @@ struct video_code ...@@ -433,6 +433,7 @@ struct video_code
#define VID_HARDWARE_W9968CF 36 #define VID_HARDWARE_W9968CF 36
#define VID_HARDWARE_SAA7114H 37 #define VID_HARDWARE_SAA7114H 37
#define VID_HARDWARE_SN9C102 38 #define VID_HARDWARE_SN9C102 38
#define VID_HARDWARE_ARV 39
#endif /* __LINUX_VIDEODEV_H */ #endif /* __LINUX_VIDEODEV_H */
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment