Commit 47ff2ff2 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: smiapp: Rename register access functions 



Rename register access functions by changing smiapp to ccs.

The functions operating on register addresses have "addr" appended to the
name.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 235ac9a4

drivers/media/i2c/smiapp/smiapp-core.c

+34 −33
Original line number Original line Diff line number Diff line
@@ -180,7 +180,7 @@ static int ccs_read_all_limits(struct smiapp_sensor *sensor) 
		     j++, reg += width, ptr += width) {

		     j++, reg += width, ptr += width) {

			u32 val;

			u32 val;





			ret = smiapp_read(sensor, reg, &val);

			ret = ccs_read_addr(sensor, reg, &val);

			if (ret)

			if (ret)

				goto out_err;

				goto out_err;
@@ -2450,27 +2450,28 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor) 
	rval = ccs_read(sensor, MODULE_MANUFACTURER_ID,

	rval = ccs_read(sensor, MODULE_MANUFACTURER_ID,

			&minfo->mipi_manufacturer_id);

			&minfo->mipi_manufacturer_id);

	if (!rval && !minfo->mipi_manufacturer_id)

	if (!rval && !minfo->mipi_manufacturer_id)

		rval = smiapp_read_8only(sensor, SMIAPP_REG_U8_MANUFACTURER_ID,

		rval = ccs_read_addr_8only(sensor,

					   SMIAPP_REG_U8_MANUFACTURER_ID,

					   &minfo->smia_manufacturer_id);

					   &minfo->smia_manufacturer_id);

	if (!rval)

	if (!rval)

		rval = smiapp_read_8only(sensor, CCS_R_MODULE_MODEL_ID,

		rval = ccs_read_addr_8only(sensor, CCS_R_MODULE_MODEL_ID,

					   &minfo->model_id);

					   &minfo->model_id);

	if (!rval)

	if (!rval)

		rval = smiapp_read_8only(sensor,

		rval = ccs_read_addr_8only(sensor,

					   CCS_R_MODULE_REVISION_NUMBER_MAJOR,

					   CCS_R_MODULE_REVISION_NUMBER_MAJOR,

					   &minfo->revision_number_major);

					   &minfo->revision_number_major);

	if (!rval)

	if (!rval)

		rval = smiapp_read_8only(sensor,

		rval = ccs_read_addr_8only(sensor,

					   CCS_R_MODULE_REVISION_NUMBER_MINOR,

					   CCS_R_MODULE_REVISION_NUMBER_MINOR,

					   &minfo->revision_number_minor);

					   &minfo->revision_number_minor);

	if (!rval)

	if (!rval)

		rval = smiapp_read_8only(sensor, CCS_R_MODULE_DATE_YEAR,

		rval = ccs_read_addr_8only(sensor, CCS_R_MODULE_DATE_YEAR,

					   &minfo->module_year);

					   &minfo->module_year);

	if (!rval)

	if (!rval)

		rval = smiapp_read_8only(sensor, CCS_R_MODULE_DATE_MONTH,

		rval = ccs_read_addr_8only(sensor, CCS_R_MODULE_DATE_MONTH,

					   &minfo->module_month);

					   &minfo->module_month);

	if (!rval)

	if (!rval)

		rval = smiapp_read_8only(sensor, CCS_R_MODULE_DATE_DAY,

		rval = ccs_read_addr_8only(sensor, CCS_R_MODULE_DATE_DAY,

					   &minfo->module_day);

					   &minfo->module_day);





	/* Sensor info */

	/* Sensor info */
@@ -2478,19 +2479,19 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor) 
		rval = ccs_read(sensor, SENSOR_MANUFACTURER_ID,

		rval = ccs_read(sensor, SENSOR_MANUFACTURER_ID,

				&minfo->sensor_mipi_manufacturer_id);

				&minfo->sensor_mipi_manufacturer_id);

	if (!rval && !minfo->sensor_mipi_manufacturer_id)

	if (!rval && !minfo->sensor_mipi_manufacturer_id)

		rval = smiapp_read_8only(sensor,

		rval = ccs_read_addr_8only(sensor,

					   CCS_R_SENSOR_MANUFACTURER_ID,

					   CCS_R_SENSOR_MANUFACTURER_ID,

					   &minfo->sensor_smia_manufacturer_id);

					   &minfo->sensor_smia_manufacturer_id);

	if (!rval)

	if (!rval)

		rval = smiapp_read_8only(sensor,

		rval = ccs_read_addr_8only(sensor,

					   CCS_R_SENSOR_MODEL_ID,

					   CCS_R_SENSOR_MODEL_ID,

					   &minfo->sensor_model_id);

					   &minfo->sensor_model_id);

	if (!rval)

	if (!rval)

		rval = smiapp_read_8only(sensor,

		rval = ccs_read_addr_8only(sensor,

					   CCS_R_SENSOR_REVISION_NUMBER,

					   CCS_R_SENSOR_REVISION_NUMBER,

					   &minfo->sensor_revision_number);

					   &minfo->sensor_revision_number);

	if (!rval)

	if (!rval)

		rval = smiapp_read_8only(sensor,

		rval = ccs_read_addr_8only(sensor,

					   CCS_R_SENSOR_FIRMWARE_VERSION,

					   CCS_R_SENSOR_FIRMWARE_VERSION,

					   &minfo->sensor_firmware_version);

					   &minfo->sensor_firmware_version);
