fix build against 4.5.x kernel, add support for S850

4 files changed, 39 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b92f834a0583..37c2dcf8cbc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Mar 30 15:39:58 UTC 2016
+# Fri Apr 15 17:21:03 UTC 2016
 pkgbase = media-build-dvbsky
 	pkgdesc = Driver for DVBSky cards/boxes
 	pkgver = 20151028
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.dvbsky.net/Support_linux.html
 	install = media-build-dvbsky.install
 	arch = i686
@@ -16,12 +16,16 @@ pkgbase = media-build-dvbsky
 	replaces = dvbsky-dvb-drivers
 	source = http://www.dvbsky.net/download/linux/media_build-bst-151028.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 = bdb4cb06418cb2e36eb3219b4d4be329d5297db1704e6e3ef0c73dd6bb9721f1
+	sha256sums = c44b8dec256c271ceb59c6bd56df9f7a13735e3b9e110114e0504a48e99e6d10
 	sha256sums = e4991181b5a658f93ff6f454c22eb13955c8ae8ad19d3ddef1a0d7cc281c832e
 	sha256sums = 42e4e6b6011f1126e69d8fd1cc06af72b4baa396b551c18a54de632d572c7d8c
+	sha256sums = 3c01458ab75b9d78ea7eb76f98e6a5982d33d5ba4841e6ff6460939641ba73e9
 
 pkgname = media-build-dvbsky
 
diff --git a/4.5-compat.patch b/4.5-compat.patch
new file mode 100644
index 000000000000..1de4b3e9891a
--- /dev/null
+++ b/4.5-compat.patch
@@ -0,0 +1,11 @@
+--- a/linux/drivers/media/dvb-frontends/cxd2820r_core.c
++++ b/linux/drivers/media/dvb-frontends/cxd2820r_core.c
+@@ -727,7 +727,7 @@ struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,
+ #ifdef CONFIG_GPIOLIB
+ 		/* add GPIOs */
+ 		priv->gpio_chip.label = KBUILD_MODNAME;
+-		priv->gpio_chip.dev = &priv->i2c->dev;
++		priv->gpio_chip.parent = &priv->i2c->dev;
+ 		priv->gpio_chip.owner = THIS_MODULE;
+ 		priv->gpio_chip.direction_output =
+ 				cxd2820r_gpio_direction_output;
diff --git a/PKGBUILD b/PKGBUILD
index e335a2bca8f8..421961a0df8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ole Ernst <olebowle[at]gmx[dot]com>
 pkgname=media-build-dvbsky
 pkgver=20151028
-pkgrel=5
+pkgrel=6
 pkgdesc="Driver for DVBSky cards/boxes"
 arch=('i686' 'x86_64')
 url="http://www.dvbsky.net/Support_linux.html"
@@ -13,12 +13,16 @@ replaces=('dvbsky-dvb-drivers')
 install="$pkgname.install"
 source=("http://www.dvbsky.net/download/linux/media_build-bst-151028.tar.gz"
         'add_c2800e.patch'
+        'add_s850.patch'
         '4.3-compat.patch'
-        '4.4-compat.patch')
+        '4.4-compat.patch'
+        '4.5-compat.patch')
 sha256sums=('48a8726c6799025be06bc5b8bafa8449ca02abf8fe578e805f91707a5edf1e52'
             'bdb4cb06418cb2e36eb3219b4d4be329d5297db1704e6e3ef0c73dd6bb9721f1'
+            'c44b8dec256c271ceb59c6bd56df9f7a13735e3b9e110114e0504a48e99e6d10'
             'e4991181b5a658f93ff6f454c22eb13955c8ae8ad19d3ddef1a0d7cc281c832e'
-            '42e4e6b6011f1126e69d8fd1cc06af72b4baa396b551c18a54de632d572c7d8c')
+            '42e4e6b6011f1126e69d8fd1cc06af72b4baa396b551c18a54de632d572c7d8c'
+            '3c01458ab75b9d78ea7eb76f98e6a5982d33d5ba4841e6ff6460939641ba73e9')
 
 prepare() {
   cd media_build-bst
@@ -26,8 +30,10 @@ prepare() {
   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"
 }
diff --git a/add_s850.patch b/add_s850.patch
new file mode 100644
index 000000000000..c69a36b5045d
--- /dev/null
+++ b/add_s850.patch
@@ -0,0 +1,13 @@
+--- a/linux/drivers/media/pci/cx23885/cx23885-cards.c
++++ b/linux/drivers/media/pci/cx23885/cx23885-cards.c
+@@ -987,6 +987,10 @@ struct cx23885_subid cx23885_subids[] =
+ 		.subdevice = 0x0950,
+ 		.card      = CX23885_BOARD_DVBSKY_S950,
+ 	}, {
++		.subvendor = 0x14f1,
++		.subdevice = 0x8512,
++		.card      = CX23885_BOARD_DVBSKY_S950,
++	}, {
+ 		.subvendor = 0x4254,
+ 		.subdevice = 0x0952,
+ 		.card      = CX23885_BOARD_DVBSKY_S952,