dma hangs GPS port.

3 files changed, 27 insertions, 46 deletions

diff --git a/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/0001-Add-radio-control-with-pullups.patch b/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/0001-Add-radio-control-with-pullups.patch
deleted file mode 100644
index c2dd44c..0000000
--- a/recipes-kernel/linux/linux-at91-4.9.87/mtrv1/0001-Add-radio-control-with-pullups.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c262385706e1d3a25d6b21b53099e4dea4156861 Mon Sep 17 00:00:00 2001
-From: Mike Nicholson <mike.nicholson@multitech.com>
-Date: Mon, 7 Jan 2019 15:25:52 -0600
-Subject: [PATCH] Add radio control with pullups
-
----
- arch/arm/boot/dts/mtrv1.dts | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/arch/arm/boot/dts/mtrv1.dts b/arch/arm/boot/dts/mtrv1.dts
-index dbd113df..50bac466 100644
---- a/arch/arm/boot/dts/mtrv1.dts
-+++ b/arch/arm/boot/dts/mtrv1.dts
-@@ -86,6 +86,14 @@
- 						atmel,pins = <AT91_PIOB 18 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PB18 multidrive, conflicts with led */
- 					};
- 				};
-+
-+        radio_control {
-+          pinctrl_radio_control: radio_control-0 {
-+            atmel,pins =
-+							<AT91_PIOA 21 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP  /* PA22 GPIO pull-up radio-power */
-+							AT91_PIOA 22 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PA22 GPIO pull-up radio-reset */
-+          };
-+        };
- 			};
- 
- 			rtc@fffffeb0 {
--- 
-2.19.2
-
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 25708dc..70df542 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 linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/boot/dts/mtrv1.dts
 --- linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts	1969-12-31 18:00:00.000000000 -0600
-+++ linux-4.9.87/arch/arm/boot/dts/mtrv1.dts	2019-01-03 15:17:51.799576663 -0600
-@@ -0,0 +1,227 @@
++++ linux-4.9.87/arch/arm/boot/dts/mtrv1.dts	2019-01-24 01:33:27.883326147 -0600
+@@ -0,0 +1,250 @@
 +/*
 + * DTS file for Multi-Tech Systems MTRv1 Hardware
 + *
@@ -17,6 +17,9 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +/ {
 +	model = "Multi-Tech Systems MTR";
 +	compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
++	aliases {
++		serial1 = &uart0;
++	};	
 +
 +	chosen {
 +		bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2";
@@ -90,6 +93,14 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +						atmel,pins = <AT91_PIOB 18 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PB18 multidrive, conflicts with led */
 +					};
 +				};
++
++				radio_control {
++					pinctrl_radio_control: radio_control-0 {
++						atmel,pins =
++							<AT91_PIOA 21 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP  /* PA22 GPIO pull-up radio-power */
++							AT91_PIOA 22 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PA22 GPIO pull-up radio-reset */
++						};
++				};
 +			};
 +
 +			rtc@fffffeb0 {
@@ -100,9 +111,21 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +				status = "okay";
 +			};
 +
++			/delete-node/ serial@f801c000;
++			/*
++			 * atmel,use-dma causes the port to hang.
++			 * atmel,use-dma is used for UARTS in
++			 * the following files:
++			 *    at91-sama5d4_xplained_pda7b.dts
++			 *    at91-sama5d2_xplained_common.dtsi
++			 *    at91sam9260.dtsi
++			 */
 +			uart0: serial@f8040000 {
 +				status = "okay";
++				/delete-property/ atmel,use-dma-rx;
++				/delete-property/ atmel,use-dma-tx;
 +			};
++
 +			usb2: gadget@f803c000 {
 +				atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
 +				status = "okay";
@@ -289,8 +312,8 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5cm.dtsi linux-4.9.87/ar
 -
  };
 diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi linux-4.9.87/arch/arm/boot/dts/at91sam9x5ek.dtsi
---- linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi	2019-01-03 15:21:25.339570341 -0600
-+++ linux-4.9.87/arch/arm/boot/dts/at91sam9x5ek.dtsi	2019-01-03 15:17:51.911576659 -0600
+--- linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi	2018-03-27 11:05:05.000000000 -0500
++++ linux-4.9.87/arch/arm/boot/dts/at91sam9x5ek.dtsi	2019-01-23 19:14:23.443999491 -0600
 @@ -25,23 +25,11 @@
  					&pinctrl_mmc0_slot0_clk_cmd_dat0
  					&pinctrl_mmc0_slot0_dat1_3>;
@@ -317,15 +340,6 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi linux-4.9.87/ar
  				};
  			};
  
-@@ -49,7 +37,7 @@
- 				status = "okay";
- 			};
- 
--			usart0: serial@f801c000 {
-+			uart0: serial@f8040000 {
- 				atmel,use-dma-rx;
- 				atmel,use-dma-tx;
- 				status = "okay";
 @@ -58,25 +46,12 @@
  			usb2: gadget@f803c000 {
  				pinctrl-names = "default";
@@ -407,7 +421,6 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi linux-4.9.87/ar
 -		atmel,audio-codec = <&wm8731>;
 -	};
  };
-
 diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/Makefile linux-4.9.87/arch/arm/boot/dts/Makefile
 --- linux-4.9.87.orig/arch/arm/boot/dts/Makefile	2019-01-03 15:21:25.339570341 -0600
 +++ linux-4.9.87/arch/arm/boot/dts/Makefile	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 2aaefca..dab6acd 100644
--- a/recipes-kernel/linux/linux-at91_4.9.87.bb
+++ b/recipes-kernel/linux/linux-at91_4.9.87.bb
@@ -58,7 +58,6 @@ SRC_URI_append_mtrv1 = "\
             file://linux-4.9-mtrv1-device-tree.patch \
             file://950-0090-OF-DT-Overlay-configfs-interface.patch \
             file://linux-4.9-spidev_squack.patch \
-            file://0001-Add-radio-control-with-pullups.patch \
             "
 
 DTB_APPEND_mtcdt = "mtcdt"