@@ -2498,10 +2499,10 @@ static int smiapp_identify_module(struct smiapp_sensor *sensor) 
	if (!rval)

	if (!rval)

		rval = ccs_read(sensor, MIPI_CCS_VERSION, &minfo->ccs_version);

		rval = ccs_read(sensor, MIPI_CCS_VERSION, &minfo->ccs_version);

	if (!rval && !minfo->ccs_version)

	if (!rval && !minfo->ccs_version)

		rval = smiapp_read_8only(sensor, SMIAPP_REG_U8_SMIA_VERSION,

		rval = ccs_read_addr_8only(sensor, SMIAPP_REG_U8_SMIA_VERSION,

					   &minfo->smia_version);

					   &minfo->smia_version);

	if (!rval && !minfo->ccs_version)

	if (!rval && !minfo->ccs_version)

		rval = smiapp_read_8only(sensor, SMIAPP_REG_U8_SMIAPP_VERSION,

		rval = ccs_read_addr_8only(sensor, SMIAPP_REG_U8_SMIAPP_VERSION,

					   &minfo->smiapp_version);

					   &minfo->smiapp_version);





	if (rval) {

	if (rval) {

drivers/media/i2c/smiapp/smiapp-quirk.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -14,14 +14,14 @@ 




#include "smiapp.h"

#include "smiapp.h"





static int smiapp_write_8s(struct smiapp_sensor *sensor,

static int ccs_write_addr_8s(struct smiapp_sensor *sensor,

			     const struct smiapp_reg_8 *regs, int len)

			     const struct smiapp_reg_8 *regs, int len)

{

{

	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);

	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);

	int rval;

	int rval;





	for (; len > 0; len--, regs++) {

	for (; len > 0; len--, regs++) {

		rval = smiapp_write(sensor, regs->reg, regs->val);

		rval = ccs_write_addr(sensor, regs->reg, regs->val);

		if (rval < 0) {

		if (rval < 0) {

			dev_err(&client->dev,

			dev_err(&client->dev,

				"error %d writing reg 0x%4.4x, val 0x%2.2x",

				"error %d writing reg 0x%4.4x, val 0x%2.2x",
@@ -81,7 +81,7 @@ static int jt8ew9_post_poweron(struct smiapp_sensor *sensor) 




	};

	};





	return smiapp_write_8s(sensor, regs, ARRAY_SIZE(regs));

	return ccs_write_addr_8s(sensor, regs, ARRAY_SIZE(regs));

}

}





const struct smiapp_quirk smiapp_jt8ew9_quirk = {

const struct smiapp_quirk smiapp_jt8ew9_quirk = {
@@ -102,7 +102,7 @@ static int imx125es_post_poweron(struct smiapp_sensor *sensor) 
		{ 0x3b08, 0x8c },

		{ 0x3b08, 0x8c },

	};

	};





	return smiapp_write_8s(sensor, regs, ARRAY_SIZE(regs));

	return ccs_write_addr_8s(sensor, regs, ARRAY_SIZE(regs));

}

}





const struct smiapp_quirk smiapp_imx125es_quirk = {

const struct smiapp_quirk smiapp_imx125es_quirk = {
@@ -148,13 +148,13 @@ static int jt8ev1_post_poweron(struct smiapp_sensor *sensor) 
		{ 0x30b0, 0x01 },

		{ 0x30b0, 0x01 },

	};

	};





	rval = smiapp_write_8s(sensor, regs, ARRAY_SIZE(regs));

	rval = ccs_write_addr_8s(sensor, regs, ARRAY_SIZE(regs));

	if (rval < 0)

	if (rval < 0)

		return rval;

		return rval;





	switch (sensor->hwcfg->ext_clk) {

	switch (sensor->hwcfg->ext_clk) {

	case 9600000:

	case 9600000:

		return smiapp_write_8s(sensor, regs_96,

		return ccs_write_addr_8s(sensor, regs_96,

				       ARRAY_SIZE(regs_96));

				       ARRAY_SIZE(regs_96));

	default:

	default:

		dev_warn(&client->dev, "no MSRs for %d Hz ext_clk\n",

		dev_warn(&client->dev, "no MSRs for %d Hz ext_clk\n",
@@ -165,7 +165,7 @@ static int jt8ev1_post_poweron(struct smiapp_sensor *sensor) 




static int jt8ev1_pre_streamon(struct smiapp_sensor *sensor)

static int jt8ev1_pre_streamon(struct smiapp_sensor *sensor)

{

{

	return smiapp_write(sensor, 0x3328, 0x00);

	return ccs_write_addr(sensor, 0x3328, 0x00);

}

}





static int jt8ev1_post_streamoff(struct smiapp_sensor *sensor)

static int jt8ev1_post_streamoff(struct smiapp_sensor *sensor)
@@ -173,7 +173,7 @@ static int jt8ev1_post_streamoff(struct smiapp_sensor *sensor) 
	int rval;

	int rval;





	/* Workaround: allows fast standby to work properly */

	/* Workaround: allows fast standby to work properly */

	rval = smiapp_write(sensor, 0x3205, 0x04);

	rval = ccs_write_addr(sensor, 0x3205, 0x04);

	if (rval < 0)

	if (rval < 0)

		return rval;

		return rval;
@@ -181,11 +181,11 @@ static int jt8ev1_post_streamoff(struct smiapp_sensor *sensor) 
	usleep_range(2000, 2050);

	usleep_range(2000, 2050);





	/* Restore it */

	/* Restore it */

	rval = smiapp_write(sensor, 0x3205, 0x00);

	rval = ccs_write_addr(sensor, 0x3205, 0x00);

	if (rval < 0)

	if (rval < 0)

		return rval;

		return rval;





	return smiapp_write(sensor, 0x3328, 0x80);

	return ccs_write_addr(sensor, 0x3328, 0x80);

}

}





static int jt8ev1_init(struct smiapp_sensor *sensor)

static int jt8ev1_init(struct smiapp_sensor *sensor)

drivers/media/i2c/smiapp/smiapp-regs.c

+24 −23
Original line number Original line Diff line number Diff line
@@ -66,8 +66,8 @@ static uint32_t float_to_u32_mul_1000000(struct i2c_client *client, 
 * Read a 8/16/32-bit i2c register.  The value is returned in 'val'.

 * Read a 8/16/32-bit i2c register.  The value is returned in 'val'.

 * Returns zero if successful, or non-zero otherwise.

 * Returns zero if successful, or non-zero otherwise.

 */

 */

static int ____smiapp_read(struct smiapp_sensor *sensor, u16 reg,

static int ____ccs_read_addr(struct smiapp_sensor *sensor, u16 reg, u16 len,

			   u16 len, u32 *val)

			     u32 *val)

{

{

	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);

	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);

	struct i2c_msg msg;

	struct i2c_msg msg;
@@ -113,7 +113,7 @@ static int ____smiapp_read(struct smiapp_sensor *sensor, u16 reg, 
}

}





/* Read a register using 8-bit access only. */

/* Read a register using 8-bit access only. */

static int ____smiapp_read_8only(struct smiapp_sensor *sensor, u16 reg,

static int ____ccs_read_addr_8only(struct smiapp_sensor *sensor, u16 reg,

				   u16 len, u32 *val)

				   u16 len, u32 *val)

{

{

	unsigned int i;

	unsigned int i;
@@ -124,7 +124,7 @@ static int ____smiapp_read_8only(struct smiapp_sensor *sensor, u16 reg, 
	for (i = 0; i < len; i++) {

	for (i = 0; i < len; i++) {

		u32 val8;

		u32 val8;





		rval = ____smiapp_read(sensor, reg + i, 1, &val8);

		rval = ____ccs_read_addr(sensor, reg + i, 1, &val8);

		if (rval < 0)

		if (rval < 0)

			return rval;

			return rval;

		*val |= val8 << ((len - i - 1) << 3);

		*val |= val8 << ((len - i - 1) << 3);
@@ -147,7 +147,7 @@ unsigned int ccs_reg_width(u32 reg) 
 * Read a 8/16/32-bit i2c register.  The value is returned in 'val'.

 * Read a 8/16/32-bit i2c register.  The value is returned in 'val'.

 * Returns zero if successful, or non-zero otherwise.

 * Returns zero if successful, or non-zero otherwise.

 */

 */

static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val,

static int __ccs_read_addr(struct smiapp_sensor *sensor, u32 reg, u32 *val,

			   bool only8)

			   bool only8)

{

{

	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);

	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
@@ -155,10 +155,11 @@ static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val, 
	int rval;

	int rval;





	if (!only8)

	if (!only8)

		rval = ____smiapp_read(sensor, SMIAPP_REG_ADDR(reg), len, val);

		rval = ____ccs_read_addr(sensor, SMIAPP_REG_ADDR(reg), len,

	else

		rval = ____smiapp_read_8only(sensor, SMIAPP_REG_ADDR(reg), len,

					    val);

					    val);

	else

		rval = ____ccs_read_addr_8only(sensor, SMIAPP_REG_ADDR(reg),

						  len, val);

	if (rval < 0)

	if (rval < 0)

		return rval;

		return rval;
@@ -168,15 +169,15 @@ static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val, 
	return 0;

	return 0;

}

}





int smiapp_read_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 *val)

int ccs_read_addr_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 *val)

{

{

	return __smiapp_read(

	return __ccs_read_addr(

		sensor, reg, val,

		sensor, reg, val,

		smiapp_needs_quirk(sensor,

		smiapp_needs_quirk(sensor,

				   SMIAPP_QUIRK_FLAG_8BIT_READ_ONLY));

				   SMIAPP_QUIRK_FLAG_8BIT_READ_ONLY));

}

}





static int smiapp_read_quirk(struct smiapp_sensor *sensor, u32 reg, u32 *val,

static int ccs_read_addr_quirk(struct smiapp_sensor *sensor, u32 reg, u32 *val,

			       bool force8)

			       bool force8)

{

{

	int rval;

	int rval;
@@ -189,22 +190,22 @@ static int smiapp_read_quirk(struct smiapp_sensor *sensor, u32 reg, u32 *val, 
		return rval;

		return rval;





	if (force8)

	if (force8)

		return __smiapp_read(sensor, reg, val, true);

		return __ccs_read_addr(sensor, reg, val, true);





	return smiapp_read_no_quirk(sensor, reg, val);

	return ccs_read_addr_no_quirk(sensor, reg, val);

}

}





int smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val)

int ccs_read_addr(struct smiapp_sensor *sensor, u32 reg, u32 *val)

{

{

	return smiapp_read_quirk(sensor, reg, val, false);

	return ccs_read_addr_quirk(sensor, reg, val, false);

}

}





int smiapp_read_8only(struct smiapp_sensor *sensor, u32 reg, u32 *val)

int ccs_read_addr_8only(struct smiapp_sensor *sensor, u32 reg, u32 *val)

{

{

	return smiapp_read_quirk(sensor, reg, val, true);

	return ccs_read_addr_quirk(sensor, reg, val, true);

}

}





int smiapp_write_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 val)

int ccs_write_addr_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 val)

{

{

	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);

	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);

	struct i2c_msg msg;

	struct i2c_msg msg;
@@ -253,7 +254,7 @@ int smiapp_write_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 val) 
 * Write to a 8/16-bit register.

 * Write to a 8/16-bit register.

 * Returns zero if successful, or non-zero otherwise.

 * Returns zero if successful, or non-zero otherwise.

 */

 */

int smiapp_write(struct smiapp_sensor *sensor, u32 reg, u32 val)

int ccs_write_addr(struct smiapp_sensor *sensor, u32 reg, u32 val)

{

{

	int rval;

	int rval;
@@ -263,5 +264,5 @@ int smiapp_write(struct smiapp_sensor *sensor, u32 reg, u32 val) 
	if (rval < 0)

	if (rval < 0)

		return rval;

		return rval;





	return smiapp_write_no_quirk(sensor, reg, val);

	return ccs_write_addr_no_quirk(sensor, reg, val);

}
 
}

drivers/media/i2c/smiapp/smiapp-regs.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -20,18 +20,18 @@ 




struct smiapp_sensor;

struct smiapp_sensor;





int smiapp_read_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 *val);

int ccs_read_addr_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 *val);

int smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val);

int ccs_read_addr(struct smiapp_sensor *sensor, u32 reg, u32 *val);

int smiapp_read_8only(struct smiapp_sensor *sensor, u32 reg, u32 *val);

int ccs_read_addr_8only(struct smiapp_sensor *sensor, u32 reg, u32 *val);

int smiapp_write_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 val);

int ccs_write_addr_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 val);

int smiapp_write(struct smiapp_sensor *sensor, u32 reg, u32 val);

int ccs_write_addr(struct smiapp_sensor *sensor, u32 reg, u32 val);





unsigned int ccs_reg_width(u32 reg);

unsigned int ccs_reg_width(u32 reg);





#define ccs_read(sensor, reg_name, val) \

#define ccs_read(sensor, reg_name, val) \

	smiapp_read(sensor, CCS_R_##reg_name, val)

	ccs_read_addr(sensor, CCS_R_##reg_name, val)





#define ccs_write(sensor, reg_name, val) \

#define ccs_write(sensor, reg_name, val) \

	smiapp_write(sensor, CCS_R_##reg_name, val)

	ccs_write_addr(sensor, CCS_R_##reg_name, val)





#endif
 
#endif