Merge pull request #1302 from vpeter4/imx6-linux

imx6/linux: update sr-3.14 to 2fb11e2 (supports v1.5 soms from solidr…

packages/linux/package.mk

@@ -40,20 +40,22 @@ case "$LINUX" in
     PKG_SOURCE_DIR="$PKG_NAME-amlogic-$PKG_VERSION*"
     PKG_PATCH_DIRS="amlogic-3.14"
     ;;
-  imx6)
-    PKG_VERSION="3.14-mx6-sr"
-    PKG_COMMIT="27e61f6"
-    PKG_SOURCE_DIR="$PKG_NAME-$PKG_VERSION-$PKG_COMMIT"
-    PKG_SOURCE_NAME="$PKG_SOURCE_DIR.tar.xz"
-    PKG_URL="$DISTRO_SRC/$PKG_SOURCE_NAME"
+  imx6-3.14-sr)
+    PKG_VERSION="3.14-sr"
+    PKG_COMMIT="2fb11e2"
+    PKG_SITE="http://solid-run.com/wiki/doku.php?id=products:imx6:software:development:kernel"
+    PKG_URL="https://github.com/SolidRun/linux-fslc/archive/$PKG_COMMIT.tar.gz"
+    PKG_SOURCE_NAME="$PKG_NAME-$LINUX-$PKG_COMMIT.tar.gz"
+    PKG_SOURCE_DIR="$PKG_NAME-fslc-${PKG_COMMIT}*"
     PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan"
     ;;
   imx6-4.4-xbian)
     PKG_VERSION="4.4-xbian"
-    PKG_COMMIT="20160821-f14907b"
-    PKG_SOURCE_DIR="$PKG_NAME-$PKG_VERSION-$PKG_COMMIT"
-    PKG_SOURCE_NAME="$PKG_SOURCE_DIR.tar.xz"
-    PKG_URL="$DISTRO_SRC/$PKG_SOURCE_NAME"
+    PKG_COMMIT="3bde863"
+    PKG_SITE="https://github.com/xbianonpi/xbian-sources-kernel/tree/imx6-4.4.y"
+    PKG_URL="https://github.com/xbianonpi/xbian-sources-kernel/archive/$PKG_COMMIT.tar.gz"
+    PKG_SOURCE_NAME="$PKG_NAME-$LINUX-$PKG_COMMIT.tar.gz"
+    PKG_SOURCE_DIR="xbian-sources-kernel-${PKG_COMMIT}*"   
     PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced"
     ;;
   *)

projects/imx6/linux/3.14-sr/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.60 Kernel Configuration
+# Linux/arm 3.14.79 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
@@ -272,7 +272,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_FREEZER=y
+# CONFIG_FREEZER is not set
 
 #
 # System Type
@@ -626,12 +626,7 @@ CONFIG_COREDUMP=y
 #
 # Power management options
 #
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
+# CONFIG_SUSPEND is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
@@ -641,10 +636,8 @@ CONFIG_PM_OPP=y
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
 CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_NET=y
@@ -955,6 +948,7 @@ CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1230,7 +1224,8 @@ CONFIG_EEPROM_93CX6=m
 #
 # Texas Instruments shared transport line discipline
 #
-# CONFIG_TI_ST is not set
+CONFIG_TI_ST=m
+CONFIG_ST_HCI=m
 # CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set
 
@@ -1761,7 +1756,14 @@ CONFIG_RTL_CARDS=m
 # CONFIG_RTL8723AE is not set
 # CONFIG_RTL8188EE is not set
 # CONFIG_RTL8192CU is not set
-# CONFIG_WL_TI is not set
+CONFIG_WL_TI=y
+# CONFIG_WL1251 is not set
+# CONFIG_WL12XX is not set
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 # CONFIG_MWIFIEX is not set
@@ -1926,7 +1928,6 @@ CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y

projects/imx6/linux/4.4-xbian/linux.arm.conf

