disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/iio/light/apds9960.c
..
..
@@ -15,7 +15,6 @@
15
15
 #include <linux/mutex.h>
16
16
 #include <linux/err.h>
17
17
 #include <linux/irq.h>
18
-#include <linux/gpio.h>
19
18
 #include <linux/i2c.h>
20
19
 #include <linux/pm_runtime.h>
21
20
 #include <linux/regmap.h>
..
..
@@ -24,7 +23,6 @@
24
23
 #include <linux/iio/events.h>
25
24
 #include <linux/iio/kfifo_buf.h>
26
25
 #include <linux/iio/sysfs.h>
27
-#include <linux/of_gpio.h>
28
26
 
29
27
 #define APDS9960_REGMAP_NAME	"apds9960_regmap"
30
28
 #define APDS9960_DRV_NAME	"apds9960"
..
..
@@ -55,9 +53,6 @@
55
53
 #define APDS9960_REG_CONTROL_PGAIN_MASK_SHIFT	2
56
54
 
57
55
 #define APDS9960_REG_CONFIG_2	0x90
58
-#define APDS9960_REG_CONFIG_2_GGAIN_MASK	0x60
59
-#define APDS9960_REG_CONFIG_2_GGAIN_MASK_SHIFT	5
60
-
61
56
 #define APDS9960_REG_ID		0x92
62
57
 
63
58
 #define APDS9960_REG_STATUS	0x93
..
..
@@ -78,6 +73,9 @@
78
73
 #define APDS9960_REG_GCONF_1_GFIFO_THRES_MASK_SHIFT	6
79
74
 
80
75
 #define APDS9960_REG_GCONF_2	0xa3
76
+#define APDS9960_REG_GCONF_2_GGAIN_MASK			0x60
77
+#define APDS9960_REG_GCONF_2_GGAIN_MASK_SHIFT		5
78
+
81
79
 #define APDS9960_REG_GOFFSET_U	0xa4
82
80
 #define APDS9960_REG_GOFFSET_D	0xa5
83
81
 #define APDS9960_REG_GPULSE	0xa6
..
..
@@ -206,7 +204,8 @@
206
204
 	.name = APDS9960_REGMAP_NAME,
207
205
 	.reg_bits = 8,
208
206
 	.val_bits = 8,
209
-	.use_single_rw = 1,
207
+	.use_single_read = true,
208
+	.use_single_write = true,
210
209
 
211
210
 	.volatile_table = &apds9960_volatile_table,
212
211
 	.precious_table = &apds9960_precious_table,
..
..
@@ -396,9 +395,9 @@
396
395
 			}
397
396
 
398
397
 			ret = regmap_update_bits(data->regmap,
399
-				APDS9960_REG_CONFIG_2,
400
-				APDS9960_REG_CONFIG_2_GGAIN_MASK,
401
-				idx << APDS9960_REG_CONFIG_2_GGAIN_MASK_SHIFT);
398
+				APDS9960_REG_GCONF_2,
399
+				APDS9960_REG_GCONF_2_GGAIN_MASK,
400
+				idx << APDS9960_REG_GCONF_2_GGAIN_MASK_SHIFT);
402
401
 			if (!ret)
403
402
 				data->pxs_gain = idx;
404
403
 			mutex_unlock(&data->lock);
..
..
@@ -1002,7 +1001,6 @@
1002
1001
 
1003
1002
 	iio_device_attach_buffer(indio_dev, buffer);
1004
1003
 
1005
-	indio_dev->dev.parent = &client->dev;
1006
1004
 	indio_dev->info = &apds9960_info;
1007
1005
 	indio_dev->name = APDS9960_DRV_NAME;
1008
1006
 	indio_dev->channels = apds9960_channels;
..
..
@@ -1134,5 +1132,5 @@
1134
1132
 module_i2c_driver(apds9960_driver);
1135
1133
 
1136
1134
 MODULE_AUTHOR("Matt Ranostay <matt.ranostay@konsulko.com>");
1137
-MODULE_DESCRIPTION("ADPS9960 Gesture/RGB/ALS/Proximity sensor");
1135
+MODULE_DESCRIPTION("APDS9960 Gesture/RGB/ALS/Proximity sensor");
1138
1136
 MODULE_LICENSE("GPL");