Remove i2c@1 and replace with i2c-gpio-1 to match Atmel DTSI files

1 files changed, 52 insertions, 71 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 c6d2915..226e927 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
@@ -1,8 +1,9 @@
-Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
+Index: linux-4.9/arch/arm/boot/dts/mtcdt.dts
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.12.27/arch/arm/boot/dts/mtcdt.dts	2016-09-19 15:34:25.111103538 -0500
-@@ -0,0 +1,279 @@
+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 @@
 +/*
 + * DTS file for Multi-Tech Systems MTCDT Hardware
 + */
@@ -11,12 +12,15 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
 +#include "at91sam9g25.dtsi"
 +#include "at91sam9x5ek.dtsi"
 +
++
 +/ {
 +    model = "Multi-Tech Systems MTCDT";
 +    compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
 +
 +    ahb {
 +	apb {
++
++
 +	    macb0: ethernet@f802c000 {
 +		phy-mode = "rmii";
 +		status = "okay";
@@ -76,40 +80,7 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
 +		status = "okay";
 +	    };
 +
-+	    i2c0: i2c@f8010000 {
-+		compatible = "i2c-gpio";
-+		status = "okay";
-+
-+		id_eeprom@56 {
-+		    compatible = "atmel,24c04";
-+		    reg = <0x56>;
-+		    pagesize = <16>;
-+		};
-+		board_temp@48 {
-+		    compatible = "ti,tmp102";
-+		    reg = <0x48>;
-+		    /* tempsensor_alert line running to pin PC19 on processor
-+		       set up an interrupt for this? */
-+		};
-+	    };
-+
-+	    i2c1: i2c@f8014000 {
-+		compatible = "i2c-gpio";
-+		status = "okay";
-+
-+		ap1_eeprom@50 {
-+		    compatible = "atmel,24c04";
-+		    reg = <0x50>;
-+		    pagesize = <16>;
-+		};
-+		ap2_eeprom@52 {
-+		    compatible = "atmel,24c04";
-+		    reg = <0x52>;
-+		    pagesize = <16>;
-+		};
-+	    };
-+
-+	    /* runs to Accessory Port 1 */
++            /* runs to Accessory Port 1 */
 +	    spi0: spi@f0000000 {
 +		status = "okay";
 +		cs-gpios = <&pioA 4 0>, <&pioA 2 0>, <&pioA 3 0>, <&pioA 5 0>;
@@ -218,69 +189,79 @@ Index: linux-3.12.27/arch/arm/boot/dts/mtcdt.dts
 +	};
 +    };
 +
-+	leds {
-+		compatible = "gpio-leds";
++    leds {
++            compatible = "gpio-leds";
 +
-+		pa24 {
-+			label = "led-status";
-+			gpios = <&pioA 24 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "default-on";
-+		};
-+		pa25 {
-+			label = "led-a";
-+			gpios = <&pioA 25 GPIO_ACTIVE_LOW>;
-+		};
-+		pa26 {
-+			label = "led-b";
-+			gpios = <&pioA 26 GPIO_ACTIVE_LOW>;
-+		};
-+		pa27 {
-+			label = "led-c";
-+			gpios = <&pioA 27 GPIO_ACTIVE_LOW>;
-+		};
-+		pa28 {
-+			label = "led-d";
-+			gpios = <&pioA 28 GPIO_ACTIVE_LOW>;
-+		};
-+	};
++            pa24 {
++                    label = "led-status";
++                    gpios = <&pioA 24 GPIO_ACTIVE_LOW>;
++                    linux,default-trigger = "default-on";
++            };
++            pa25 {
++                    label = "led-a";
++                    gpios = <&pioA 25 GPIO_ACTIVE_LOW>;
++            };
++            pa26 {
++                    label = "led-b";
++                    gpios = <&pioA 26 GPIO_ACTIVE_LOW>;
++            };
++            pa27 {
++                    label = "led-c";
++                    gpios = <&pioA 27 GPIO_ACTIVE_LOW>;
++            };
++            pa28 {
++                    label = "led-d";
++                    gpios = <&pioA 28 GPIO_ACTIVE_LOW>;
++            };
++    };
 +
-+	/* GPS-PPS input on AP1 */
-+	pps {
-+		compatible = "pps-gpio";
-+		gpios = <&pioA 29 0>;
-+		capture-clear;
-+	};
++    /* GPS-PPS input on AP1 */
++    pps {
++            compatible = "pps-gpio";
++            gpios = <&pioA 29 0>;
++            capture-clear;
++    };
 +
 +
-+    i2c@0 {
++    i2c-gpio-0 {
 +	status = "okay";
 +
 +	id_eeprom@56 {
 +	    compatible = "atmel,24c04";
 +	    reg = <0x56>;
 +	    pagesize = <16>;
++            status = "okay";
 +	};
 +	board_temp@48 {
 +	    compatible = "ti,tmp102";
 +	    reg = <0x48>;
++            status = "okay";
 +	    /* tempsensor_alert line running to pin PC19 on processor
 +	       set up an interrupt for this? */
 +	};
 +    };
-+    i2c@1 {
++    i2c-gpio-1 {
 +	status = "okay";
-+
++        
 +	ap1_eeprom@50 {
 +	    compatible = "atmel,24c04";
 +	    reg = <0x50>;
 +	    pagesize = <16>;
++            status = "okay";
 +	};
 +	ap2_eeprom@52 {
 +	    compatible = "atmel,24c04";
 +	    reg = <0x52>;
 +	    pagesize = <16>;
++            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
 ===================================================================