1 From 979c2242ce97ccc12869e60f7c1f1258c906a99c Mon Sep 17 00:00:00 2001
2 From: Markus Proeller <markus.proeller@pieye.org>
3 Date: Tue, 16 Jun 2020 13:27:42 +0200
4 Subject: [PATCH] media: irs1125: Refactoring and debug messages
6 Changed some variable names to comply with checkpatch --strict mode.
9 Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
11 drivers/media/i2c/irs1125.c | 36 ++++++++++++++++++++----------------
12 1 file changed, 20 insertions(+), 16 deletions(-)
14 --- a/drivers/media/i2c/irs1125.c
15 +++ b/drivers/media/i2c/irs1125.c
18 #include <linux/clk.h>
19 #include <linux/delay.h>
20 +#include <linux/firmware.h>
21 #include <linux/gpio/consumer.h>
22 #include <linux/i2c.h>
23 #include <linux/init.h>
25 #include <linux/module.h>
26 #include <linux/of_graph.h>
27 #include <linux/slab.h>
28 +#include <linux/types.h>
29 #include <linux/videodev2.h>
30 -#include <linux/firmware.h>
31 +#include <media/v4l2-ctrls.h>
32 #include <media/v4l2-device.h>
33 #include <media/v4l2-fwnode.h>
34 #include <media/v4l2-image-sizes.h>
35 #include <media/v4l2-mediabus.h>
36 -#include <media/v4l2-ctrls.h>
38 #define CHECK_BIT(val, pos) ((val) & BIT(pos))
42 #define IRS1125_ALTERNATE_FW "irs1125_af.bin"
44 -#define IRS1125_REG_CSICFG 0xA882
45 -#define IRS1125_REG_DESIGN_STEP 0xB0AD
46 -#define IRS1125_REG_EFUSEVAL2 0xB09F
47 -#define IRS1125_REG_EFUSEVAL3 0xB0A0
48 -#define IRS1125_REG_EFUSEVAL4 0xB0A1
49 -#define IRS1125_REG_DMEM_SHADOW 0xC320
50 +#define IRS1125_REG_SAFE_RECONFIG 0xA850
51 +#define IRS1125_REG_CSICFG 0xA882
52 +#define IRS1125_REG_DESIGN_STEP 0xB0AD
53 +#define IRS1125_REG_EFUSEVAL2 0xB09F
54 +#define IRS1125_REG_EFUSEVAL3 0xB0A0
55 +#define IRS1125_REG_EFUSEVAL4 0xB0A1
56 +#define IRS1125_REG_DMEM_SHADOW 0xC320
58 -#define IRS1125_DESIGN_STEP_EXPECTED 0x0a12
59 +#define IRS1125_DESIGN_STEP_EXPECTED 0x0a12
61 #define IRS1125_ROW_START_DEF 0
62 #define IRS1125_COLUMN_START_DEF 0
63 -#define IRS1125_WINDOW_HEIGHT_DEF 288
64 +#define IRS1125_WINDOW_HEIGHT_DEF 288
65 #define IRS1125_WINDOW_WIDTH_DEF 352
68 @@ -87,7 +89,7 @@ static inline struct irs1125 *to_state(s
69 return container_of(sd, struct irs1125, sd);
72 -static struct regval_list irs1125_26MHz[] = {
73 +static struct regval_list irs1125_26mhz[] = {
77 @@ -153,7 +155,7 @@ static struct regval_list irs1125_26MHz[
81 -static struct regval_list irs1125_seq_cfg[] = {
82 +static struct regval_list irs1125_seq_cfg_init[] = {
86 @@ -243,6 +245,7 @@ static int irs1125_write(struct v4l2_sub
87 dev_err(&client->dev, "%s: i2c write error, reg: %x\n",
90 + dev_dbg(&client->dev, "write addr 0x%04x, val 0x%04x\n", reg, val);
94 @@ -364,8 +367,8 @@ static int __sensor_init(struct v4l2_sub
98 - ret = irs1125_write_array(sd, irs1125_26MHz,
99 - ARRAY_SIZE(irs1125_26MHz));
100 + ret = irs1125_write_array(sd, irs1125_26mhz,
101 + ARRAY_SIZE(irs1125_26mhz));
103 dev_err(&client->dev, "write sensor default regs error\n");
105 @@ -415,8 +418,8 @@ static int __sensor_init(struct v4l2_sub
107 release_firmware(fw);
109 - ret = irs1125_write_array(sd, irs1125_seq_cfg,
110 - ARRAY_SIZE(irs1125_seq_cfg));
111 + ret = irs1125_write_array(sd, irs1125_seq_cfg_init,
112 + ARRAY_SIZE(irs1125_seq_cfg_init));
114 dev_err(&client->dev, "write default sequence failed\n");
116 @@ -1037,6 +1040,7 @@ static int irs1125_probe(struct i2c_clie
119 gpio_num = desc_to_gpio(sensor->reset);
120 + dev_dbg(&client->dev, "reset on GPIO num %d\n", gpio_num);
122 mutex_init(&sensor->lock);