From: hschang <chang@dev3>
Date: Wed, 23 Jul 2014 04:18:42 +0000 (+0900)
Subject: Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=38875c9b5c043e066ed208f4d2ac79c1bd5b4c83;hp=d9b7586da5293284664231a1752b2ce83279d9b3

Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

Conflicts:
	meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
---

diff --git a/meta-bsp/bm750/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm7335.patch b/meta-bsp/bm750/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm7335.patch
new file mode 100644
index 0000000..cbfc4b7
--- /dev/null
+++ b/meta-bsp/bm750/recipes/linux/linux-vuplus-3.9.6/linux-sata_bcm7335.patch
@@ -0,0 +1,55 @@
+diff --git a/drivers/ata/sata_brcmstb.c b/drivers/ata/sata_brcmstb.c
+index 7ba20e0..1e2e947 100644
+--- a/drivers/ata/sata_brcmstb.c
++++ b/drivers/ata/sata_brcmstb.c
+@@ -330,6 +330,22 @@ static void brcm_EnableOOBWindowFix(void __iomem *mmio_base, int port)
+ 	mdio_write_reg(mmio_base, port, 0x0D, sval);
+ }
+ 
++static void brcm_Enable256AlignDetection(void __iomem *mmio_base, int port)
++{
++        uint32_t tmp32;
++        void __iomem *port_mmio;
++
++        port_mmio = PORT_BASE(mmio_base, port);
++
++        tmp32 = readl(port_mmio + K2_SATA_SICR1_OFFSET);
++        tmp32 |= 0x08000000;
++        writel(tmp32, port_mmio + K2_SATA_SICR1_OFFSET);
++
++        tmp32 = readl(port_mmio + K2_SATA_SICR2_OFFSET);
++        tmp32 |= 0x00800000;
++        writel(tmp32, port_mmio + K2_SATA_SICR2_OFFSET);
++}
++
+ static void brcm_AnalogReset(void __iomem *mmio_base, int port)
+ {
+ 	/* do analog reset */
+@@ -385,6 +401,8 @@ static void brcm_InitSata_1_5Gb(void __iomem *mmio_base, int port)
+ 	brcm_SetPllTxRxCtrl(mmio_base, port);
+ 	brcm_EnableOOBWindowFix(mmio_base, port);
+ 
++	brcm_Enable256AlignDetection(mmio_base, port);
++
+ 	if (!port) {
+ #ifdef CONFIG_BRCM_SATA_75MHZ_PLL
+ 		/* use 75Mhz PLL clock */
+@@ -446,6 +464,8 @@ static void brcm_InitSata2_3Gb(void __iomem *mmio_base, int port)
+ 	brcm_SetPllTxRxCtrl(mmio_base, port);
+ 	brcm_EnableOOBWindowFix(mmio_base, port);
+ 
++	brcm_Enable256AlignDetection(mmio_base, port);
++
+ 	if (!port) {
+ #ifdef CONFIG_BRCM_SATA_75MHZ_PLL
+ 		/* use 75Mhz PLL clock */
+@@ -1135,7 +1155,9 @@ static int k2_sata_resume(struct device *dev)
+ 		ap = host->ports[i];
+ 
+ 		ata_for_each_link(link, ap, EDGE) {
++			spin_unlock_irqrestore(&hp->lock, flags);
+ 			sata_std_hardreset(link, NULL, 1000);
++			spin_lock_irqsave(&hp->lock, flags);
+ 		}
+ 	}
+ 
diff --git a/meta-bsp/bm750/recipes/linux/linux-vuplus_3.9.6.bbappend b/meta-bsp/bm750/recipes/linux/linux-vuplus_3.9.6.bbappend
index bc27547..25ffa7b 100644
--- a/meta-bsp/bm750/recipes/linux/linux-vuplus_3.9.6.bbappend
+++ b/meta-bsp/bm750/recipes/linux/linux-vuplus_3.9.6.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PR .= "-bsp1"
-
+PR .= "-bsp2"
 SRC_URI += "\
+        file://linux-sata_bcm7335.patch;patch=1;pnum=1 \
 "
diff --git a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-modules.bbappend b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-modules.bbappend
index f75dbca..5a6aad9 100644
--- a/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-modules.bbappend
+++ b/meta-bsp/vuduo2/recipes/vuplus/vuplus-dvb-modules.bbappend
@@ -1,7 +1,7 @@
-SRCDATE = "20140715"
+SRCDATE = "20140721"
 
 MODULES_NAME = "procmk\ndvb-bcm7424\nbrcmfb\nfpga_directc"
 
-SRC_URI[md5sum] = "f526c9764ca74fc24692390371ad517c"
-SRC_URI[sha256sum] = "c936db4c8b0a400fd6a237c6b259b8f1a7021adc9bc13f92d70e9ba793919a95"
+SRC_URI[md5sum] = "f7a99f1942960dd4538ee97820bb641d"
+SRC_URI[sha256sum] = "95884c5ae8ba10d0265ece36e4c5c760013cacdff235082dfdb66cdb4c688423"
 
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 2192246..b364ec6 100644
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -88,7 +88,7 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
 PN = "enigma2"
-PR = "r79"
+PR = "r80"
 
 inherit gitpkgv pythonnative
 
diff --git a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
index 3bc6dcd..42766a5 100644
--- a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
+++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
@@ -5,7 +5,7 @@ LICENSE = "CLOSED"
 DEPENDS = "mpfr gmp"
 RDEPENDS_${PN} = "sysfsutils vuplus-dvb-modules"
 
-SRC_DATE = "20140718_0"
+SRC_DATE = "20140721_0"
 
 PR = "r1_${SRC_DATE}"
 SRC_URI = ""
@@ -74,6 +74,6 @@ PACKAGES = "${PN}"
 
 FILES_${PN} = "/"
 
-SRC_URI[md5sum] = "3f28e2f90b2e596c2d5137baeb1d7444"
-SRC_URI[sha256sum] = "5514aefb8a753d8ee9da6bc35ff7d7df8b74edbafcbc0fbd1b177b587a202ba8"
+SRC_URI[md5sum] = "a47c373ab7f132c388bc3f74891fc80a"
+SRC_URI[sha256sum] = "81a6285dde9809a9d6c4b4dfd67bd4b09b54d01ba24fc82688509c3bda595b33"