Remove unused i2c because it renumbers the i2c bus (fixes i2c driver path compatibility)

1 files changed, 83 insertions, 19 deletions

diff --git a/recipes-kernel/linux/linux-at91-4.9/mtcdt/linux-4.9-mtcdt-device-tree.patch b/recipes-kernel/linux/linux-at91-4.9/mtcdt/linux-4.9-mtcdt-device-tree.patch
index 226e927..1b60f2a 100644
--- a/recipes-kernel/linux/linux-at91-4.9/mtcdt/linux-4.9-mtcdt-device-tree.patch
+++ b/recipes-kernel/linux/linux-at91-4.9/mtcdt/linux-4.9-mtcdt-device-tree.patch
@@ -2,8 +2,8 @@ Index: linux-4.9/arch/arm/boot/dts/mtcdt.dts
 ===================================================================
 diff -aNru linux-4.9-orig/arch/arm/boot/dts/mtcdt.dts linux-4.9/arch/arm/boot/dts/mtcdt.dts
 --- linux-4.9-orig/arch/arm/boot/dts/mtcdt.dts	1969-12-31 18:00:00.000000000 -0600
-+++ linux-4.9/arch/arm/boot/dts/mtcdt.dts	2018-11-27 16:30:08.832348813 -0600
-@@ -0,0 +1,259 @@
++++ linux-4.9/arch/arm/boot/dts/mtcdt.dts	2018-11-28 18:45:28.113550592 -0600
+@@ -0,0 +1,253 @@
 +/*
 + * DTS file for Multi-Tech Systems MTCDT Hardware
 + */
@@ -256,18 +256,13 @@ diff -aNru linux-4.9-orig/arch/arm/boot/dts/mtcdt.dts linux-4.9/arch/arm/boot/dt
 +            status = "okay";
 +	};
 +    };
-+
-+    /* Remove unused nodes */
-+    /delete-node/ i2c@f8010000;
-+    /delete-node/ i2c@f8014000;
-+    /delete-node/ i2c@f8018000;
-+    /delete-node/ i2c-gpio-2;
 +};
-Index: linux-3.12.27/arch/arm/boot/dts/at91sam9x5cm.dtsi
+Index: linux-4.9/arch/arm/boot/dts/at91sam9x5cm.dtsi
 ===================================================================
---- linux-3.12.27.orig/arch/arm/boot/dts/at91sam9x5cm.dtsi	2014-08-26 07:12:26.000000000 -0500
-+++ linux-3.12.27/arch/arm/boot/dts/at91sam9x5cm.dtsi	2015-01-13 13:58:20.766078428 -0600
-@@ -40,48 +40,8 @@
+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>;
@@ -317,15 +312,17 @@ Index: linux-3.12.27/arch/arm/boot/dts/at91sam9x5cm.dtsi
  		};
  	};
  
-@@ -93,5 +53,4 @@
+@@ -96,5 +56,4 @@
  		pinctrl-0 = <&pinctrl_1wire_cm>;
  		status = "okay";
  	};
 -
  };
-diff -aNru 4.9+gitAUTOINC+29796588eb.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi 4.9+gitAUTOINC+29796588eb/arch/arm/boot/dts/at91sam9x5ek.dtsi
---- 4.9+gitAUTOINC+29796588eb.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi	2018-10-22 15:41:00.544625331 -0500
-+++ 4.9+gitAUTOINC+29796588eb/arch/arm/boot/dts/at91sam9x5ek.dtsi	2018-10-23 09:28:17.902729520 -0500
+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>;
@@ -442,9 +439,9 @@ diff -aNru 4.9+gitAUTOINC+29796588eb.orig/arch/arm/boot/dts/at91sam9x5ek.dtsi 4.
 -		atmel,audio-codec = <&wm8731>;
 -	};
  };
-diff -Naru 4.9+gitAUTOINC+29796588eb.orig/arch/arm/boot/dts/Makefile 4.9+gitAUTOINC+29796588eb/arch/arm/boot/dts/Makefile
---- 4.9+gitAUTOINC+29796588eb.orig/arch/arm/boot/dts/Makefile	2018-10-23 09:55:41.330680867 -0500
-+++ 4.9+gitAUTOINC+29796588eb/arch/arm/boot/dts/Makefile	2018-10-23 10:02:32.390668697 -0500
+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 \
@@ -455,3 +452,70 @@ diff -Naru 4.9+gitAUTOINC+29796588eb.orig/arch/arm/boot/dts/Makefile 4.9+gitAUTO
  dtb-$(CONFIG_SOC_SAM_V7) += \
  	at91-kizbox2.dtb \
  	at91-sama5d2_ptc_ek.dtb \
+Index: linux-4.9/arch/arm/boot/dts/at91sam9x5.dtsi
+===================================================================
+diff -aNru linux-4.9-orig/arch/arm/boot/dts/at91sam9x5.dtsi linux-4.9/arch/arm/boot/dts/at91sam9x5.dtsi
+--- linux-4.9-orig/arch/arm/boot/dts/at91sam9x5.dtsi	2018-11-28 17:20:48.149700984 -0600
++++ linux-4.9/arch/arm/boot/dts/at91sam9x5.dtsi	2018-11-28 17:27:35.665688919 -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";
\ No newline at end of file