[kernel] r20224 - in dists/sid/linux/debian: . installer/i386 installer/i386/modules/i386 patches patches/bugfix/x86

[Ben Hutchings]

Author: benh
Date: Mon Jun 10 00:00:54 2013
New Revision: 20224

Log:
[i386] udeb: Add viafb to fb-modules (Closes: #705788)

- [i386] udeb: Move i2c-algo-bit to i2c-modules and make fb-modules depend on it
- viafb: Autoload on OLPC XO 1.5 only

Added:
   dists/sid/linux/debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/installer/i386/modules/i386/fb-modules
   dists/sid/linux/debian/installer/i386/modules/i386/i2c-modules
   dists/sid/linux/debian/installer/i386/package-list
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Jun  9 23:55:04 2013	(r20223)
+++ dists/sid/linux/debian/changelog	Mon Jun 10 00:00:54 2013	(r20224)
@@ -53,6 +53,10 @@
   * [armel/iop32x,armel/ixp4xx] Disable OABI_COMPAT, PCI_QUIRKS to reduce
     kernel size (fixes FTBFS)
   * ath9k: Disable PowerSave by default (Closes: #695968)
+  * [i386] udeb: Add viafb to fb-modules (Closes: #705788)
+    - [i386] udeb: Move i2c-algo-bit to i2c-modules and make fb-modules
+      depend on it
+    - viafb: Autoload on OLPC XO 1.5 only
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 08 Jun 2013 15:25:11 +0100
 

Modified: dists/sid/linux/debian/installer/i386/modules/i386/fb-modules
==============================================================================
--- dists/sid/linux/debian/installer/i386/modules/i386/fb-modules	Sun Jun  9 23:55:04 2013	(r20223)
+++ dists/sid/linux/debian/installer/i386/modules/i386/fb-modules	Mon Jun 10 00:00:54 2013	(r20224)
@@ -2,3 +2,4 @@
 lxfb ?
 vesafb ?
 vga16fb
+viafb

Modified: dists/sid/linux/debian/installer/i386/modules/i386/i2c-modules
==============================================================================
--- dists/sid/linux/debian/installer/i386/modules/i386/i2c-modules	Sun Jun  9 23:55:04 2013	(r20223)
+++ dists/sid/linux/debian/installer/i386/modules/i386/i2c-modules	Mon Jun 10 00:00:54 2013	(r20224)
@@ -1 +1,2 @@
 #include <i2c-modules>
+i2c-algo-bit

Modified: dists/sid/linux/debian/installer/i386/package-list
==============================================================================
--- dists/sid/linux/debian/installer/i386/package-list	Sun Jun  9 23:55:04 2013	(r20223)
+++ dists/sid/linux/debian/installer/i386/package-list	Mon Jun 10 00:00:54 2013	(r20224)
@@ -21,3 +21,6 @@
 
 Package: nbd-modules
 Depends: kernel-image
+
+Package: fb-modules
+Depends: kernel-image, i2c-modules

Added: dists/sid/linux/debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch	Mon Jun 10 00:00:54 2013	(r20224)
@@ -0,0 +1,33 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 20 Apr 2013 15:52:02 +0100
+Subject: viafb: Autoload on OLPC XO 1.5 only
+Bug-Debian: http://bugs.debian.org/705788
+
+It appears that viafb won't work automatically on all the boards for
+which it has a PCI device ID match.  Currently, it is blacklisted by
+udev along with most other framebuffer drivers, so this doesn't matter
+much.
+
+However, this driver is required for console support on the XO 1.5.
+We need to allow it to be autoloaded on this model only, and then
+un-blacklist it in udev.
+
+---
+--- a/drivers/video/via/via-core.c
++++ b/drivers/video/via/via-core.c
+@@ -753,7 +753,14 @@ static struct pci_device_id via_pci_tabl
+ 	  .driver_data = UNICHROME_VX900 },
+ 	{ }
+ };
+-MODULE_DEVICE_TABLE(pci, via_pci_table);
++
++static const struct pci_device_id via_pci_autoload_table[] __initconst = {
++	/* OLPC XO 1.5 */
++	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX855_DID),
++	  .subvendor = 0x152d, .subdevice = 0x0833 },
++	{ }
++};
++MODULE_DEVICE_TABLE(pci, via_pci_autoload_table);
+ 
+ static struct pci_driver via_driver = {
+ 	.name		= "viafb",

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Sun Jun  9 23:55:04 2013	(r20223)
+++ dists/sid/linux/debian/patches/series	Mon Jun 10 00:00:54 2013	(r20224)
@@ -107,3 +107,4 @@
 bugfix/s390/s390-add-pgste-to-ptep_modify_prot_start.patch
 bugfix/powerpc/powerpc-fix-build-error-in-stable-3.9.patch
 bugfix/all/ath9k-Disable-PowerSave-by-default.patch
+bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch