blob: 940476a13a3934dd52abcb2ed5c653d9726b4f5d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From dbef03b4e18e548eeeaf62133af3591e4cc1ce95 Mon Sep 17 00:00:00 2001
Message-Id: <dbef03b4e18e548eeeaf62133af3591e4cc1ce95.1531317141.git.marcel.ziswiler@toradex.com>
In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Fri, 22 Jun 2018 10:23:41 +0200
Subject: [PATCH 23/33] apalis-tk1: mfd: k20: update api header for fw version
1.1 support
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
include/linux/mfd/apalis-tk1-k20-api.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/mfd/apalis-tk1-k20-api.h b/include/linux/mfd/apalis-tk1-k20-api.h
index 85bbf9f28ca4..199b433c3d96 100644
--- a/include/linux/mfd/apalis-tk1-k20-api.h
+++ b/include/linux/mfd/apalis-tk1-k20-api.h
@@ -48,7 +48,7 @@
#define APALIS_TK1_K20_CAN_DEV_OFFSET(x) (x ? APALIS_TK1_K20_CAN_OFFSET : 0)
/* 0x30-0x3F Reserved */
-/* 0x40-0x62 CAN1 registers same layout as CAN0*/
+/* 0x40-0x62 CAN1 registers same layout as CAN0 */
/* 0x63-0x6F Reserved */
/* ADC Registers */
@@ -104,7 +104,8 @@
#define APALIS_TK1_K20_TSC_IRQ 4
#define APALIS_TK1_K20_GPIO_IRQ 5
-#define APALIS_TK1_K20_FW_VER 0x10
+#define APALIS_TK1_K20_FW_VER 0x11
+#define APALIS_TK1_K20_TESTER_FW_VER 0xFE
#define FW_MINOR (APALIS_TK1_K20_FW_VER & 0x0F)
#define FW_MAJOR ((APALIS_TK1_K20_FW_VER & 0xF0) >> 4)
@@ -112,7 +113,6 @@
#define TK1_K20_SENTINEL 0x55
#define TK1_K20_INVAL 0xAA
-#define APALIS_TK1_K20_NUMREGS 0x3f
#define APALIS_TK1_K20_IRQ_REG_CNT 1
#define APALIS_TK1_K20_IRQ_PER_REG 8
--
2.14.4
|