linux: update to 3.14.72, add working solidrun patch

mk/kernel-ver.mk

@@ -49,11 +49,11 @@ KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		33f2a5d10769c05f6ed6a9eff24429ffd4fbaeb492320e3f9da318d56afdaa30
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_14_69),y)
-KERNEL_FILE_VER:=	3.14.69
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_14_72),y)
+KERNEL_FILE_VER:=	3.14.72
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		0effaa7f1036eeb4a71d64e42619b1b4fffe0901e7df51446cc14e799154fd69
+KERNEL_HASH:=		0c64e38255e591dc06d57881ce08e29009c2d31fcdaab2b1a4b736bc873f4724
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_3_12_59),y)
 KERNEL_FILE_VER:=	3.12.59

package/u-boot/files/boot.script.imx6

@@ -0,0 +1,4 @@
+setenv bootargs console=ttymxc0,115200 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32
+ext4load mmc 0:1 0x42000000 boot/${fdtfile}
+ext4load mmc 0:1 0x10800000 boot/kernel
+bootz 0x10800000 - 0x42000000

target/arm/kernel/solidrun-imx6

@@ -9,5 +9,6 @@ CONFIG_LOCAL_TIMERS=y
 CONFIG_MXC_DEBUG_BOARD=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_PCI_IMX6=y
+CONFIG_PM_SLEEP=y
 CONFIG_ATAGS=y
 CONFIG_CMDLINE_FORCE=y

target/arm/solidrun-imx6/patches/3.14.69/0001-cec-hdmi.patch

