Device Tree patch with working EEPROM section

1 files changed, 88 insertions, 38 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 fc5cd43..25708dc 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,9 +1,7 @@
-Index: linux-4.9/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	2018-12-19 17:17:42.819991587 -0600
-@@ -0,0 +1,237 @@
++++ linux-4.9.87/arch/arm/boot/dts/mtrv1.dts	2019-01-03 15:17:51.799576663 -0600
+@@ -0,0 +1,227 @@
 +/*
 + * DTS file for Multi-Tech Systems MTRv1 Hardware
 + *
@@ -98,17 +96,6 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +				status = "okay";
 +			};
 +
-+			i2c0: i2c@f8010000 {
-+				compatible = "i2c-gpio";
-+				status = "okay";
-+
-+				id_eeprom@56 {
-+					compatible = "atmel,24c04";
-+					reg = <0x56>;
-+					pagesize = <16>;
-+				};
-+			};
-+
 +			dbgu: serial@fffff200 {
 +				status = "okay";
 +			};
@@ -222,6 +209,17 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +		};
 +	};
 +
++        i2c-gpio-0 {
++                status = "okay";
++
++                id_eeprom@56 {
++                        compatible = "atmel,24c04";
++                        reg = <0x56>;
++                        pagesize = <16>;
++                        status = "okay";
++                };
++        };
++
 +	1wire_cm {
 +		compatible = "w1-gpio";
 +		gpios = <&pioB 18 GPIO_ACTIVE_HIGH>;
@@ -230,22 +228,10 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtrv1.dts linux-4.9.87/arch/arm/b
 +		pinctrl-0 = <&pinctrl_1wire_cm>;
 +		status = "okay";
 +	};
-+
-+	i2c@0 {
-+		status = "okay";
-+
-+		id_eeprom@56 {
-+			compatible = "atmel,24c04";
-+			reg = <0x56>;
-+			pagesize = <16>;
-+		};
-+	};
 +};
-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
+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
 @@ -43,48 +43,8 @@
  			atmel,has-pmecc;	/* Enable PMECC */
  			atmel,pmecc-cap = <2>;
@@ -302,11 +288,9 @@ diff -aNru linux-4.9-orig/arch/arm/boot/dts/at91sam9x5cm.dtsi linux-4.9/arch/arm
  	};
 -
  };
-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
+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
 @@ -25,23 +25,11 @@
  					&pinctrl_mmc0_slot0_clk_cmd_dat0
  					&pinctrl_mmc0_slot0_dat1_3>;
@@ -423,9 +407,10 @@ diff -aNru linux-4.9-orig/arch/arm/boot/dts/at91sam9x5ek.dtsi linux-4.9/arch/arm
 -		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
+
+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
 @@ -43,7 +43,8 @@
  	at91sam9g25ek.dtb \
  	at91sam9g35ek.dtb \
@@ -436,3 +421,68 @@ diff -aNru linux-4.9-orig/arch/arm/boot/dts/Makefile linux-4.9/arch/arm/boot/dts
  dtb-$(CONFIG_SOC_SAM_V7) += \
  	at91-kizbox2.dtb \
  	at91-sama5d2_ptc_ek.dtb \
+diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5.dtsi linux-4.9.87/arch/arm/boot/dts/at91sam9x5.dtsi
+--- linux-4.9.87.orig/arch/arm/boot/dts/at91sam9x5.dtsi	2019-01-03 15:21:25.339570341 -0600
++++ linux-4.9.87/arch/arm/boot/dts/at91sam9x5.dtsi	2019-01-03 15:17:51.911576659 -0600
+@@ -32,9 +32,6 @@
+ 		gpio3 = &pioD;
+ 		tcb0 = &tcb0;
+ 		tcb1 = &tcb1;
+-		i2c0 = &i2c0;
+-		i2c1 = &i2c1;
+-		i2c2 = &i2c2;
+ 		ssc0 = &ssc0;
+ 		pwm0 = &pwm0;
+ 	};
+@@ -963,50 +960,7 @@
+ 				status = "disabled";
+ 			};
+ 
+-			i2c0: i2c@f8010000 {
+-				compatible = "atmel,at91sam9x5-i2c";
+-				reg = <0xf8010000 0x100>;
+-				interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;
+-				dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(7)>,
+-				       <&dma0 1 AT91_DMA_CFG_PER_ID(8)>;
+-				dma-names = "tx", "rx";
+-				#address-cells = <1>;
+-				#size-cells = <0>;
+-				pinctrl-names = "default";
+-				pinctrl-0 = <&pinctrl_i2c0>;
+-				clocks = <&twi0_clk>;
+-				status = "disabled";
+-			};
+-
+-			i2c1: i2c@f8014000 {
+-				compatible = "atmel,at91sam9x5-i2c";
+-				reg = <0xf8014000 0x100>;
+-				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;
+-				dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(5)>,
+-				       <&dma1 1 AT91_DMA_CFG_PER_ID(6)>;
+-				dma-names = "tx", "rx";
+-				#address-cells = <1>;
+-				#size-cells = <0>;
+-				pinctrl-names = "default";
+-				pinctrl-0 = <&pinctrl_i2c1>;
+-				clocks = <&twi1_clk>;
+-				status = "disabled";
+-			};
+-
+-			i2c2: i2c@f8018000 {
+-				compatible = "atmel,at91sam9x5-i2c";
+-				reg = <0xf8018000 0x100>;
+-				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;
+-				dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(9)>,
+-				       <&dma0 1 AT91_DMA_CFG_PER_ID(10)>;
+-				dma-names = "tx", "rx";
+-				#address-cells = <1>;
+-				#size-cells = <0>;
+-				pinctrl-names = "default";
+-				pinctrl-0 = <&pinctrl_i2c2>;
+-				clocks = <&twi2_clk>;
+-				status = "disabled";
+-			};
++			/* /delete_node/ command does not work. */
+ 
+ 			uart0: serial@f8040000 {
+ 				compatible = "atmel,at91sam9260-usart";