From 66ce88d9e5fbb6e6820643b11808a6df46b17cad Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 7 May 2019 19:13:42 -0500
Subject: Remove unused mmc pins, and put in PD14-PD20 in mtrv1

---
 .../mtrv1/linux-4.9-mtrv1-device-tree.patch        | 40 ++++++++++++++--------
 1 file changed, 25 insertions(+), 15 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 af85bff..0fd80fa 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 -aNru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/boot/dts/mtrv1.dts
+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-03-04 18:19:46.350278837 -0600
-@@ -0,0 +1,259 @@
++++ linux-4.9.87/arch/arm/boot/dts/mtrv1.dts	2019-05-07 19:03:19.378605555 -0500
+@@ -0,0 +1,269 @@
 +/*
 + * DTS file for Multi-Tech Systems MTRv1 Hardware
 + *
@@ -50,13 +50,6 @@ diff -aNru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +
 +
 +			pinctrl@fffff400 {
-+				mmc0 {
-+					pinctrl_board_mmc0: mmc0-board {
-+						atmel,pins =
-+							<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;  /* PD15 gpio CD pin pull up and deglitch */
-+					};
-+				};
-+
 +				nand {
 +					pinctrl_nand: nand-0 {
 +						atmel,pins =
@@ -75,12 +68,27 @@ diff -aNru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +							AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP    /* PD12 periph A Data bit 6 */
 +							AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;  /* PD13 periph A Data bit 7 */
 +					};
-+
-+                                	/delete-node/ nand_16bits-0;
++					/delete-node/ nand_16bits-0;
 +				};
 +
-+                                /delete-node/ spi1;
-+
++				/delete-node/ spi1;
++				/delete-node/ mmc0;
++				mts-io {
++				    pinctrl_mts_io_out: mts_io-0 {
++					atmel,pins =
++						<AT91_PIOD 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP    /* PD14 WiFi BT reset */
++						AT91_PIOD 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP     /* PD15 GNSS reset */
++						AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_PULL_UP     /* PD16 Secure reset */
++						AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_PULL_UP     /* PD17 MTQ reset */
++						AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP     /* PD18 USB Hub reset */
++						AT91_PIOD 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;   /* PD19 GNSS Int */
++					   output-high;
++				    };
++				    pinctrl_mts_io_in: mts_io-1 {
++					atmel,pins =
++					    <AT91_PIOD 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;   /* PD20 WiFi_BT_LPMode Input */
++				    };
++                                };
 +				/*
 +				 * Pin A23 will be left floating when the power goes off on the radio.
 +				 * We need to pull it down to ensure it is low during radio power-off.
@@ -120,6 +128,7 @@ diff -aNru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +     };
 +
 +			/delete-node/ serial@f801c000;
++			/delete-node/ mmc@f0008000;
 +
 +			uart0: serial@f8040000 {
 +				status = "okay";
@@ -258,7 +267,8 @@ diff -aNru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +            status = "okay";
 +            compatible = "mts,mts-io";
 +            pinctrl-names = "default";
-+            pinctrl-0 = <&pinctrl_mts_io>;
++            pinctrl-0 = <&pinctrl_mts_io_out>;
++            pinctrl-1 = <&pinctrl_mts_io_in>;
 +        };
 +};
 diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5cm.dtsi linux-4.9.87/arch/arm/boot/dts/at91sam9x5cm.dtsi
-- 
cgit v1.2.3