Commit 1ac05163 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: get rid of i2c-addr.h 



In the past, the same I2C address were used on multiple places.
After I2C rebinding changes, this is no longer needed. So, we
can just get rid of this header, placing the I2C address where
they belong, e. g. either at bttv driver or at tvtuner.

Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 39654531

drivers/media/i2c/tda7432.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <media/v4l2-device.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-ctrls.h>

#include <media/i2c-addr.h>



#ifndef VIDEO_AUDIO_BALANCE

# define VIDEO_AUDIO_BALANCE 32

drivers/media/i2c/tvaudio.c

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ 
#include <media/v4l2-device.h>

#include <media/v4l2-ctrls.h>



#include <media/i2c-addr.h>



/* ---------------------------------------------------------------------- */

/* insmod args                                                            */

drivers/media/pci/bt8xx/bttv-cards.c

+7 −0
Original line number Diff line number Diff line
@@ -141,6 +141,13 @@ MODULE_PARM_DESC(audiodev, "specify audio device:\n" 
MODULE_PARM_DESC(saa6588, "if 1, then load the saa6588 RDS module, default (0) is to use the card definition.");

MODULE_PARM_DESC(no_overlay, "allow override overlay default (0 disables, 1 enables) [some VIA/SIS chipsets are known to have problem with overlay]");





/* I2C addresses list */

#define I2C_ADDR_TDA7432	0x8a

#define I2C_ADDR_MSP3400	0x80

#define I2C_ADDR_MSP3400_ALT	0x88





/* ----------------------------------------------------------------------- */

/* list of card IDs for bt878+ cards                                       */

drivers/media/pci/bt8xx/bttv.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/videodev2.h>

#include <linux/i2c.h>

#include <media/v4l2-device.h>

#include <media/i2c-addr.h>

#include <media/tuner.h>



/* ---------------------------------------------------------- */

drivers/media/usb/em28xx/em28xx-cards.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <media/i2c/saa7115.h>

#include <dt-bindings/media/tvp5150.h>

#include <media/i2c/tvaudio.h>

#include <media/i2c-addr.h>

#include <media/tveeprom.h>

#include <media/v4l2-common.h>

#include <sound/ac97_codec.h>