diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2009-08-09 13:23:35 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-12 11:18:43 -0400 |
commit | cc35bbddfe10f77d949f0190764b252cd2b70c3c (patch) | |
tree | 4dbf834bb4d0fec001592e177c6786c1e6c701ae /drivers/media/radio/si470x/radio-si470x.h | |
parent | 3c7cc8d52c0bd60d214aca22772aa3602a2b3198 (diff) |
V4L/DVB (12416): radio-si470x: add i2c driver for si470x
This patch supports i2c interface of si470x. The i2c specific part
exists in radio-si470x-i2c.c file and the common part uses
radio-si470x-common.c file. The '#if defined' is inserted inevitably
because of parts used only si470x usb in the common file.
The current driver version doesn't support the RDS.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Tobias Lorenz <tobias.lorenz@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio/si470x/radio-si470x.h')
-rw-r--r-- | drivers/media/radio/si470x/radio-si470x.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h index d24829b04eb2..794112c759b8 100644 --- a/drivers/media/radio/si470x/radio-si470x.h +++ b/drivers/media/radio/si470x/radio-si470x.h | |||
@@ -143,6 +143,11 @@ | |||
143 | struct si470x_device { | 143 | struct si470x_device { |
144 | struct video_device *videodev; | 144 | struct video_device *videodev; |
145 | 145 | ||
146 | #if defined(CONFIG_I2C_SI470X) || defined(CONFIG_I2C_SI470X_MODULE) | ||
147 | struct i2c_client *client; | ||
148 | #endif | ||
149 | |||
150 | #if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE) | ||
146 | /* reference to USB and video device */ | 151 | /* reference to USB and video device */ |
147 | struct usb_device *usbdev; | 152 | struct usb_device *usbdev; |
148 | struct usb_interface *intf; | 153 | struct usb_interface *intf; |
@@ -160,6 +165,7 @@ struct si470x_device { | |||
160 | /* driver management */ | 165 | /* driver management */ |
161 | unsigned char disconnected; | 166 | unsigned char disconnected; |
162 | struct mutex disconnect_lock; | 167 | struct mutex disconnect_lock; |
168 | #endif | ||
163 | unsigned int users; | 169 | unsigned int users; |
164 | 170 | ||
165 | /* Silabs internal registers (0..15) */ | 171 | /* Silabs internal registers (0..15) */ |