@@ -1,133 +0,0 @@
-diff -Nur linux-3.14.45.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c linux-3.14.45/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c
---- linux-3.14.45.orig/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c	2015-07-16 01:45:57.033999867 -0500
-+++ linux-3.14.45/drivers/mxc/hdmi-cec/mxc_hdmi-cec.c	2015-07-16 01:44:12.826000821 -0500
-@@ -67,7 +67,6 @@
- 	u8 msg_len;
- 	int tx_answer;
- 	u16 latest_cec_stat;
--	u8 link_status;
- 	spinlock_t irq_lock;
- 	struct delayed_work hdmi_cec_work;
- 	struct mutex lock;
-@@ -83,8 +82,6 @@
- 
- static LIST_HEAD(head);
- 
--static int hdmi_cec_ready = 0;
--static int hdmi_cec_started;
- static int hdmi_cec_major;
- static struct class *hdmi_cec_class;
- static struct hdmi_cec_priv hdmi_cec_data;
-@@ -98,7 +95,6 @@
- 	struct hdmi_cec_priv *hdmi_cec = data;
- 	u16 cec_stat = 0;
- 	unsigned long flags;
--	u8 phy_stat0;
- 	irqreturn_t ret = IRQ_HANDLED;
- 
- 	spin_lock_irqsave(&hdmi_cec->irq_lock, flags);
-@@ -107,7 +103,6 @@
- 
- 	cec_stat = hdmi_readb(HDMI_IH_CEC_STAT0);
- 	hdmi_writeb(cec_stat, HDMI_IH_CEC_STAT0);
--	phy_stat0 = hdmi_readb(HDMI_PHY_STAT0) & 0x02;
- 
- 	if ((cec_stat & (HDMI_IH_CEC_STAT0_ERROR_INIT | \
- 		HDMI_IH_CEC_STAT0_NACK | HDMI_IH_CEC_STAT0_EOM | \
-@@ -115,14 +110,7 @@
- 		ret = IRQ_NONE;
- 		cec_stat = 0;
- 	}
--	if (hdmi_cec->link_status ^ phy_stat0) {
--		/* HPD value changed */
--		hdmi_cec->link_status = phy_stat0;
--		if (hdmi_cec->link_status)
--			cec_stat |= 0x80; /* Connected */
--		else
--			cec_stat |= 0x100; /* Disconnected */
--	}
-+
- 	pr_debug("HDMI CEC interrupt received\n");
- 	hdmi_cec->latest_cec_stat = cec_stat ;
- 
-@@ -315,7 +303,7 @@
- 		mutex_unlock(&hdmi_cec_data.lock);
- 		return -EACCES;
- 	}
--	/* Ensure that there is only one writer who is the only listener of tx_cec_queue */
-+	/* Ensure that there is only one writer who is the unique listener of tx_cec_queue */
- 	if (hdmi_cec_data.tx_answer != CEC_TX_AVAIL) {
- 		mutex_unlock(&hdmi_cec_data.lock);
- 		return -EBUSY;
-@@ -363,9 +351,6 @@
- {
- 	u8 val;
- 
--	if (!hdmi_cec_ready || hdmi_cec_started)
--		return;
--
- 	val = hdmi_readb(HDMI_MC_CLKDIS);
- 	val &= ~HDMI_MC_CLKDIS_CECCLK_DISABLE;
- 	hdmi_writeb(val, HDMI_MC_CLKDIS);
-@@ -377,12 +362,7 @@
- 	val = HDMI_IH_CEC_STAT0_WAKEUP | HDMI_IH_CEC_STAT0_ERROR_FOLL | HDMI_IH_CEC_STAT0_ARB_LOST;
- 	hdmi_writeb(val, HDMI_CEC_MASK);
- 	hdmi_writeb(val, HDMI_IH_MUTE_CEC_STAT0);
--	hdmi_cec_data.link_status = hdmi_readb(HDMI_PHY_STAT0) & 0x02;
--	mutex_lock(&hdmi_cec_data.lock);
- 	hdmi_cec_data.cec_state = true;
--	mutex_unlock(&hdmi_cec_data.lock);
--
--	hdmi_cec_started = 1;
- }
- EXPORT_SYMBOL(hdmi_cec_start_device);
- 
-@@ -390,9 +370,6 @@
- { 
- 	u8 val;
- 
--	if (!hdmi_cec_ready || !hdmi_cec_started)
--		return;
--
- 	hdmi_writeb(0x10, HDMI_CEC_CTRL);
- 	val = HDMI_IH_CEC_STAT0_WAKEUP | HDMI_IH_CEC_STAT0_ERROR_FOLL | HDMI_IH_CEC_STAT0_ERROR_INIT | HDMI_IH_CEC_STAT0_ARB_LOST | \
- 			HDMI_IH_CEC_STAT0_NACK | HDMI_IH_CEC_STAT0_EOM | HDMI_IH_CEC_STAT0_DONE;
-@@ -402,11 +379,7 @@
- 	val = hdmi_readb(HDMI_MC_CLKDIS);
- 	val |= HDMI_MC_CLKDIS_CECCLK_DISABLE;
- 	hdmi_writeb(val, HDMI_MC_CLKDIS);
--	mutex_lock(&hdmi_cec_data.lock);
- 	hdmi_cec_data.cec_state = false;
--	mutex_unlock(&hdmi_cec_data.lock);
--
--	hdmi_cec_started = 0;
- }
- EXPORT_SYMBOL(hdmi_cec_stop_device);
- 
-@@ -481,11 +454,18 @@
-  */
- static int hdmi_cec_release(struct inode *inode, struct file *filp)
- {
-+	struct hdmi_cec_event *event, *tmp_event;
- 	mutex_lock(&hdmi_cec_data.lock);
- 	if (open_count) {
- 		open_count = 0;
- 		hdmi_cec_data.cec_state = false;
- 		hdmi_cec_data.Logical_address = 15;
-+
-+		/* Flush eventual events which have not been read by user space */
-+		list_for_each_entry_safe(event, tmp_event, &head, list) {
-+			list_del(&event->list);
-+			vfree(event);
-+		}
- 	}
- 	mutex_unlock(&hdmi_cec_data.lock);
- 
-@@ -580,7 +560,6 @@
- 	INIT_DELAYED_WORK(&hdmi_cec_data.hdmi_cec_work, mxc_hdmi_cec_worker);
- 
- 	dev_info(&pdev->dev, "HDMI CEC initialized\n");
--	hdmi_cec_ready = 1;
- 	goto out;
- 
- err_out_class:

target/config/Config.in.kernelversion

@@ -15,17 +15,20 @@ config ADK_TARGET_KERNEL_VERSION_GIT
 config ADK_TARGET_KERNEL_VERSION_4_6_2
 	bool "4.6.2"
 	depends on !ADK_TARGET_BOARD_BCM28XX
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_KERNEL_VERSION_4_6
 
 config ADK_TARGET_KERNEL_VERSION_4_5_7
 	bool "4.5.7"
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_BOARD_BCM28XX
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_KERNEL_VERSION_4_5
 
 config ADK_TARGET_KERNEL_VERSION_4_4_13
 	bool "4.4.13"
 	depends on !ADK_TARGET_ARCH_NIOS2
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_KERNEL_VERSION_4_4
 
 config ADK_TARGET_KERNEL_VERSION_4_1_26
@@ -36,7 +39,6 @@ config ADK_TARGET_KERNEL_VERSION_4_1_26
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_ARCH_SPARC
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_KERNEL_VERSION_4_1
 
 config ADK_TARGET_KERNEL_VERSION_3_18_33
@@ -53,8 +55,8 @@ config ADK_TARGET_KERNEL_VERSION_3_18_33
 	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	select ADK_TARGET_KERNEL_VERSION_3_18
 
-config ADK_TARGET_KERNEL_VERSION_3_14_69
-	bool "3.14.69"
+config ADK_TARGET_KERNEL_VERSION_3_14_72
+	bool "3.14.72"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_H8300