upgpkg: 20160430-1

4 files changed, 12 insertions, 213 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37c2dcf8cbc5..0d18d1365792 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Apr 15 17:21:03 UTC 2016
+# Fri Apr 29 16:35:47 UTC 2016
 pkgbase = media-build-dvbsky
 	pkgdesc = Driver for DVBSky cards/boxes
-	pkgver = 20151028
-	pkgrel = 6
+	pkgver = 20160430
+	pkgrel = 1
 	url = http://www.dvbsky.net/Support_linux.html
 	install = media-build-dvbsky.install
 	arch = i686
@@ -14,17 +14,13 @@ pkgbase = media-build-dvbsky
 	depends = dvbsky-firmware
 	conflicts = dvbsky-dvb-drivers
 	replaces = dvbsky-dvb-drivers
-	source = http://www.dvbsky.net/download/linux/media_build-bst-151028.tar.gz
+	source = http://www.dvbsky.net/download/linux/media_build-bst-160430.tar.gz
 	source = add_c2800e.patch
 	source = add_s850.patch
-	source = 4.3-compat.patch
-	source = 4.4-compat.patch
 	source = 4.5-compat.patch
-	sha256sums = 48a8726c6799025be06bc5b8bafa8449ca02abf8fe578e805f91707a5edf1e52
+	sha256sums = b3c612d792834d14c981c400022ec923c154e10161121cf730a09b4ed4e35b04
 	sha256sums = bdb4cb06418cb2e36eb3219b4d4be329d5297db1704e6e3ef0c73dd6bb9721f1
 	sha256sums = c44b8dec256c271ceb59c6bd56df9f7a13735e3b9e110114e0504a48e99e6d10
-	sha256sums = e4991181b5a658f93ff6f454c22eb13955c8ae8ad19d3ddef1a0d7cc281c832e
-	sha256sums = 42e4e6b6011f1126e69d8fd1cc06af72b4baa396b551c18a54de632d572c7d8c
 	sha256sums = 3c01458ab75b9d78ea7eb76f98e6a5982d33d5ba4841e6ff6460939641ba73e9
 
 pkgname = media-build-dvbsky
