mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/media/rc/mtk-cir.c
..
..
@@ -1,17 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Driver for Mediatek IR Receiver Controller
3
4
  *
4
5
  * Copyright (C) 2017 Sean Wang <sean.wang@mediatek.com>
5
- *
6
- * This program is free software; you can redistribute it and/or
7
- * modify it under the terms of the GNU General Public License as
8
- * published by the Free Software Foundation; either version 2 of
9
- * the License, or (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
6
  */
16
7
 
17
8
 #include <linux/clk.h>
..
..
@@ -61,8 +52,8 @@
61
52
 #define MTK_IR_END(v, p)	  ((v) == MTK_MAX_SAMPLES && (p) == 0)
62
53
 /* Number of registers to record the pulse width */
63
54
 #define MTK_CHKDATA_SZ		  17
64
-/* Sample period in ns */
65
-#define MTK_IR_SAMPLE		  46000
55
+/* Sample period in us */
56
+#define MTK_IR_SAMPLE		  46
66
57
 
67
58
 enum mtk_fields {
68
59
 	/* Register to setting software sampling period */
..
..
@@ -160,15 +151,12 @@
160
151
 {
161
152
 	u32 val;
162
153
 
163
-	/* Period of raw software sampling in ns */
164
-	val = DIV_ROUND_CLOSEST(1000000000ul,
165
-				clk_get_rate(ir->bus) / ir->data->div);
166
-
167
154
 	/*
168
155
 	 * Period for software decoder used in the
169
156
 	 * unit of raw software sampling
170
157
 	 */
171
-	val = DIV_ROUND_CLOSEST(MTK_IR_SAMPLE, val);
158
+	val = DIV_ROUND_CLOSEST(clk_get_rate(ir->bus),
159
+				USEC_PER_SEC * ir->data->div / MTK_IR_SAMPLE);
172
160
 
173
161
 	dev_dbg(ir->dev, "@pwm clk  = \t%lu\n",
174
162
 		clk_get_rate(ir->bus) / ir->data->div);
..
..
@@ -217,7 +205,7 @@
217
205
 	struct mtk_ir *ir = dev_id;
218
206
 	u8  wid = 0;
219
207
 	u32 i, j, val;
220
-	DEFINE_IR_RAW_EVENT(rawir);
208
+	struct ir_raw_event rawir = {};
221
209
 
222
210
 	/*
223
211
 	 * Reset decoder state machine explicitly is required
..
..
@@ -334,10 +322,8 @@
334
322
 
335
323
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
336
324
 	ir->base = devm_ioremap_resource(dev, res);
337
-	if (IS_ERR(ir->base)) {
338
-		dev_err(dev, "failed to map registers\n");
325
+	if (IS_ERR(ir->base))
339
326
 		return PTR_ERR(ir->base);
340
-	}
341
327
 
342
328
 	ir->rc = devm_rc_allocate_device(dev, RC_DRIVER_IR_RAW);
343
329
 	if (!ir->rc) {
..
..
@@ -356,7 +342,7 @@
356
342
 	ir->rc->map_name = map_name ?: RC_MAP_EMPTY;
357
343
 	ir->rc->dev.parent = dev;
358
344
 	ir->rc->driver_name = MTK_IR_DEV;
359
-	ir->rc->allowed_protocols = RC_PROTO_BIT_ALL;
345
+	ir->rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
360
346
 	ir->rc->rx_resolution = MTK_IR_SAMPLE;
361
347
 	ir->rc->timeout = MTK_MAX_SAMPLES * (MTK_IR_SAMPLE + 1);
362
348
 
..
..
@@ -369,10 +355,8 @@
369
355
 	platform_set_drvdata(pdev, ir);
370
356
 
371
357
 	ir->irq = platform_get_irq(pdev, 0);
372
-	if (ir->irq < 0) {
373
-		dev_err(dev, "no irq resource\n");
358
+	if (ir->irq < 0)
374
359
 		return -ENODEV;
375
-	}
376
360
 
377
361
 	if (clk_prepare_enable(ir->clk)) {
378
362
 		dev_err(dev, "try to enable ir_clk failed\n");
..
..
@@ -425,7 +409,7 @@
425
409
 	mtk_irq_enable(ir, MTK_IRINT_EN);
426
410
 
427
411
 	dev_info(dev, "Initialized MT7623 IR driver, sample period = %dus\n",
428
-		 DIV_ROUND_CLOSEST(MTK_IR_SAMPLE, 1000));
412
+		 MTK_IR_SAMPLE);
429
413
 
430
414
 	return 0;
431
415