@@ -681,18 +681,7 @@ CONFIG_BINFMT_MISC=m
 #
 # Power management options
 #
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
+# CONFIG_SUSPEND is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_APM_EMULATION=m
@@ -700,7 +689,6 @@ CONFIG_PM_OPP=y
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -2795,7 +2783,6 @@ CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
@@ -3003,7 +2990,10 @@ CONFIG_PPS_CLIENT_GPIO=m
 #
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_GIANFAR=m
-# CONFIG_DP83640_PHY is not set
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
 CONFIG_PINCTRL=y
 
 #
@@ -3146,7 +3136,6 @@ CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_IMX=y
 CONFIG_POWER_RESET_LTC2952=y
-# CONFIG_POWER_RESET_QNAP is not set
 CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_VERSATILE=y
 # CONFIG_POWER_RESET_SNVS is not set
@@ -4417,15 +4406,12 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
 CONFIG_SND_PCI=y
 # CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALI5451 is not set
 # CONFIG_SND_ATIIXP is not set
 # CONFIG_SND_ATIIXP_MODEM is not set
 # CONFIG_SND_AU8810 is not set
 # CONFIG_SND_AU8820 is not set
 # CONFIG_SND_AU8830 is not set
 # CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT3328 is not set
 # CONFIG_SND_BT87X is not set
 # CONFIG_SND_CA0106 is not set
 # CONFIG_SND_CMIPCI is not set
@@ -4447,23 +4433,17 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_INDIGODJ is not set
 # CONFIG_SND_INDIGOIOX is not set
 # CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
 # CONFIG_SND_ENS1370 is not set
 # CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_HDSP is not set
 # CONFIG_SND_HDSPM is not set
-# CONFIG_SND_ICE1712 is not set
 # CONFIG_SND_ICE1724 is not set
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
 # CONFIG_SND_KORG1212 is not set
 # CONFIG_SND_LOLA is not set
 # CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
 # CONFIG_SND_MIXART is not set
 # CONFIG_SND_NM256 is not set
 # CONFIG_SND_PCXHR is not set
@@ -4472,8 +4452,6 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_RME96 is not set
 # CONFIG_SND_RME9652 is not set
 # CONFIG_SND_SE6X is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_TRIDENT is not set
 # CONFIG_SND_VIA82XX is not set
 # CONFIG_SND_VIA82XX_MODEM is not set
 # CONFIG_SND_VIRTUOSO is not set
@@ -4762,7 +4740,7 @@ CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_FSL_MPH_DR_OF=m
+CONFIG_USB_FSL_MPH_DR_OF=y
 CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
@@ -5267,7 +5245,6 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
-CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DMA_OF=y
@@ -5289,7 +5266,6 @@ CONFIG_DW_DMAC_PCI=m
 #
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
-CONFIG_DMA_ENGINE_RAID=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=m
 # CONFIG_UIO_CIF is not set
@@ -6543,7 +6519,7 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=y
 CONFIG_LZ4HC_COMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
-CONFIG_XZ_DEC=m
+CONFIG_XZ_DEC=y
 # CONFIG_XZ_DEC_X86 is not set
 # CONFIG_XZ_DEC_POWERPC is not set
 # CONFIG_XZ_DEC_IA64 is not set

projects/imx6/options

@@ -6,30 +6,8 @@
   # generated code.
     case $TARGET_ARCH in
       arm)
-        # TARGET_CPU:
-        # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
-        # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
-        # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
-        # arm720t arm740t strongarm strongarm110 strongarm1100
-        # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
-        # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
-        # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
-        # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
-        # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
-        # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
         TARGET_CPU="cortex-a9"
-
-        # TARGET_FLOAT:
-        # Specifies which floating-point ABI to use. Permissible values are:
-        # soft softfp hard
         TARGET_FLOAT="hard"
-
-        # TARGET_FPU:
-        # This specifies what floating point hardware (or hardware emulation) is
-        # available on the target. Permissible names are:
-        # fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
-        # vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
-        # neon-vfpv4.
         TARGET_FPU="neon"
         ;;
     esac
@@ -68,11 +46,28 @@
 
   # Kernel to use.
   # default is 4.4 from xbian
