Commit 3770be34 authored by Luca Risolia's avatar Luca Risolia Committed by Mauro Carvalho Chehab

V4L/DVB (5765): SN9C1xx driver updates

- Add support for pair OV7630+SN9C120
- Better and safe locking mechanism of the device structure on open(),
  close() and disconnect()
- Use kref for handling device deallocation
- Generic cleanups
Signed-off-by: default avatarLuca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent a6e2b40c
...@@ -436,7 +436,7 @@ HV7131D Hynix Semiconductor | Yes No No No ...@@ -436,7 +436,7 @@ HV7131D Hynix Semiconductor | Yes No No No
HV7131R Hynix Semiconductor | No Yes Yes Yes HV7131R Hynix Semiconductor | No Yes Yes Yes
MI-0343 Micron Technology | Yes No No No MI-0343 Micron Technology | Yes No No No
MI-0360 Micron Technology | No Yes Yes Yes MI-0360 Micron Technology | No Yes Yes Yes
OV7630 OmniVision Technologies | Yes Yes No No OV7630 OmniVision Technologies | Yes Yes Yes Yes
OV7660 OmniVision Technologies | No No Yes Yes OV7660 OmniVision Technologies | No No Yes Yes
PAS106B PixArt Imaging | Yes No No No PAS106B PixArt Imaging | Yes No No No
PAS202B PixArt Imaging | Yes Yes No No PAS202B PixArt Imaging | Yes Yes No No
...@@ -583,6 +583,7 @@ order): ...@@ -583,6 +583,7 @@ order):
- Bertrik Sikken, who reverse-engineered and documented the Huffman compression - Bertrik Sikken, who reverse-engineered and documented the Huffman compression
algorithm used in the SN9C101, SN9C102 and SN9C103 controllers and algorithm used in the SN9C101, SN9C102 and SN9C103 controllers and
implemented the first decoder; implemented the first decoder;
- Ronny Standke for the donation of a webcam;
- Mizuno Takafumi for the donation of a webcam; - Mizuno Takafumi for the donation of a webcam;
- an "anonymous" donator (who didn't want his name to be revealed) for the - an "anonymous" donator (who didn't want his name to be revealed) for the
donation of a webcam. donation of a webcam.
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/kref.h>
#include "sn9c102_config.h" #include "sn9c102_config.h"
#include "sn9c102_sensor.h" #include "sn9c102_sensor.h"
...@@ -94,7 +95,7 @@ struct sn9c102_module_param { ...@@ -94,7 +95,7 @@ struct sn9c102_module_param {
}; };
static DEFINE_MUTEX(sn9c102_sysfs_lock); static DEFINE_MUTEX(sn9c102_sysfs_lock);
static DECLARE_RWSEM(sn9c102_disconnect); static DECLARE_RWSEM(sn9c102_dev_lock);
struct sn9c102_device { struct sn9c102_device {
struct video_device* v4ldev; struct video_device* v4ldev;
...@@ -122,12 +123,14 @@ struct sn9c102_device { ...@@ -122,12 +123,14 @@ struct sn9c102_device {
struct sn9c102_module_param module_param; struct sn9c102_module_param module_param;
struct kref kref;
enum sn9c102_dev_state state; enum sn9c102_dev_state state;
u8 users; u8 users;
struct mutex dev_mutex, fileop_mutex; struct completion probe;
struct mutex open_mutex, fileop_mutex;
spinlock_t queue_lock; spinlock_t queue_lock;
wait_queue_head_t open, wait_frame, wait_stream; wait_queue_head_t wait_open, wait_frame, wait_stream;
}; };
/*****************************************************************************/ /*****************************************************************************/
......
This diff is collapsed.
...@@ -41,65 +41,65 @@ static int ov7660_init(struct sn9c102_device* cam) ...@@ -41,65 +41,65 @@ static int ov7660_init(struct sn9c102_device* cam)
{0xbb, 0x2a}, {0xc7, 0x2b}, {0xbb, 0x2a}, {0xc7, 0x2b},
{0xd3, 0x2c}, {0xde, 0x2d}, {0xd3, 0x2c}, {0xde, 0x2d},
{0xea, 0x2e}, {0xf4, 0x2f}, {0xea, 0x2e}, {0xf4, 0x2f},
{0xff, 0x30}, {0x00, 0x3F}, {0xff, 0x30}, {0x00, 0x3f},
{0xC7, 0x40}, {0x01, 0x41}, {0xc7, 0x40}, {0x01, 0x41},
{0x44, 0x42}, {0x00, 0x43}, {0x44, 0x42}, {0x00, 0x43},
{0x44, 0x44}, {0x00, 0x45}, {0x44, 0x44}, {0x00, 0x45},
{0x44, 0x46}, {0x00, 0x47}, {0x44, 0x46}, {0x00, 0x47},
{0xC7, 0x48}, {0x01, 0x49}, {0xc7, 0x48}, {0x01, 0x49},
{0xC7, 0x4A}, {0x01, 0x4B}, {0xc7, 0x4a}, {0x01, 0x4b},
{0xC7, 0x4C}, {0x01, 0x4D}, {0xc7, 0x4c}, {0x01, 0x4d},
{0x44, 0x4E}, {0x00, 0x4F}, {0x44, 0x4e}, {0x00, 0x4f},
{0x44, 0x50}, {0x00, 0x51}, {0x44, 0x50}, {0x00, 0x51},
{0x44, 0x52}, {0x00, 0x53}, {0x44, 0x52}, {0x00, 0x53},
{0xC7, 0x54}, {0x01, 0x55}, {0xc7, 0x54}, {0x01, 0x55},
{0xC7, 0x56}, {0x01, 0x57}, {0xc7, 0x56}, {0x01, 0x57},
{0xC7, 0x58}, {0x01, 0x59}, {0xc7, 0x58}, {0x01, 0x59},
{0x44, 0x5A}, {0x00, 0x5B}, {0x44, 0x5a}, {0x00, 0x5b},
{0x44, 0x5C}, {0x00, 0x5D}, {0x44, 0x5c}, {0x00, 0x5d},
{0x44, 0x5E}, {0x00, 0x5F}, {0x44, 0x5e}, {0x00, 0x5f},
{0xC7, 0x60}, {0x01, 0x61}, {0xc7, 0x60}, {0x01, 0x61},
{0xC7, 0x62}, {0x01, 0x63}, {0xc7, 0x62}, {0x01, 0x63},
{0xC7, 0x64}, {0x01, 0x65}, {0xc7, 0x64}, {0x01, 0x65},
{0x44, 0x66}, {0x00, 0x67}, {0x44, 0x66}, {0x00, 0x67},
{0x44, 0x68}, {0x00, 0x69}, {0x44, 0x68}, {0x00, 0x69},
{0x44, 0x6A}, {0x00, 0x6B}, {0x44, 0x6a}, {0x00, 0x6b},
{0xC7, 0x6C}, {0x01, 0x6D}, {0xc7, 0x6c}, {0x01, 0x6d},
{0xC7, 0x6E}, {0x01, 0x6F}, {0xc7, 0x6e}, {0x01, 0x6f},
{0xC7, 0x70}, {0x01, 0x71}, {0xc7, 0x70}, {0x01, 0x71},
{0x44, 0x72}, {0x00, 0x73}, {0x44, 0x72}, {0x00, 0x73},
{0x44, 0x74}, {0x00, 0x75}, {0x44, 0x74}, {0x00, 0x75},
{0x44, 0x76}, {0x00, 0x77}, {0x44, 0x76}, {0x00, 0x77},
{0xC7, 0x78}, {0x01, 0x79}, {0xc7, 0x78}, {0x01, 0x79},
{0xC7, 0x7A}, {0x01, 0x7B}, {0xc7, 0x7a}, {0x01, 0x7b},
{0xC7, 0x7C}, {0x01, 0x7D}, {0xc7, 0x7c}, {0x01, 0x7d},
{0x44, 0x7E}, {0x00, 0x7F}, {0x44, 0x7e}, {0x00, 0x7f},
{0x14, 0x84}, {0x00, 0x85}, {0x14, 0x84}, {0x00, 0x85},
{0x27, 0x86}, {0x00, 0x87}, {0x27, 0x86}, {0x00, 0x87},
{0x07, 0x88}, {0x00, 0x89}, {0x07, 0x88}, {0x00, 0x89},
{0xEC, 0x8A}, {0x0f, 0x8B}, {0xec, 0x8a}, {0x0f, 0x8b},
{0xD8, 0x8C}, {0x0f, 0x8D}, {0xd8, 0x8c}, {0x0f, 0x8d},
{0x3D, 0x8E}, {0x00, 0x8F}, {0x3d, 0x8e}, {0x00, 0x8f},
{0x3D, 0x90}, {0x00, 0x91}, {0x3d, 0x90}, {0x00, 0x91},
{0xCD, 0x92}, {0x0f, 0x93}, {0xcd, 0x92}, {0x0f, 0x93},
{0xf7, 0x94}, {0x0f, 0x95}, {0xf7, 0x94}, {0x0f, 0x95},
{0x0C, 0x96}, {0x00, 0x97}, {0x0c, 0x96}, {0x00, 0x97},
{0x00, 0x98}, {0x66, 0x99}, {0x00, 0x98}, {0x66, 0x99},
{0x05, 0x9A}, {0x00, 0x9B}, {0x05, 0x9a}, {0x00, 0x9b},
{0x04, 0x9C}, {0x00, 0x9D}, {0x04, 0x9c}, {0x00, 0x9d},
{0x08, 0x9E}, {0x00, 0x9F}, {0x08, 0x9e}, {0x00, 0x9f},
{0x2D, 0xC0}, {0x2D, 0xC1}, {0x2d, 0xc0}, {0x2d, 0xc1},
{0x3A, 0xC2}, {0x05, 0xC3}, {0x3a, 0xc2}, {0x05, 0xc3},
{0x04, 0xC4}, {0x3F, 0xC5}, {0x04, 0xc4}, {0x3f, 0xc5},
{0x00, 0xC6}, {0x00, 0xC7}, {0x00, 0xc6}, {0x00, 0xc7},
{0x50, 0xC8}, {0x3C, 0xC9}, {0x50, 0xc8}, {0x3C, 0xc9},
{0x28, 0xCA}, {0xD8, 0xCB}, {0x28, 0xca}, {0xd8, 0xcb},
{0x14, 0xCC}, {0xEC, 0xCD}, {0x14, 0xcc}, {0xec, 0xcd},
{0x32, 0xCE}, {0xDD, 0xCF}, {0x32, 0xce}, {0xdd, 0xcf},
{0x32, 0xD0}, {0xDD, 0xD1}, {0x32, 0xd0}, {0xdd, 0xd1},
{0x6A, 0xD2}, {0x50, 0xD3}, {0x6a, 0xd2}, {0x50, 0xd3},
{0x00, 0xD4}, {0x00, 0xD5}, {0x00, 0xd4}, {0x00, 0xd5},
{0x00, 0xD6}); {0x00, 0xd6});
err += sn9c102_i2c_write(cam, 0x12, 0x80); err += sn9c102_i2c_write(cam, 0x12, 0x80);
err += sn9c102_i2c_write(cam, 0x11, 0x09); err += sn9c102_i2c_write(cam, 0x11, 0x09);
......
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