summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0027-apalis-tk1-mfd-k20-update-api-header-for-fw-version-.patch48
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline_4.14.bb1
2 files changed, 49 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0027-apalis-tk1-mfd-k20-update-api-header-for-fw-version-.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0027-apalis-tk1-mfd-k20-update-api-header-for-fw-version-.patch
new file mode 100644
index 0000000..a372021
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0027-apalis-tk1-mfd-k20-update-api-header-for-fw-version-.patch
@@ -0,0 +1,48 @@
+From 6f34f7130c51b54683944f27b952e520b6ceba76 Mon Sep 17 00:00:00 2001
+Message-Id: <6f34f7130c51b54683944f27b952e520b6ceba76.1529656015.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <cdb0b7ee65695cd32950189e7deecb936400561e.1529656015.git.marcel.ziswiler@toradex.com>
+References: <cdb0b7ee65695cd32950189e7deecb936400561e.1529656015.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Fri, 22 Jun 2018 10:23:41 +0200
+Subject: [PATCH 27/27] 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
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
index b625096..7cf4420 100644
--- a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
+++ b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
@@ -39,6 +39,7 @@ GENERIC_PATCHES = " \
file://0021-apalis-t30-tk1-mainline-igb-avoid-nvm-checksum-failu.patch \
file://0022-apalis_t30-fix-can2.patch \
file://0023-mfd-as3722-disable-auto-power-on-when-AC-OK.patch \
+ file://0027-apalis-tk1-mfd-k20-update-api-header-for-fw-version-.patch \
"
MACHINE_PATCHES = " \
"