hardware/t100ha: Switch to linux-next with patches

Both of these patches are from the following Google Drive:

https://drive.google.com/folderview?id=0B4DiU2o72FbuejQ1S2VZZW5xV2c

The meta-keys-asus.patch (which is called just meta-keys.patch in this
repository) is used verbatim.

However, the baytrail-backlight.4.4.patch (here just backlight.patch) is
a rebased version of the patch from the Google Drive with a few
modifications by me, which boils down to:

 * Remove the module parameter force_backlight_pmic, because this module
   is hardware-specific so we don't actually need to do that (and *if*
   we want to do that we'd compile it in directly).
 * Add an unused pipe function argument to vlv_pmic_setup_backlight().

As the backlight patch introduces the functions intel_soc_pmic_readb()
and intel_soc_pmic_writeb() which are not available at module link time,
I have also added DRM_I915 to be compiled into the kernel.

In addition I needed to disable VIDEO_EM28XX and RAPIDIO, because they
do not compile with linux-next-20160226 and I didn't bother to provide
fixes because it's for hardware that is not existing on the T100HA.

Note that I'm using linux-next-20160226 here instead of 20160229 because
the latter has some networking I/O issues right now.

This makes the backlight, battery status and charging usable on the
T100HA and the fixes from the drm-intel-fixes branch are no longer
needed because they're already in linux-next-20160229.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 23 insertions, 9 deletions

diff --git a/modules/hardware/t100ha/default.nix b/modules/hardware/t100ha/default.nix
index 29645636..054680e8 100644
--- a/modules/hardware/t100ha/default.nix
+++ b/modules/hardware/t100ha/default.nix
@@ -12,22 +12,28 @@ in {
     # few additional patches:
     boot.kernelPackages = let
       nixpkgs = import ../../../nixpkgs-path.nix;
+      linuxNextVersion = "20160226";
       mkKernel = import "${nixpkgs}/pkgs/os-specific/linux/kernel/generic.nix";
       t100haKernel = mkKernel rec {
         version = "4.5-rc5";
-        modDirVersion = "4.5.0-rc5";
+        modDirVersion = "4.5.0-rc5-next-${linuxNextVersion}";
         extraMeta.branch = "4.5";
 
-        src = pkgs.fetchurl {
-          url = "mirror://kernel/linux/kernel/v4.x/testing/"
-              + "linux-${version}.tar.xz";
-          sha256 = "06qlypnrlkckxhf3clq6l2d3kps7rwfw811sxapjbnhzjd75fcx8";
+        src = pkgs.fetchgit {
+          url = "git://git.kernel.org/pub/scm/linux/kernel/git/next/"
+              + "linux-next.git";
+          rev = "refs/tags/next-${linuxNextVersion}";
+          sha256 = "0q39mnjyi8jany03b4ral34hicdrgjpab53hg712jzhbcngj5kh3";
         };
 
-        kernelPatches = lib.singleton {
-          name = "drm-fixes.patch";
-          patch = ./drm-fixes.patch;
-        };
+        kernelPatches = [
+          { name = "backlight";
+            patch = ./backlight.patch;
+          }
+          { name = "meta-keys";
+            patch = ./meta-keys.patch;
+          }
+        ];
 
         extraConfig = ''
           MMC y
@@ -36,6 +42,14 @@ in {
           MMC_SDHCI_ACPI y
           PINCTRL_CHERRYVIEW y
           INTEL_SOC_PMIC y
+
+          AGP n
+          DRM y
+          DRM_I915 y
+
+          # These do not compile as of 4.5.0-rc5-next-20160226:
+          VIDEO_EM28XX n
+          RAPIDIO n
         '';
 
         features.iwlwifi = true;