Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74cab31c authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5355): Add VIDIOC_G_CHIP_IDENT to various i2c modules 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 1a0adaf3

drivers/media/video/cs53l32a.c

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/i2c-id.h>

#include <linux/videodev.h>

#include <media/v4l2-common.h>

#include <media/v4l2-chip-ident.h>



MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");

MODULE_AUTHOR("Martin Vaughan");
@@ -103,6 +104,9 @@ static int cs53l32a_command(struct i2c_client *client, unsigned int cmd, 
		cs53l32a_write(client, 0x05, (u8) ctrl->value);

		break;



	case VIDIOC_G_CHIP_IDENT:

		return v4l2_chip_ident_i2c_client(client, arg, V4L2_IDENT_CS53l32A, 0);



	case VIDIOC_LOG_STATUS:

		{

			u8 v = cs53l32a_read(client, 0x01);

drivers/media/video/msp3400-driver.c

+5 −0
Original line number Diff line number Diff line
@@ -773,6 +773,9 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		break;

	}



	case VIDIOC_G_CHIP_IDENT:

		return v4l2_chip_ident_i2c_client(client, arg, state->ident, (state->rev1 << 16) | state->rev2);



	default:

		/* unknown */

		return -EINVAL;
@@ -872,6 +875,8 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind) 
	snprintf(client->name, sizeof(client->name), "MSP%d4%02d%c-%c%d",

			msp_family, msp_product,

			msp_revision, msp_hard, msp_rom);

	/* Rev B=2, C=3, D=4, G=7 */

	state->ident = msp_family * 10000 + 4000 + msp_product * 10 + msp_revision - '@';



	/* Has NICAM support: all mspx41x and mspx45x products have NICAM */

	state->has_nicam = msp_prod_hi == 1 || msp_prod_hi == 5;

drivers/media/video/msp3400-driver.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ extern int msp_stereo_thresh; 


struct msp_state {

	int rev1, rev2;

	int ident;

	u8 has_nicam;

	u8 has_radio;

	u8 has_headphones;

drivers/media/video/tvaudio.c

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include <media/tvaudio.h>

#include <media/v4l2-common.h>

#include <media/v4l2-chip-ident.h>



#include <media/i2c-addr.h>
@@ -1775,6 +1776,9 @@ static int chip_command(struct i2c_client *client, 
			/* the thread will call checkmode() later */

		}

		break;



	case VIDIOC_G_CHIP_IDENT:

		return v4l2_chip_ident_i2c_client(client, arg, V4L2_IDENT_TVAUDIO, 0);

	}

	return 0;

}

drivers/media/video/upd64031a.c

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/i2c.h>

#include <linux/videodev2.h>

#include <media/v4l2-common.h>

#include <media/v4l2-chip-ident.h>

#include <media/upd64031a.h>



// --------------------- read registers functions define -----------------------
@@ -179,6 +180,9 @@ static int upd64031a_command(struct i2c_client *client, unsigned int cmd, void * 
	}

#endif



	case VIDIOC_G_CHIP_IDENT:

		return v4l2_chip_ident_i2c_client(client, arg, V4L2_IDENT_UPD64031A, 0);



	default:

		break;

	}