Fix Device Tree for MTRE Hardware

2 files changed, 28 insertions, 40 deletions

diff --git a/recipes-kernel/linux/linux-at91-4.9.87/defconfig b/recipes-kernel/linux/linux-at91-4.9.87/defconfig
index 3c0173e..cb07395 100644
--- a/recipes-kernel/linux/linux-at91-4.9.87/defconfig
+++ b/recipes-kernel/linux/linux-at91-4.9.87/defconfig
@@ -3050,7 +3050,7 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LP5562 is not set
 # CONFIG_LEDS_LP8501 is not set
 # CONFIG_LEDS_LP8860 is not set
-# CONFIG_LEDS_PCA955X is not set
+CONFIG_LEDS_PCA955X=m
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_PWM=y
@@ -3115,7 +3115,7 @@ CONFIG_RTC_INTF_DEV=y
 #
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
 # CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1307 is not set
+CONFIG_RTC_DRV_DS1307=m
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
diff --git a/recipes-kernel/linux/linux-at91-4.9.87/mtre/linux-4.9-mtre-device-tree.patch b/recipes-kernel/linux/linux-at91-4.9.87/mtre/linux-4.9-mtre-device-tree.patch
index 9eb79b1..77f6caa 100644
--- a/recipes-kernel/linux/linux-at91-4.9.87/mtre/linux-4.9-mtre-device-tree.patch
+++ b/recipes-kernel/linux/linux-at91-4.9.87/mtre/linux-4.9-mtre-device-tree.patch
@@ -1,7 +1,7 @@
 diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtre.dts linux-4.9.87/arch/arm/boot/dts/mtre.dts
 --- linux-4.9.87.orig/arch/arm/boot/dts/mtre.dts	1969-12-31 18:00:00.000000000 -0600
 +++ linux-4.9.87/arch/arm/boot/dts/mtre.dts	2019-05-07 19:03:19.378605555 -0500
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,266 @@
 +/*
 + * DTS file for Multi-Tech Systems MTRE Hardware
 + *
@@ -118,7 +118,8 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtre.dts linux-4.9.87/arch/arm/bo
 +			};
 +
 +			rtc@fffffeb0 {
-+				status = "okay";
++				/* use mcp79410 rtc instead */
++				status = "disabled";
 +			};
 +
 +			dbgu: serial@fffff200 {
@@ -197,19 +198,19 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtre.dts linux-4.9.87/arch/arm/bo
 +			};
 +			config0@800000 {
 +				label = "Config";
-+				reg = <0x800000 0x800000>;
++				reg = <0x800000 0x4000000>;
 +			};
-+			config1@1000000 {
++			config1@4800000 {
 +				label = "OEM Config";
-+				reg = <0x1000000 0x800000>;
++				reg = <0x4800000 0x800000>;
 +			};
-+			rootfs@1800000 {
++			rootfs@5000000 {
 +				label = "Rootfs";
-+				reg = <0x1800000 0x8000000>;
++				reg = <0x5000000 0x8000000>;
 +			};
-+			user@9800000 {
++			user@D000000 {
 +				label = "User data";
-+				reg = <0x9800000 0x6800000>;
++				reg = <0xD000000 0x3000000>;
 +			};
 +		};
 +
@@ -223,35 +224,6 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtre.dts linux-4.9.87/arch/arm/bo
 +		};
 +	};
 +
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		pc21 {
-+			label = "led-status";
-+			gpios = <&pioC 21 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "default-on";
-+		};
-+		pc15 {
-+			label = "led-b";
-+			gpios = <&pioC 15 GPIO_ACTIVE_LOW>;
-+		};
-+		pc20 {
-+			label = "led-c";
-+			gpios = <&pioC 20 GPIO_ACTIVE_LOW>;
-+		};
-+		pc19 {
-+			label = "led-d";
-+			gpios = <&pioC 19 GPIO_ACTIVE_LOW>;
-+		};
-+		pc18 {
-+			label = "led-e";
-+			gpios = <&pioC 18 GPIO_ACTIVE_LOW>;
-+		};
-+		pc17 {
-+			label = "led-f";
-+			gpios = <&pioC 17 GPIO_ACTIVE_LOW>;
-+		};
-+	};
 +
 +        i2c-gpio-0 {
 +                status = "okay";
@@ -264,6 +236,22 @@ diff -Naru linux-4.9.87.orig/arch/arm/boot/dts/mtre.dts linux-4.9.87/arch/arm/bo
 +                };
 +        };
 +
++	i2c-gpio-1 {
++		status = "okay";
++
++		pca9552@60 {
++			/* 16-bit I2C LED blinker */
++			compatible = "nxp,pca9552";
++			reg = <0x66>;
++		};
++
++		mcp79410@6f {
++			/* Battery-backed I2C Real-Time Clock/Calendar */
++			compatible = "microchip,mcp7941x";
++			reg = <0x6f>;
++		};
++	};
++
 +        pps-0 {
 +            compatible = "pps-gpio";
 +            gpios = <&pioB 18 0>;  /* MTRV1-0.0 */