update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/i2c/smiapp/smiapp-reg.h
..
..
@@ -1,3 +1,4 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * drivers/media/i2c/smiapp/smiapp-reg.h
3
4
  *
..
..
@@ -5,39 +6,38 @@
5
6
  *
6
7
  * Copyright (C) 2011--2012 Nokia Corporation
7
8
  * Contact: Sakari Ailus <sakari.ailus@iki.fi>
8
- *
9
- * This program is free software; you can redistribute it and/or
10
- * modify it under the terms of the GNU General Public License
11
- * version 2 as published by the Free Software Foundation.
12
- *
13
- * This program is distributed in the hope that it will be useful, but
14
- * WITHOUT ANY WARRANTY; without even the implied warranty of
15
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
16
- * General Public License for more details.
17
9
  */
18
10
 
19
11
 #ifndef __SMIAPP_REG_H_
20
12
 #define __SMIAPP_REG_H_
21
13
 
14
+#include <linux/bits.h>
15
+
22
16
 #include "smiapp-reg-defs.h"
23
17
 
24
18
 /* Bits for above register */
25
-#define SMIAPP_IMAGE_ORIENTATION_HFLIP		(1 << 0)
26
-#define SMIAPP_IMAGE_ORIENTATION_VFLIP		(1 << 1)
19
+#define SMIAPP_IMAGE_ORIENTATION_HFLIP			BIT(0)
20
+#define SMIAPP_IMAGE_ORIENTATION_VFLIP			BIT(1)
27
21
 
28
-#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_EN		(1 << 0)
29
-#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_RD_EN		(0 << 1)
30
-#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_WR_EN		(1 << 1)
31
-#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_ERR_CLEAR	(1 << 2)
32
-#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY	(1 << 0)
33
-#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_WR_READY	(1 << 1)
34
-#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_EDATA		(1 << 2)
35
-#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_EUSAGE		(1 << 3)
22
+#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_EN		BIT(0)
23
+#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_WR_EN		BIT(1)
24
+#define SMIAPP_DATA_TRANSFER_IF_1_CTRL_ERR_CLEAR	BIT(2)
25
+#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY	BIT(0)
26
+#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_WR_READY	BIT(1)
27
+#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_EDATA		BIT(2)
28
+#define SMIAPP_DATA_TRANSFER_IF_1_STATUS_EUSAGE		BIT(3)
36
29
 
37
-#define SMIAPP_SOFTWARE_RESET				(1 << 0)
30
+#define SMIAPP_DATA_TRANSFER_IF_CAPABILITY_SUPPORTED	BIT(0)
31
+#define SMIAPP_DATA_TRANSFER_IF_CAPABILITY_POLL		BIT(2)
38
32
 
39
-#define SMIAPP_FLASH_MODE_CAPABILITY_SINGLE_STROBE	(1 << 0)
40
-#define SMIAPP_FLASH_MODE_CAPABILITY_MULTIPLE_STROBE	(1 << 1)
33
+#define SMIAPP_SOFTWARE_RESET				BIT(0)
34
+
35
+#define SMIAPP_FLASH_MODE_CAPABILITY_SINGLE_STROBE	BIT(0)
36
+#define SMIAPP_FLASH_MODE_CAPABILITY_MULTIPLE_STROBE	BIT(1)
37
+
38
+#define SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_CLOCK	0
39
+#define SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE	1
40
+#define SMIAPP_CSI_SIGNALLING_MODE_CSI2			2
41
41
 
42
42
 #define SMIAPP_DPHY_CTRL_AUTOMATIC			0
43
43
 /* DPHY control based on REQUESTED_LINK_BIT_RATE_MBPS */