-    if [ -z "$LINUX_VERSION" -o "$LINUX_VERSION" != "sr-3.14" ]; then
+    if [ "$LINUX_VERSION" = "sr-3.14" ]; then
+      LINUX="imx6-3.14-sr"
+
+      KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET \
+             imx6q-cubox-i-som-v15.dtb       imx6dl-cubox-i-som-v15.dtb      \
+             imx6q-hummingboard-som-v15.dtb  imx6dl-hummingboard-som-v15.dtb \
+             imx6q-hummingboard2-som-v15.dtb imx6dl-hummingboard2-som-v15.dtb"
+
+      # OpenGL-ES implementation to use
+      OPENGLES="imx-gpu-viv"
+    elif [ "$LINUX_VERSION" = "xbian-4.8" ]; then
+      LINUX="imx6-4.8-xbian"
+      LIBCEC_TYPE="xbian"
+
+      # OpenGL-ES implementation to use
+      OPENGLES="gpu-viv-bin-mx6q"
+    else
       LINUX="imx6-4.4-xbian"
       LIBCEC_TYPE="xbian"
-    else
-      LINUX="imx6"
+
+      # OpenGL-ES implementation to use
+      OPENGLES="gpu-viv-bin-mx6q"
     fi
 
 ################################################################################
@@ -95,13 +90,6 @@
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
-  # OpenGL-ES implementation to use (no / bcm2835-driver / imx-gpu-viv)
-    if [ "$LINUX" = "imx6" ]; then
-      OPENGLES="imx-gpu-viv"
-    else
-      OPENGLES="gpu-viv-bin-mx6q"
-    fi
-
   # include uvesafb support (yes / no)
     UVESAFB_SUPPORT="no"
 

projects/imx6/patches/linux/3.14-sr/linux-005-pci-suspend-fix.patch

@@ -0,0 +1,15 @@
+Fix build error when CONFIG_PM_SLEEP is not set
+
+--- a/drivers/pci/host/pci-imx6.c	2017-01-14 19:50:14.159715318 +0100
++++ b/drivers/pci/host/pci-imx6.c	2017-01-14 19:50:42.182645605 +0100
+@@ -1311,7 +1311,9 @@ static struct platform_driver imx6_pcie_
+ 		.name	= "imx6q-pcie",
+ 		.owner	= THIS_MODULE,
+ 		.of_match_table = imx6_pcie_of_match,
++#ifdef CONFIG_PM_SLEEP
+ 		.pm = &pci_imx_pm_ops,
++#endif
+ 	},
+ 	.shutdown = imx6_pcie_shutdown,
+ };
+

projects/imx6/patches/linux/3.14-sr/linux-800-from-openbricks.patch

@@ -1,6 +1,6 @@
 https://github.com/OpenBricks/openbricks/tree/krypton-glibc
 https://github.com/OpenBricks/openbricks/tree/krypton-glibc/config/platforms/arm/imx6/machines/cuboxi/packages/linux/patches
-https://github.com/OpenBricks/openbricks/tree/731d2788a4f5924cdf80314709dc303a43b5c3f5/config/platforms/arm/imx6/machines/cuboxi/packages/linux/patches
+https://github.com/OpenBricks/openbricks/tree/27322b70e3566434443991078645e6a7395cb28d/config/platforms/arm/imx6/machines/cuboxi/packages/linux/patches
 
 ==============================================================
 file 0001-MXC-CEC-Remove-superflous-guards-that-could-even-bre.patch
@@ -1813,82 +1813,6 @@ index 8777320..8134cc8 100644
 1.9.1
 
 
