Fix partition table in device tree

1 files changed, 200 insertions, 15 deletions

diff --git a/recipes-kernel/linux/linux-at91-4.9/mtrv1/linux-4.9-mtrv1-device-tree.patch b/recipes-kernel/linux/linux-at91-4.9/mtrv1/linux-4.9-mtrv1-device-tree.patch
index 0f048a5..425c0f3 100644
--- a/recipes-kernel/linux/linux-at91-4.9/mtrv1/linux-4.9-mtrv1-device-tree.patch
+++ b/recipes-kernel/linux/linux-at91-4.9/mtrv1/linux-4.9-mtrv1-device-tree.patch
@@ -1,20 +1,9 @@
-diff -aNru linux-4.9-orig/arch/arm/boot/dts/Makefile linux-4.9/arch/arm/boot/dts/Makefile
---- linux-4.9-orig/arch/arm/boot/dts/Makefile	2018-11-28 17:48:26.197651897 -0600
-+++ linux-4.9/arch/arm/boot/dts/Makefile	2018-11-28 17:49:26.441650114 -0600
-@@ -43,7 +43,8 @@
- 	at91sam9g25ek.dtb \
- 	at91sam9g35ek.dtb \
- 	at91sam9x25ek.dtb \
--	at91sam9x35ek.dtb
-+	at91sam9x35ek.dtb \
-+	mtrv1.dtb
- dtb-$(CONFIG_SOC_SAM_V7) += \
- 	at91-kizbox2.dtb \
- 	at91-sama5d2_ptc_ek.dtb \
+Index: linux-4.9/arch/arm/boot/dts/mtcdt.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	2018-12-17 18:33:03.880973445 -0600
-@@ -0,0 +1,241 @@
++++ linux-4.9.87/arch/arm/boot/dts/mtrv1.dts	2018-12-19 12:09:29.828539068 -0600
+@@ -0,0 +1,242 @@
 +/*
 + * DTS file for Multi-Tech Systems MTRv1 Hardware
 + *
@@ -25,6 +14,7 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +
 +/dts-v1/;
 +#include "at91sam9g25.dtsi"
++#include "at91sam9x5ek.dtsi"
 +
 +/ {
 +	model = "Multi-Tech Systems MTR";
@@ -256,3 +246,198 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +		};
 +	};
 +};
+Index: linux-4.9/arch/arm/boot/dts/at91sam9x5cm.dtsi
+===================================================================
+diff -aNru linux-4.9-orig/arch/arm/boot/dts/at91sam9x5cm.dtsi linux-4.9/arch/arm/boot/dts/at91sam9x5cm.dtsi
+--- linux-4.9-orig/arch/arm/boot/dts/at91sam9x5cm.dtsi	2018-11-28 18:38:25.509563104 -0600
++++ linux-4.9/arch/arm/boot/dts/at91sam9x5cm.dtsi	2018-11-28 18:39:16.213561602 -0600
+@@ -43,48 +43,8 @@
+ 			atmel,has-pmecc;	/* Enable PMECC */
+ 			atmel,pmecc-cap = <2>;
+ 			atmel,pmecc-sector-size = <512>;
+-			nand-on-flash-bbt;
++			/* nand-on-flash-bbt; */
+ 			status = "okay";
+-
+-			at91bootstrap@0 {
+-				label = "at91bootstrap";
+-				reg = <0x0 0x40000>;
+-			};
+-
+-			uboot@40000 {
+-				label = "u-boot";
+-				reg = <0x40000 0x80000>;
+-			};
+-
+-			ubootenv@c0000 {
+-				label = "U-Boot Env";
+-				reg = <0xc0000 0x140000>;
+-			};
+-
+-			kernel@200000 {
+-				label = "kernel";
+-				reg = <0x200000 0x600000>;
+-			};
+-
+-			rootfs@800000 {
+-				label = "rootfs";
+-				reg = <0x800000 0x1f800000>;
+-			};
+-		};
+-	};
+-
+-	leds {
+-		compatible = "gpio-leds";
+-
+-		pb18 {
+-			label = "pb18";
+-			gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
+-			linux,default-trigger = "heartbeat";
+-		};
+-
+-		pd21 {
+-			label = "pd21";
+-			gpios = <&pioD 21 GPIO_ACTIVE_HIGH>;
+ 		};
+ 	};
+ 
+@@ -96,5 +56,4 @@
+ 		pinctrl-0 = <&pinctrl_1wire_cm>;
+ 		status = "okay";
+ 	};
+-
+ };
+Index: linux-4.9/arch/arm/boot/dts/at91sam9x5ek.dtsi
+===================================================================
+diff -aNru linux-4.9-orig/arch/arm/boot/dts/at91sam9x5ek.dtsi linux-4.9/arch/arm/boot/dts/at91sam9x5ek.dtsi
+--- linux-4.9-orig/arch/arm/boot/dts/at91sam9x5ek.dtsi	2018-11-28 17:48:21.157652047 -0600
++++ linux-4.9/arch/arm/boot/dts/at91sam9x5ek.dtsi	2018-11-28 17:49:54.793649275 -0600
+@@ -25,23 +25,11 @@
+ 					&pinctrl_mmc0_slot0_clk_cmd_dat0
+ 					&pinctrl_mmc0_slot0_dat1_3>;
+ 				status = "okay";
++                                /* external micro SD slot */
+ 				slot@0 {
+ 					reg = <0>;
+ 					bus-width = <4>;
+-					cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
+-				};
+-			};
+-
+-			mmc1: mmc@f000c000 {
+-				pinctrl-0 = <
+-					&pinctrl_board_mmc1
+-					&pinctrl_mmc1_slot0_clk_cmd_dat0
+-					&pinctrl_mmc1_slot0_dat1_3>;
+-				status = "okay";
+-				slot@0 {
+-					reg = <0>;
+-					bus-width = <4>;
+-					cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
++					cd-gpios = <&pioA 1 GPIO_ACTIVE_HIGH>;
+ 				};
+ 			};
+ 
+@@ -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";
+ 				pinctrl-0 = <&pinctrl_board_usb2>;
+-				atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
+-				status = "okay";
+-			};
+-
+-			i2c0: i2c@f8010000 {
+-				status = "okay";
+-
+-				wm8731: wm8731@1a {
+-					compatible = "wm8731";
+-					reg = <0x1a>;
+-				};
+-			};
+-
+-			adc0: adc@f804c000 {
+-				atmel,adc-ts-wires = <4>;
+-				atmel,adc-ts-pressure-threshold = <10000>;
++				/* atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;		mtcdt: no vbus-gpio */
+ 				status = "okay";
+ 			};
+ 
++                        /* A/D convertor is unusable on Conduit */
++                        
+ 			pinctrl@fffff400 {
+ 				camera_sensor {
+ 					pinctrl_pck0_as_isi_mck: pck0_as_isi_mck-0 {
+@@ -118,7 +93,7 @@
+ 			};
+ 
+ 			spi0: spi@f0000000 {
+-				status = "disabled";	/* conflict with mmc1 */
++                                status = "okay";
+ 				cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
+ 				m25p80@0 {
+ 					compatible = "atmel,at25df321a";
+@@ -131,37 +106,20 @@
+ 				status = "okay";
+ 			};
+ 
+-			ssc0: ssc@f0010000 {
+-				status = "okay";
+-			};
+ 		};
+ 
+ 		usb0: ohci@00600000 {
+ 			status = "okay";
+ 			num-ports = <3>;
+-			atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */
+-					   &pioD 19 GPIO_ACTIVE_LOW
+-					   &pioD 20 GPIO_ACTIVE_LOW
+-					  >;
++			//mtcdt: no vbus-gpio
++			// atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */
++			//		   &pioD 19 GPIO_ACTIVE_LOW
++			//		   &pioD 20 GPIO_ACTIVE_LOW
++			//		  >;
+ 		};
+ 
+ 		usb1: ehci@00700000 {
+ 			status = "okay";
+ 		};
+ 	};
+-
+-	sound {
+-		compatible = "atmel,sam9x5-wm8731-audio";
+-
+-		atmel,model = "wm8731 @ AT91SAM9X5EK";
+-
+-		atmel,audio-routing =
+-			"Headphone Jack", "RHPOUT",
+-			"Headphone Jack", "LHPOUT",
+-			"LLINEIN", "Line In Jack",
+-			"RLINEIN", "Line In Jack";
+-
+-		atmel,ssc-controller = <&ssc0>;
+-		atmel,audio-codec = <&wm8731>;
+-	};
+ };
+diff -aNru linux-4.9-orig/arch/arm/boot/dts/Makefile linux-4.9/arch/arm/boot/dts/Makefile
+--- linux-4.9-orig/arch/arm/boot/dts/Makefile	2018-11-28 17:48:26.197651897 -0600
++++ linux-4.9/arch/arm/boot/dts/Makefile	2018-11-28 17:49:26.441650114 -0600
+@@ -43,7 +43,8 @@
+ 	at91sam9g25ek.dtb \
+ 	at91sam9g35ek.dtb \
+ 	at91sam9x25ek.dtb \
+-	at91sam9x35ek.dtb
++	at91sam9x35ek.dtb \
++	mtrv1.dtb
+ dtb-$(CONFIG_SOC_SAM_V7) += \
+ 	at91-kizbox2.dtb \
+ 	at91-sama5d2_ptc_ek.dtb \
\ No newline at end of file