summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2021-09-23 09:05:10 -0500
committerJohn Klug <john.klug@multitech.com>2021-09-23 09:05:49 -0500
commitc7737940836904840af3a37d8021ffb9251f2328 (patch)
tree57d5d3fce0763a3e679a5b1c8c00ab29d7d2ad41
parent2a0f558e2953a0c825c6ad5822ac149e990dada1 (diff)
downloadmeta-multitech-atmel-c7737940836904840af3a37d8021ffb9251f2328.tar.gz
meta-multitech-atmel-c7737940836904840af3a37d8021ffb9251f2328.tar.bz2
meta-multitech-atmel-c7737940836904840af3a37d8021ffb9251f2328.zip
Fix DMA for external serial port on MTRV1-0.4
-rw-r--r--recipes-kernel/linux/linux-at91-4.9.87/mtrv1/linux-4.9-mtrv1-device-tree.patch12
-rw-r--r--recipes-kernel/linux/linux-at91_4.9.87.bb2
2 files changed, 8 insertions, 6 deletions
diff --git a/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/linux-4.9-mtrv1-device-tree.patch b/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/linux-4.9-mtrv1-device-tree.patch
index e84e6ff..cc7ad86 100644
--- a/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/linux-4.9-mtrv1-device-tree.patch
+++ b/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/linux-4.9-mtrv1-device-tree.patch
@@ -1,7 +1,7 @@
diff -Naru orig/arch/arm/boot/dts/mtrv1.dts new/arch/arm/boot/dts/mtrv1.dts
--- orig/arch/arm/boot/dts/mtrv1.dts 1969-12-31 18:00:00.000000000 -0600
-+++ new/arch/arm/boot/dts/mtrv1.dts 2021-09-10 09:30:24.760466509 -0500
-@@ -0,0 +1,296 @@
++++ new/arch/arm/boot/dts/mtrv1.dts 2021-09-23 08:27:46.971030415 -0500
+@@ -0,0 +1,299 @@
+/*
+ * DTS file for Multi-Tech Systems MTRv1 Hardware
+ *
@@ -42,6 +42,7 @@ diff -Naru orig/arch/arm/boot/dts/mtrv1.dts new/arch/arm/boot/dts/mtrv1.dts
+
+ ahb {
+ apb {
++
+ /delete-node/ spi@f0004000;
+ macb0: ethernet@f802c000 {
+ phy-mode = "rmii";
@@ -50,6 +51,9 @@ diff -Naru orig/arch/arm/boot/dts/mtrv1.dts new/arch/arm/boot/dts/mtrv1.dts
+
+
+ pinctrl@fffff400 {
++ usart3 {
++ /delete-node/ usart3_sck-0;
++ };
+ nand {
+ pinctrl_nand: nand-0 {
+ atmel,pins =
@@ -292,13 +296,11 @@ diff -Naru orig/arch/arm/boot/dts/mtrv1.dts new/arch/arm/boot/dts/mtrv1.dts
+
+&usart3 {
+ status = "okay";
-+ atmel,use-dma-rx;
-+ atmel,use-dma-tx;
++ pinctrl-0 = <&pinctrl_usart3 &pinctrl_usart3_rts &pinctrl_usart3_cts>;
+ dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(14)>,
+ <&dma0 1 (AT91_DMA_CFG_PER_ID(15) | AT91_DMA_CFG_FIFOCFG_ASAP)>;
+ dma-names = "tx", "rx";
+};
-
diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5cm.dtsi linux-4.9.87/arch/arm/boot/dts/at91sam9x5cm.dtsi
--- linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5cm.dtsi 2019-01-03 15:21:25.339570341 -0600
+++ linux-4.9.87/arch/arm/boot/dts/at91sam9x5cm.dtsi 2019-01-03 15:17:51.911576659 -0600
diff --git a/recipes-kernel/linux/linux-at91_4.9.87.bb b/recipes-kernel/linux/linux-at91_4.9.87.bb
index 2a630f2..a1cb6a3 100644
--- a/recipes-kernel/linux/linux-at91_4.9.87.bb
+++ b/recipes-kernel/linux/linux-at91_4.9.87.bb
@@ -19,7 +19,7 @@ RDEPENDS_kernel-modules_remove = "kernel-module-softdog"
FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
KERNEL_EXTRA_ARGS ="LOADADDR=0x20008000"
-PR = "r14"
+PR = "r15"
PKGR_kernel-module-i2c-at91 = "${PR}a${EXTENDPRAUTO}"
PKGR_kernel-module-atmel-mci = "${PR}a${EXTENDPRAUTO}"
KERNEL_VERSION = "${PV}"