From 303a93e108997e7328c783ae721635b06ad3000a Mon Sep 17 00:00:00 2001
From: vpeter4 <peter.vicman@gmail.com>
Date: Sat, 8 Nov 2014 15:00:21 +0100
Subject: [PATCH] projects/imx6/linux: enable RTC on TBS Matrix system

---
 projects/imx6/linux/linux.arm.conf            |  2 +-
 ...inux-301-tbs2910_device_tree_updates.patch | 49 +++++++++++++------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/projects/imx6/linux/linux.arm.conf b/projects/imx6/linux/linux.arm.conf
index f5bc8a0e84..f20baf2bcd 100644
--- a/projects/imx6/linux/linux.arm.conf
+++ b/projects/imx6/linux/linux.arm.conf
@@ -3030,7 +3030,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 #
 # I2C RTC drivers
 #
-# CONFIG_RTC_DRV_DS1307 is not set
+CONFIG_RTC_DRV_DS1307=y
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_DS3232 is not set
diff --git a/projects/imx6/patches/linux/linux-301-tbs2910_device_tree_updates.patch b/projects/imx6/patches/linux/linux-301-tbs2910_device_tree_updates.patch
index 260aeb3adf..0674016f48 100644
--- a/projects/imx6/patches/linux/linux-301-tbs2910_device_tree_updates.patch
+++ b/projects/imx6/patches/linux/linux-301-tbs2910_device_tree_updates.patch
@@ -3,7 +3,7 @@ From: vpeter4 <peter.vicman@gmail.com>
 Date: Sun, 5 Oct 2014 14:25:57 +0200
 Subject: [PATCH] tbs2910_device_tree_updates
 
-gpio ir receiver, red led as heartbeat, fan (as led output), spdif sound
+gpio ir receiver, red led as heartbeat, fan (as led output), spdif sound, rtc
 
 sgtl5000 audio codec by @milan on TBS forum
 	http://www.tbsdtv.com/forum/viewtopic.php?f=154&t=8859&p=32020#p32018
@@ -73,29 +73,27 @@ index f351c21..53803c9 100644
  		mux-int-port = <2>;
  		mux-ext-port = <3>;
  	};
-@@ -132,9 +135,22 @@
+@@ -132,7 +135,20 @@
  		red {
  		        gpios = <&gpio1 2 0>;
  		        default-state = "on";
 +		        linux,default-trigger = "heartbeat";
-+		};
+ 		};
 +
 +		fan {
 +			gpios = <&gpio3 28 0>;
 +			default-state = "off";
- 		};
- 	};
- 
++		};
++	};
++
 +	sound-spdif {
 +		compatible = "fsl,imx-audio-spdif";
 +		model = "imx-spdif";
 +		spdif-controller = <&spdif>;
 +		spdif-out;
-+	};
-+
+ 	};
+ 
  	sound-hdmi {
- 		compatible = "fsl,imx6q-audio-hdmi",
- 			     "fsl,imx-audio-hdmi";
 @@ -257,27 +273,15 @@
  	pinctrl-0 = <&pinctrl_i2c1>;
  	status = "okay";
@@ -132,7 +130,28 @@ index f351c21..53803c9 100644
  };
  
  &i2c2 {
-@@ -417,7 +421,6 @@
+@@ -392,17 +396,13 @@
+ };
+ 
+ &i2c3 {
+-	clock-frequency = <100000>;
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_i2c3>;
+ 	status = "okay";
+ 
+-	egalax_ts@04 {
+-		compatible = "eeti,egalax_ts";
+-		reg = <0x04>;
+-		interrupt-parent = <&gpio6>;
+-		interrupts = <7 2>;
+-		wakeup-gpios = <&gpio6 7 0>;
++	rtc: rtc@68 {
++		compatible = "dallas,ds1307";
++		reg = <0x68>;
+ 	};
+ };
+ 
+@@ -417,7 +417,6 @@
  				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
  				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
  				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
@@ -140,7 +159,7 @@ index f351c21..53803c9 100644
  				MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x80000000
  				MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000
  				MX6QDL_PAD_EIM_D22__GPIO3_IO22  0x80000000
-@@ -429,6 +432,12 @@
+@@ -429,6 +428,12 @@
  			>;
  		};
  
@@ -153,7 +172,7 @@ index f351c21..53803c9 100644
  		pinctrl_audmux: audmuxgrp {
  			fsl,pins = <
  				MX6QDL_PAD_CSI0_DAT7__AUD3_RXD		0x130b0
-@@ -475,6 +484,16 @@
+@@ -475,6 +480,16 @@
  			>;
  		};
  
@@ -170,7 +189,7 @@ index f351c21..53803c9 100644
  		pinctrl_hdmi_cec: hdmi_cecgrp {
  			fsl,pins = <
  				MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
-@@ -618,6 +637,7 @@
+@@ -618,6 +633,7 @@
  		pinctrl_gpio_leds: gpioledsgrp {
  			fsl,pins = <
  				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
@@ -178,7 +197,7 @@ index f351c21..53803c9 100644
  			>;
  		};
  	};
-@@ -698,6 +718,22 @@
+@@ -698,6 +714,22 @@
  	status = "okay";
  };