-==============================================================
-file 0010-assign-minor-to-vhci.patch
-==============================================================
-
-From 27b8b64082db6cdfda751e81e56c0f668053834b Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@intel.com>
-Date: Tue, 18 Feb 2014 02:19:26 -0300
-Subject: [PATCH] Bluetooth: allocate static minor for vhci
-
-Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI
-driver) added the module alias to hci_vhci module so it's possible to
-create the /dev/vhci node. However creating an alias without
-specifying the minor doesn't allow us to create the node ahead,
-triggerring module auto-load when it's first accessed.
-
-Starting with depmod from kmod 16 we started to warn if there's a
-devname alias without specifying the major and minor.
-
-Let's do the same done for uhid, kvm, fuse and others, specifying a
-fixed minor. In systems with systemd as the init the following will
-happen: on early boot systemd will call "kmod static-nodes" to read
-/lib/modules/$(uname -r)/modules.devname and then create the nodes. When
-first accessed these "dead" nodes will trigger the module loading.
-
-Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
-Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
----
- Documentation/devices.txt    | 1 +
- drivers/bluetooth/hci_vhci.c | 3 ++-
- include/linux/miscdevice.h   | 1 +
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Documentation/devices.txt b/Documentation/devices.txt
-index 10378cc..04356f5 100644
---- a/Documentation/devices.txt
-+++ b/Documentation/devices.txt
-@@ -353,6 +353,7 @@ Your cooperation is appreciated.
- 		133 = /dev/exttrp	External device trap
- 		134 = /dev/apm_bios	Advanced Power Management BIOS
- 		135 = /dev/rtc		Real Time Clock
-+		137 = /dev/vhci		Bluetooth virtual HCI driver
- 		139 = /dev/openprom	SPARC OpenBoot PROM
- 		140 = /dev/relay8	Berkshire Products Octal relay card
- 		141 = /dev/relay16	Berkshire Products ISO-16 relay card
-diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
-index 1ef6990..add1c6a 100644
---- a/drivers/bluetooth/hci_vhci.c
-+++ b/drivers/bluetooth/hci_vhci.c
-@@ -360,7 +360,7 @@ static const struct file_operations vhci_fops = {
- static struct miscdevice vhci_miscdev= {
- 	.name	= "vhci",
- 	.fops	= &vhci_fops,
--	.minor	= MISC_DYNAMIC_MINOR,
-+	.minor	= VHCI_MINOR,
- };
- 
- static int __init vhci_init(void)
-@@ -386,3 +386,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
- MODULE_VERSION(VERSION);
- MODULE_LICENSE("GPL");
- MODULE_ALIAS("devname:vhci");
-+MODULE_ALIAS_MISCDEV(VHCI_MINOR);
-diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
-index 3737f72..7bb6148 100644
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -23,6 +23,7 @@
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR		135
- #define EFI_RTC_MINOR		136	/* EFI Time services */
-+#define VHCI_MINOR		137
- #define SUN_OPENPROM_MINOR	139
- #define DMAPI_MINOR		140	/* DMAPI */
- #define NVRAM_MINOR		144
-
 ==============================================================
 file 0010-MXC-CEC-Use-instance-data-pointer-whenever-possible.patch
 ==============================================================
@@ -2363,6 +2287,82 @@ index 8134cc8..80344d9 100644
 1.9.1
 
 
+==============================================================
+file 0010-assign-minor-to-vhci.patch
+==============================================================
+
+From 27b8b64082db6cdfda751e81e56c0f668053834b Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@intel.com>
+Date: Tue, 18 Feb 2014 02:19:26 -0300
+Subject: [PATCH] Bluetooth: allocate static minor for vhci
+
+Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI
+driver) added the module alias to hci_vhci module so it's possible to
+create the /dev/vhci node. However creating an alias without
+specifying the minor doesn't allow us to create the node ahead,
+triggerring module auto-load when it's first accessed.
+
+Starting with depmod from kmod 16 we started to warn if there's a
+devname alias without specifying the major and minor.
+
+Let's do the same done for uhid, kvm, fuse and others, specifying a
+fixed minor. In systems with systemd as the init the following will
+happen: on early boot systemd will call "kmod static-nodes" to read
+/lib/modules/$(uname -r)/modules.devname and then create the nodes. When
+first accessed these "dead" nodes will trigger the module loading.
+
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+---
+ Documentation/devices.txt    | 1 +
+ drivers/bluetooth/hci_vhci.c | 3 ++-
+ include/linux/miscdevice.h   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Documentation/devices.txt b/Documentation/devices.txt
+index 10378cc..04356f5 100644
+--- a/Documentation/devices.txt
++++ b/Documentation/devices.txt
+@@ -353,6 +353,7 @@ Your cooperation is appreciated.
+ 		133 = /dev/exttrp	External device trap
+ 		134 = /dev/apm_bios	Advanced Power Management BIOS
+ 		135 = /dev/rtc		Real Time Clock
++		137 = /dev/vhci		Bluetooth virtual HCI driver
+ 		139 = /dev/openprom	SPARC OpenBoot PROM
+ 		140 = /dev/relay8	Berkshire Products Octal relay card
+ 		141 = /dev/relay16	Berkshire Products ISO-16 relay card
+diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
+index 1ef6990..add1c6a 100644
+--- a/drivers/bluetooth/hci_vhci.c
++++ b/drivers/bluetooth/hci_vhci.c
+@@ -360,7 +360,7 @@ static const struct file_operations vhci_fops = {
+ static struct miscdevice vhci_miscdev= {
+ 	.name	= "vhci",
+ 	.fops	= &vhci_fops,
+-	.minor	= MISC_DYNAMIC_MINOR,
++	.minor	= VHCI_MINOR,
+ };
+ 
+ static int __init vhci_init(void)
+@@ -386,3 +386,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
+ MODULE_VERSION(VERSION);
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("devname:vhci");
++MODULE_ALIAS_MISCDEV(VHCI_MINOR);
+diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
+index 3737f72..7bb6148 100644
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
+@@ -23,6 +23,7 @@
+ #define TEMP_MINOR		131	/* Temperature Sensor */
+ #define RTC_MINOR		135
+ #define EFI_RTC_MINOR		136	/* EFI Time services */
++#define VHCI_MINOR		137
+ #define SUN_OPENPROM_MINOR	139
+ #define DMAPI_MINOR		140	/* DMAPI */
+ #define NVRAM_MINOR		144
+
 ==============================================================
 file 0011-MXC-CEC-Re-order-functions-and-remove-debug-trace-me.patch
 ==============================================================
@@ -2992,15 +2992,15 @@ diff --git a/drivers/mxc/ipu3/ipu_disp.c b/drivers/mxc/ipu3/ipu_disp.c
 index b5e21c5..96464b2 100644
 --- a/drivers/mxc/ipu3/ipu_disp.c
 +++ b/drivers/mxc/ipu3/ipu_disp.c
-@@ -1189,7 +1189,7 @@ int32_t ipu_init_sync_panel(struct ipu_soc *ipu, int disp, uint32_t pixel_clk,
- 			_ipu_di_sync_config(ipu,
- 					disp, 		/* display */
- 					DI_SYNC_COUNT_1, 		/* counter */
--					v_total*2 - 1, 	/* run count */
-+					v_total - 1, 	/* run count */
- 					(3 - 1),	/* run_resolution, counter 1 can reference to counter 6,7,8 with run_resolution=2,3,4 */
- 					1, 		/* offset */
- 					(3 - 1), 	/* offset resolution, 3=counter 7 */
+@@ -2065,7 +2065,7 @@ int32_t ipu_init_sync_panel(struct ipu_soc *ipu, int disp, uint32_t pixel_clk,
+ 				_ipu_di_sync_config(ipu,
+ 						disp, 		/* display */
+ 						DI_SYNC_COUNT_1, 		/* counter */
+-						v_total*2 - 1, 	/* run count */
++						v_total - 1, 	/* run count */
+ 						(3 - 1),	/* run_resolution, counter 1 can reference to counter 6,7,8 with run_resolution=2,3,4 */
+ 						1, 		/* offset */
+ 						(3 - 1), 	/* offset resolution, 3=counter 7 */
 -- 
 1.9.1
 
@@ -3181,7 +3181,7 @@ index 55c39e1..f71c1dd 100644
 -	/*Add all no interlaced CEA mode to default modelist */
 -	for (i = 0; i < ARRAY_SIZE(mxc_cea_mode); i++) {
 -		mode = mxc_cea_mode[i];
--		if (mode.xres != 0) {
+-		if (!(mode.vmode & FB_VMODE_INTERLACED) && (mode.xres != 0)) {
 -			if (ignore_edid)
 -				mode.flag |= FB_MODE_IS_STANDARD;
 -			fb_add_videomode(&mode, &hdmi->fbi->modelist);