Commit a97d11d9 authored by Gerd Knorr's avatar Gerd Knorr Committed by Linus Torvalds

[PATCH] saa5246a Videotext driver update

From: Michael Geng <linux@MichaelGeng.de>

The patch updates docs, comments + strings to also mention the SAA5281 chip
(which is compatible to the SAA5246A) as supported.
Signed-off-by: default avatarMichael Geng <linux@MichaelGeng.de>
Signed-off-by: default avatarGerd Knorr <kraxel@bytesex.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9d2e400d
...@@ -112,11 +112,11 @@ config VIDEO_CPIA_USB ...@@ -112,11 +112,11 @@ config VIDEO_CPIA_USB
It is also available as a module (cpia_usb). It is also available as a module (cpia_usb).
config VIDEO_SAA5246A config VIDEO_SAA5246A
tristate "SAA5246A Teletext processor" tristate "SAA5246A, SAA5281 Teletext processor"
depends on VIDEO_DEV && I2C depends on VIDEO_DEV && I2C
help help
Support for I2C bus based teletext using the SAA5246A chip. Useful Support for I2C bus based teletext using the SAA5246A or SAA5281
only if you live in Europe. chip. Useful only if you live in Europe.
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 saa5246a. module will be called saa5246a.
......
/* /*
* Driver for the SAA5246A videotext decoder chip from Philips. * Driver for the SAA5246A or SAA5281 Teletext (=Videotext) decoder chips from
* Philips.
* *
* Only capturing of videotext pages is tested. The SAA5246A chip also has * Only capturing of Teletext pages is tested. The videotext chips also have a
* a TV output but my hardware doesn't use it. For this reason this driver * TV output but my hardware doesn't use it. For this reason this driver does
* does not support changing any TV display settings. * not support changing any TV display settings.
* *
* Copyright (C) 2004 Michael Geng <linux@MichaelGeng.de> * Copyright (C) 2004 Michael Geng <linux@MichaelGeng.de>
* *
...@@ -47,6 +48,10 @@ ...@@ -47,6 +48,10 @@
#include <linux/videodev.h> #include <linux/videodev.h>
#include "saa5246a.h" #include "saa5246a.h"
MODULE_AUTHOR("Michael Geng <linux@MichaelGeng.de>");
MODULE_DESCRIPTION("Philips SAA5246A, SAA5281 Teletext decoder driver");
MODULE_LICENSE("GPL");
struct saa5246a_device struct saa5246a_device
{ {
u8 pgbuf[NUM_DAUS][VTX_VIRTUALSIZE]; u8 pgbuf[NUM_DAUS][VTX_VIRTUALSIZE];
...@@ -764,8 +769,8 @@ static int saa5246a_release(struct inode *inode, struct file *file) ...@@ -764,8 +769,8 @@ static int saa5246a_release(struct inode *inode, struct file *file)
static int __init init_saa_5246a (void) static int __init init_saa_5246a (void)
{ {
printk(KERN_INFO "SAA5246A driver (" IF_NAME printk(KERN_INFO
" interface) for VideoText version %d.%d\n", "SAA5246A (or compatible) Teletext decoder driver version %d.%d\n",
MAJOR_VERSION, MINOR_VERSION); MAJOR_VERSION, MINOR_VERSION);
return i2c_add_driver(&i2c_driver_videotext); return i2c_add_driver(&i2c_driver_videotext);
} }
...@@ -796,5 +801,3 @@ static struct video_device saa_template = ...@@ -796,5 +801,3 @@ static struct video_device saa_template =
.release = video_device_release, .release = video_device_release,
.minor = -1, .minor = -1,
}; };
MODULE_LICENSE("GPL");
/* /*
Driver for the SAA5246A videotext decoder chip from Philips. Driver for the SAA5246A or SAA5281 Teletext (=Videotext) decoder chips from
Philips.
Copyright (C) 2004 Michael Geng (linux@MichaelGeng.de) Copyright (C) 2004 Michael Geng (linux@MichaelGeng.de)
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -21,7 +23,7 @@ ...@@ -21,7 +23,7 @@
#define __SAA5246A_H__ #define __SAA5246A_H__
#define MAJOR_VERSION 1 /* driver major version number */ #define MAJOR_VERSION 1 /* driver major version number */
#define MINOR_VERSION 6 /* driver minor version number */ #define MINOR_VERSION 7 /* driver minor version number */
#define IF_NAME "SAA5246A" #define IF_NAME "SAA5246A"
......
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