feyisay07/meta-bsp-imx8mm
1
0
Fork 0
mirror of https://github.com/feyisay07/meta-bsp-imx8mm.git synced 2026-09-24 14:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

linux: minor fixes

Browse Source 
Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
This commit is contained in:
Kirill Kapranov
2020-11-07 18:13:38 +02:00
parent 21b3787d90
commit cc441eef8d
7 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-kernel/linux/compulab/imx8mm.inc
+1
View File
@@ -44,6 +44,7 @@ SRC_URI_append = " \
file://0043-ucm-imx8m-mini-dts-Enable-brcm-bcm4330-bt.patch \
file://0044-ucm-imx8m-mini-config-Set-CONFIG_IMX_SDMA-m-for-brcm.patch \
file://0045-ucm-imx8m-mini-config-Add-brcm-firmware-to-kernel-bu.patch \
file://0046-ucm-imx8m-mini-dts-Update-PCIe-node.patch \
file://0047-rtc-abx80x-Enable-SQW-output.patch \
file://0048-rtc-abx80x-Enable-XT-digital-calibration.patch \
file://0049-rtc-abx80x-Calibrate-RTC.patch \
recipes-kernel/linux/compulab/imx8mm/0033-ucm-imx8m-mini-defconf-dt-Migrate-to-kernel-5.4.24.patch
+9 -11
View File
@@ -1,19 +1,19 @@
From e87e8906f5e2bb5ce640b94d20376e690a25bdbf Mon Sep 17 00:00:00 2001
From a1fdefebd10541be40f69df6b5ba95e05d7a9ace Mon Sep 17 00:00:00 2001
From: Kirill Kapranov <kirill.kapranov@compulab.co.il>
Date: Sat, 8 Aug 2020 21:45:54 +0300
Date: Thu, 5 Nov 2020 18:29:33 +0200
Subject: [PATCH 33/33] ucm-imx8m-mini:defconf+dt:Migrate to kernel 5.4.24
Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
---
arch/arm64/boot/dts/compulab/sb-ucm-imx8-rev2.dtsi | 152 +++-
arch/arm64/boot/dts/compulab/sb-ucm-imx8-rev2.dtsi | 151 +++-
arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dts | 664 +---------------
arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi | 843 +++++++++++++++++++++
arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi | 842 +++++++++++++++++++++
arch/arm64/configs/ucm-imx8m-mini_defconfig | 556 +++++---------
4 files changed, 1166 insertions(+), 1049 deletions(-)
4 files changed, 1164 insertions(+), 1049 deletions(-)
create mode 100644 arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi
diff --git a/arch/arm64/boot/dts/compulab/sb-ucm-imx8-rev2.dtsi b/arch/arm64/boot/dts/compulab/sb-ucm-imx8-rev2.dtsi
index 50622474d7f2..998ed3078904 100644
index 50622474d7f2..2f515e3af428 100644
--- a/arch/arm64/boot/dts/compulab/sb-ucm-imx8-rev2.dtsi
+++ b/arch/arm64/boot/dts/compulab/sb-ucm-imx8-rev2.dtsi
@@ -12,10 +12,61 @@
@@ -79,7 +79,7 @@ index 50622474d7f2..998ed3078904 100644
ext_osc = <1>;
status = "okay";
};
@@ -39,3 +90,102 @@
@@ -39,3 +90,101 @@
pagesize = <16>;
};
};
@@ -181,7 +181,6 @@ index 50622474d7f2..998ed3078904 100644
+ status = "okay";
+ };
+};
+
diff --git a/arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dts b/arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dts
index a72253dd6f8f..54c4d240a4c1 100644
--- a/arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dts
@@ -862,10 +861,10 @@ index a72253dd6f8f..54c4d240a4c1 100644
};
diff --git a/arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi b/arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi
new file mode 100644
index 000000000000..7f0e2ee6be10
index 000000000000..fce8cbeaada9
--- /dev/null
+++ b/arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi
@@ -0,0 +1,843 @@
@@ -0,0 +1,842 @@
+/*
+ * Copyright 2018 CompuLab
+ *
@@ -1708,7 +1707,6 @@ index 000000000000..7f0e2ee6be10
+&cpu_crit0 {
+ temperature = <115000>;
+};
+
diff --git a/arch/arm64/configs/ucm-imx8m-mini_defconfig b/arch/arm64/configs/ucm-imx8m-mini_defconfig
index 4ac6f9cf91ec..b2cf1065805b 100644
--- a/arch/arm64/configs/ucm-imx8m-mini_defconfig
recipes-kernel/linux/compulab/imx8mm/0047-rtc-abx80x-Enable-SQW-output.patch
+1 -1
View File
@@ -130,7 +130,7 @@ index 73830670a41f..d6af690fb594 100644
abx80x_enable_trickle_charger(client, trickle_cfg);
}
+ if (!of_property_read_string(np, "sqw", &sqw_mode_name))
+ if (!of_property_read_string(np, "sqw", &sqw_mode_name))
+ sqw_set(client, sqw_mode_name);
+
err = i2c_smbus_write_byte_data(client, ABX8XX_REG_CD_TIMER_CTL,
recipes-kernel/linux/compulab/imx8mm/0048-rtc-abx80x-Enable-XT-digital-calibration.patch
+7 -7
View File
@@ -1,7 +1,7 @@
From 3da279488005fe893e72f708f8a3593981cedae7 Mon Sep 17 00:00:00 2001
From dfebeaaf2db47bff57da5832813b0d6cb03f36d9 Mon Sep 17 00:00:00 2001
From: Kirill Kapranov <kirill.kapranov@compulab.co.il>
Date: Wed, 26 Aug 2020 15:34:56 +0300
Subject: [PATCH 48/49] rtc:abx80x: Enable XT digital calibration
Date: Thu, 5 Nov 2020 18:41:55 +0200
Subject: [PATCH 48/48] rtc:abx80x: Enable XT digital calibration
Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
---
@@ -9,7 +9,7 @@ Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
1 file changed, 188 insertions(+), 44 deletions(-)
diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c
index d6af690fb594..5ddc6d177d54 100644
index 7f66bdd2868e..7433ff083cec 100644
--- a/drivers/rtc/rtc-abx80x.c
+++ b/drivers/rtc/rtc-abx80x.c
@@ -16,57 +16,64 @@
@@ -116,7 +116,7 @@ index d6af690fb594..5ddc6d177d54 100644
+#define ABX8XX_OSS_OMODE BIT(4)
+#define ABX8XX_REG_OSS_XTCAL_SHIFT 6
+#define ABX8XX_REG_OSS_XTCAL_MASK ((1 << (ABX8XX_REG_OSS_XTCAL_SHIFT)) - 1)
+
+
#define ABX8XX_REG_WDT 0x1b
#define ABX8XX_WDT_WDS BIT(7)
@@ -152,7 +152,7 @@ index d6af690fb594..5ddc6d177d54 100644
+ long Adj;
+ u8 XTCAL, CMDX, OFFSETX;
+
+ Adj = (xt_freq_std - (int)xt_freq) * 16 / 1000;
+ Adj = (xt_freq_std - (int)xt_freq) * 16 / 1000;
+ if (Adj < -320 ) {
+ dev_err(&client->dev, "The XT oscillator is too fast to be adjusted\n");
+ return -ERANGE;
@@ -298,7 +298,7 @@ index d6af690fb594..5ddc6d177d54 100644
+ }
+ }
+
if (!of_property_read_string(np, "sqw", &sqw_mode_name))
if (!of_property_read_string(np, "sqw", &sqw_mode_name))
sqw_set(client, sqw_mode_name);
--
recipes-kernel/linux/compulab/imx8mm/0053-rtc-abx80x-Improve-sqw-generation.patch
+5 -5
View File
@@ -1,7 +1,7 @@
From b935f06b89c32492f0bbbaff5533ca83a81a5fad Mon Sep 17 00:00:00 2001
From 9991cf33ab6ad9de14ba9b7df2f417c524ce778f Mon Sep 17 00:00:00 2001
From: Kirill Kapranov <kirill.kapranov@compulab.co.il>
Date: Sun, 27 Sep 2020 15:29:08 +0300
Subject: [PATCH 53/56] rtc:abx80x: Improve sqw generation
Date: Thu, 5 Nov 2020 18:49:05 +0200
Subject: [PATCH 53/53] rtc:abx80x: Improve sqw generation
Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
---
@@ -9,7 +9,7 @@ Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c
index 5ddc6d177d54..7dba60f94613 100644
index 0bd45a2e4a93..2ba1686fe2a4 100644
--- a/drivers/rtc/rtc-abx80x.c
+++ b/drivers/rtc/rtc-abx80x.c
@@ -633,8 +633,17 @@ static char const *const SQFS[SQFS_COUNT] = { "1_century", "32768_Hz", "8192_Hz"
@@ -44,7 +44,7 @@ index 5ddc6d177d54..7dba60f94613 100644
reg |= idx | ABX8XX_REG_SQW_EN;
@@ -1040,6 +1052,8 @@ static int abx80x_probe(struct i2c_client *client,
if (!of_property_read_string(np, "sqw", &sqw_mode_name))
if (!of_property_read_string(np, "sqw", &sqw_mode_name))
sqw_set(client, sqw_mode_name);
+ else
+ sqw_set(client, "none");
recipes-kernel/linux/compulab/imx8mm/0054-rtc-abx80x-Improve-xt_calibration.patch
+7 -7
View File
@@ -1,7 +1,7 @@
From ca9a1f363c68f6aa5e90c6f79e2043e9719c8af6 Mon Sep 17 00:00:00 2001
From 491034cdbf632e391091e246cb9a3571501b0775 Mon Sep 17 00:00:00 2001
From: Kirill Kapranov <kirill.kapranov@compulab.co.il>
Date: Sun, 27 Sep 2020 15:30:52 +0300
Subject: [PATCH 54/56] rtc:abx80x: Improve xt_calibration
Date: Thu, 5 Nov 2020 18:56:16 +0200
Subject: [PATCH 54/54] rtc:abx80x: Improve xt_calibration
Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
---
@@ -9,7 +9,7 @@ Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c
index 7dba60f94613..2f57adb1f73a 100644
index 2ba1686fe2a4..55df2264700a 100644
--- a/drivers/rtc/rtc-abx80x.c
+++ b/drivers/rtc/rtc-abx80x.c
@@ -106,7 +106,6 @@ struct abx80x_cap {
@@ -45,8 +45,8 @@ index 7dba60f94613..2f57adb1f73a 100644
long Adj;
u8 XTCAL, CMDX, OFFSETX;
- Adj = (xt_freq_std - (int)xt_freq) * 16 / 1000;
+ Adj = (xt_freq_nom - (int)xt_freq) * 16 / 1000;
- Adj = (xt_freq_std - (int)xt_freq) * 16 / 1000;
+ Adj = (xt_freq_nom - (int)xt_freq) * 16 / 1000;
if (Adj < -320 ) {
dev_err(&client->dev, "The XT oscillator is too fast to be adjusted\n");
return -ERANGE;
@@ -114,7 +114,7 @@ index 7dba60f94613..2f57adb1f73a 100644
+ xt_frequency_set(client, xt_freq_nom);
}
if (!of_property_read_string(np, "sqw", &sqw_mode_name))
if (!of_property_read_string(np, "sqw", &sqw_mode_name))
--
2.11.0
recipes-kernel/linux/compulab/imx8mm/0058-arm64-dts-imx8mm-specify-dma-ranges.patch
+10 -11
View File
@@ -1,6 +1,6 @@
From 00cc950794f07be0480ea3b876cc5c9dcfaf0860 Mon Sep 17 00:00:00 2001
From 700a4955dfe29bbd2d3cb4a0484e6bc3a9a134c8 Mon Sep 17 00:00:00 2001
From: Kirill Kapranov <kirill.kapranov@compulab.co.il>
Date: Sun, 4 Oct 2020 20:59:45 +0300
Date: Thu, 5 Nov 2020 17:54:36 +0200
Subject: [PATCH 58/58] arm64: dts: imx8mm: specify dma-ranges
Apply the same dma range limitations as on the i.MX8MQ.
@@ -8,25 +8,24 @@ Original commit: ca04fed4706dfb13cb964be2dc294054ed0efb6b
Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
---
arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi | 5 +++++
1 file changed, 5 insertions(+)
arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi b/arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi
index 9c8db59982a2..7f2ab9535fe6 100644
index 1bf63fb175d7..aff133942cf7 100644
--- a/arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi
+++ b/arch/arm64/boot/dts/compulab/ucm-imx8m-mini.dtsi
@@ -33,6 +33,11 @@
linux,default-trigger = "heartbeat";
@@ -34,6 +34,10 @@
};
};
+
+ soc@0 {
+ dma-ranges = <0x40000000 0x0 0x40000000 0xc0000000>;
+ };
+
//Fake regulator provides WL_REG_ON signal for wireless interface
wlreg_on: wlregon-regulator {
compatible = "regulator-fixed";
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
--
2.11.0