diff --git a/4.3-compat.patch b/4.3-compat.patch
deleted file mode 100644
index a3eddd4958cd..000000000000
--- a/4.3-compat.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/linux/drivers/media/i2c/adv7604.c
-+++ b/linux/drivers/media/i2c/adv7604.c
-@@ -606,12 +606,8 @@ static void adv7604_set_hpd(struct adv76
- {
- 	unsigned int i;
- 
--	for (i = 0; i < state->info->num_dv_ports; ++i) {
--		if (IS_ERR(state->hpd_gpio[i]))
--			continue;
--
-+	for (i = 0; i < state->info->num_dv_ports; ++i)
- 		gpiod_set_value_cansleep(state->hpd_gpio[i], hpd & BIT(i));
--	}
- 
- 	v4l2_subdev_notify(&state->sd, ADV7604_HOTPLUG, &hpd);
- }
-@@ -2796,13 +2792,13 @@ static int adv7604_probe(struct i2c_clie
- 	/* Request GPIOs. */
- 	for (i = 0; i < state->info->num_dv_ports; ++i) {
- 		state->hpd_gpio[i] =
--			devm_gpiod_get_index(&client->dev, "hpd", i);
-+			devm_gpiod_get_index_optional(&client->dev, "hpd", i,
-+						      GPIOD_OUT_LOW);
- 		if (IS_ERR(state->hpd_gpio[i]))
--			continue;
--
--		gpiod_direction_output(state->hpd_gpio[i], 0);
-+			return PTR_ERR(state->hpd_gpio[i]);
- 
--		v4l_info(client, "Handling HPD %u GPIO\n", i);
-+		if (state->hpd_gpio[i])
-+			v4l_info(client, "Handling HPD %u GPIO\n", i);
- 	}
- 
- 	state->timings = cea640x480;
---- a/linux/drivers/media/radio/si4713/si4713.c
-+++ b/linux/drivers/media/radio/si4713/si4713.c
-@@ -383,7 +383,7 @@ static int si4713_powerup(struct si4713_
- 		}
- 	}
- 
--	if (!IS_ERR(sdev->gpio_reset)) {
-+	if (sdev->gpio_reset) {
- 		udelay(50);
- 		gpiod_set_value(sdev->gpio_reset, 1);
- 	}
-@@ -407,8 +407,7 @@ static int si4713_powerup(struct si4713_
- 						SI4713_STC_INT | SI4713_CTS);
- 		return err;
- 	}
--	if (!IS_ERR(sdev->gpio_reset))
--		gpiod_set_value(sdev->gpio_reset, 0);
-+	gpiod_set_value(sdev->gpio_reset, 0);
- 
- 
- 	if (sdev->vdd) {
-@@ -447,7 +446,7 @@ static int si4713_powerdown(struct si471
- 		v4l2_dbg(1, debug, &sdev->sd, "Power down response: 0x%02x\n",
- 				resp[0]);
- 		v4l2_dbg(1, debug, &sdev->sd, "Device in reset mode\n");
--		if (!IS_ERR(sdev->gpio_reset))
-+		if (sdev->gpio_reset)
- 			gpiod_set_value(sdev->gpio_reset, 0);
- 
- 		if (sdev->vdd) {
-@@ -1460,14 +1459,9 @@ static int si4713_probe(struct i2c_clien
- 		goto exit;
- 	}
- 
--	sdev->gpio_reset = devm_gpiod_get(&client->dev, "reset");
--	if (!IS_ERR(sdev->gpio_reset)) {
--		gpiod_direction_output(sdev->gpio_reset, 0);
--	} else if (PTR_ERR(sdev->gpio_reset) == -ENOENT) {
--		dev_dbg(&client->dev, "No reset GPIO assigned\n");
--	} else if (PTR_ERR(sdev->gpio_reset) == -ENOSYS) {
--		dev_dbg(&client->dev, "No reset GPIO support\n");
--	} else {
-+	sdev->gpio_reset = devm_gpiod_get_optional(&client->dev, "reset",
-+						   GPIOD_OUT_LOW);
-+	if (IS_ERR(sdev->gpio_reset)) {
- 		rval = PTR_ERR(sdev->gpio_reset);
- 		dev_err(&client->dev, "Failed to request gpio: %d\n", rval);
- 		goto exit;
diff --git a/4.4-compat.patch b/4.4-compat.patch
deleted file mode 100644
index 36d2f2ea5fd3..000000000000
--- a/4.4-compat.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/linux/drivers/media/pci/cx23885/cx23885-core.c
-+++ b/linux/drivers/media/pci/cx23885/cx23885-core.c
-@@ -1989,9 +1989,9 @@ static int cx23885_initdev(struct pci_de
- 		(unsigned long long)pci_resource_start(pci_dev, 0));
- 
- 	pci_set_master(pci_dev);
--	if (!pci_dma_supported(pci_dev, 0xffffffff)) {
-+	err = pci_set_dma_mask(pci_dev, 0xffffffff);
-+	if (err) {
- 		printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
--		err = -EIO;
- 		goto fail_context;
- 	}
- 
---- a/linux/drivers/media/pci/cx25821/cx25821-core.c
-+++ b/linux/drivers/media/pci/cx25821/cx25821-core.c
-@@ -1315,7 +1315,8 @@ static int cx25821_initdev(struct pci_de
- 		dev->pci_lat, (unsigned long long)dev->base_io_addr);
- 
- 	pci_set_master(pci_dev);
--	if (!pci_dma_supported(pci_dev, 0xffffffff)) {
-+	err = pci_set_dma_mask(pci_dev, 0xffffffff);
-+	if (err) {
- 		pr_err("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
- 		err = -EIO;
- 		goto fail_irq;
---- a/linux/drivers/media/pci/cx88/cx88-alsa.c
-+++ b/linux/drivers/media/pci/cx88/cx88-alsa.c
-@@ -890,9 +890,9 @@ static int snd_cx88_create(struct snd_ca
- 		return err;
- 	}
- 
--	if (!pci_dma_supported(pci,DMA_BIT_MASK(32))) {
-+	err = pci_set_dma_mask(pci,DMA_BIT_MASK(32));
-+	if (err) {
- 		dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
--		err = -EIO;
- 		cx88_core_put(core, pci);
- 		return err;
- 	}
---- a/linux/drivers/media/pci/cx88/cx88-mpeg.c
-+++ b/linux/drivers/media/pci/cx88/cx88-mpeg.c
-@@ -397,7 +397,8 @@ static int cx8802_init_common(struct cx8
- 	if (pci_enable_device(dev->pci))
- 		return -EIO;
- 	pci_set_master(dev->pci);
--	if (!pci_dma_supported(dev->pci,DMA_BIT_MASK(32))) {
-+	err = pci_set_dma_mask(dev->pci,DMA_BIT_MASK(32));
-+	if (err) {
- 		printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);
- 		return -EIO;
- 	}
---- a/linux/drivers/media/pci/cx88/cx88-video.c
-+++ b/linux/drivers/media/pci/cx88/cx88-video.c
-@@ -1332,9 +1332,9 @@ static int cx8800_initdev(struct pci_dev
- 	       dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
- 
- 	pci_set_master(pci_dev);
--	if (!pci_dma_supported(pci_dev,DMA_BIT_MASK(32))) {
-+	err = pci_set_dma_mask(pci_dev,DMA_BIT_MASK(32));
-+	if (err) {
- 		printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name);
--		err = -EIO;
- 		goto fail_core;
- 	}
- 	dev->alloc_ctx = vb2_dma_sg_init_ctx(&pci_dev->dev);
---- a/linux/drivers/media/pci/saa7134/saa7134-core.c
-+++ b/linux/drivers/media/pci/saa7134/saa7134-core.c
-@@ -948,9 +948,9 @@ static int saa7134_initdev(struct pci_de
- 	       pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
- 	       dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
- 	pci_set_master(pci_dev);
--	if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {
-+	err = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32));
-+	if (err) {
- 		printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name);
--		err = -EIO;
- 		goto fail1;
- 	}
- 
---- a/linux/drivers/media/pci/saa7164/saa7164-core.c
-+++ b/linux/drivers/media/pci/saa7164/saa7164-core.c
-@@ -1224,9 +1224,9 @@ static int saa7164_initdev(struct pci_de
- 
- 	pci_set_master(pci_dev);
- 	/* TODO */
--	if (!pci_dma_supported(pci_dev, 0xffffffff)) {
-+	err = pci_set_dma_mask(pci_dev, 0xffffffff);
-+	if (err) {
- 		printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
--		err = -EIO;
- 		goto fail_irq;
- 	}
- 
---- a/linux/drivers/media/pci/tw68/tw68-core.c
-+++ b/linux/drivers/media/pci/tw68/tw68-core.c
-@@ -256,9 +256,9 @@ static int tw68_initdev(struct pci_dev *
- 		dev->name, pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
- 		dev->pci_lat, (u64)pci_resource_start(pci_dev, 0));
- 	pci_set_master(pci_dev);
--	if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {
-+	err = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32));
-+	if (err) {
- 		pr_info("%s: Oops: no 32bit PCI DMA ???\n", dev->name);
--		err = -EIO;
- 		goto fail1;
- 	}
- 
diff --git a/PKGBUILD b/PKGBUILD
index 421961a0df8a..35e96ad3016b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ole Ernst <olebowle[at]gmx[dot]com>
 pkgname=media-build-dvbsky
-pkgver=20151028
-pkgrel=6
+pkgver=20160430
+pkgrel=1
 pkgdesc="Driver for DVBSky cards/boxes"
 arch=('i686' 'x86_64')
 url="http://www.dvbsky.net/Support_linux.html"
@@ -11,42 +11,36 @@ makedepends=('linux-headers' 'perl-proc-processtable')
 conflicts=('dvbsky-dvb-drivers')
 replaces=('dvbsky-dvb-drivers')
 install="$pkgname.install"
-source=("http://www.dvbsky.net/download/linux/media_build-bst-151028.tar.gz"
+source=("http://www.dvbsky.net/download/linux/media_build-bst-160430.tar.gz"
         'add_c2800e.patch'
         'add_s850.patch'
-        '4.3-compat.patch'
-        '4.4-compat.patch'
         '4.5-compat.patch')
-sha256sums=('48a8726c6799025be06bc5b8bafa8449ca02abf8fe578e805f91707a5edf1e52'
+sha256sums=('b3c612d792834d14c981c400022ec923c154e10161121cf730a09b4ed4e35b04'
             'bdb4cb06418cb2e36eb3219b4d4be329d5297db1704e6e3ef0c73dd6bb9721f1'
             'c44b8dec256c271ceb59c6bd56df9f7a13735e3b9e110114e0504a48e99e6d10'
-            'e4991181b5a658f93ff6f454c22eb13955c8ae8ad19d3ddef1a0d7cc281c832e'
-            '42e4e6b6011f1126e69d8fd1cc06af72b4baa396b551c18a54de632d572c7d8c'
             '3c01458ab75b9d78ea7eb76f98e6a5982d33d5ba4841e6ff6460939641ba73e9')
 
 prepare() {
-  cd media_build-bst
+  cd media_build-bst-160430
   ln -sr v4l/sit2_op.o.x${CARCH: -2} v4l/sit2_op.o
   cp v4l/sit2_mod.dvb linux/drivers/media/dvb-frontends/sit2_mod.c
   sed -i '/depmod/d' v4l/Makefile v4l/scripts/make_makefile.pl
   patch -p1 -i ../add_c2800e.patch
   patch -p1 -i ../add_s850.patch
-  patch -p1 -i ../4.3-compat.patch
-  patch -p1 -i ../4.4-compat.patch
   patch -p1 -i ../4.5-compat.patch
   export _kernver=$(</usr/lib/modules/extramodules-[0-9]\.+([0-9])-ARCH/version)
   sed -i "s/KERNEL_VERSION=.*/KERNEL_VERSION=$_kernver/" "$startdir/$install"
 }
 
 build() {
-  cd media_build-bst
+  cd media_build-bst-160430
   #target prepare doesn't like parallel jobs
   make VER=$_kernver -j1 prepare
   make VER=$_kernver
 }
 
 package() {
-  cd media_build-bst
+  cd media_build-bst-160430
   make DESTDIR="$pkgdir" KDIR26="/usr/lib/modules/$_kernver/updates/kernel/drivers/media" media-install
   find "$pkgdir" -type f -name '*.ko' -exec gzip -9 {} \;
 }