From e8bbad4b1af328f4a13c156c8cbe4715eddc382a Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 24 Feb 2016 00:40:13 +0000
Subject: [PATCH] udeb: Include more modules, including those needed on
 Firefly-RK3288

Thanks to Vagrant Cascadian.  Closes: #815476.
---
 debian/changelog                                   |  6 ++++++
 .../armhf/modules/armhf-armmp/core-modules         | 14 +-------------
 .../armhf/modules/armhf-armmp/mmc-modules          |  7 -------
 .../armhf/modules/armhf-armmp/usb-modules          | 14 --------------
 debian/installer/modules/mmc-modules               |  1 +
 debian/installer/modules/usb-modules               |  4 ++++
 debian/installer/package-list                      |  2 +-
 7 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63bfc4111..fe495433e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,12 @@ linux (4.4.2-4) UNRELEASED; urgency=medium
   [ Ben Hutchings ]
   * unix: correctly track in-flight fds in sending process user_struct
     (regression in 4.3.3-6)
+  * udeb: Include more modules, including those needed on Firefly-RK3288,
+    thanks to Vagrant Cascadian (Closes: #815476)
+    - [armhf] core-modules: Include regulator drivers by default
+    - mmc-modules: Include MMC controller drivers by default
+    - mmc-modules: Depends on usb-modules
+    - usb-modules: Include USB PHY drivers by default
 
  -- Roger Shimizu <rogershimizu@gmail.com>  Wed, 24 Feb 2016 01:30:38 +0900
 
diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules
index 7ea5f6dff..ff4ff9f95 100644
--- a/debian/installer/armhf/modules/armhf-armmp/core-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/core-modules
@@ -14,16 +14,4 @@ phy-omap-control ?
 phy-ti-pipe3 ?
 
 # Regulators
-anatop-regulator ?
-axp20x-regulator ?
-da9052-regulator ?
-gpio-regulator ?
-mc13783-regulator ?
-mc13892-regulator ?
-pbias-regulator
-pfuze100-regulator ?
-s2mpa01 ?
-s2mps11 ?
-s5m8767 ?
-ti-abb-regulator ?
-vexpress ?
+drivers/regulator/**
diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
index 287ff3faf..dadfd5334 100644
--- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
@@ -1,8 +1 @@
 #include <mmc-modules>
-sdhci-esdhc-imx
-sdhci-tegra
-mmci
-omap_hsmmc
-sunxi-mmc
-dw_mmc-exynos
-sdhci-bcm2835
diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/armhf/modules/armhf-armmp/usb-modules
index 663e91543..7861c823c 100644
--- a/debian/installer/armhf/modules/armhf-armmp/usb-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules
@@ -9,17 +9,3 @@ ehci-orion
 ehci-tegra
 ci_hdrc_imx
 dwc2
-
-# USB PHYs
-phy-am335x ?
-phy-am335x-control ?
-phy-exynos-usb2
-phy-exynos5-usbdrd ?
-phy-generic ?
-phy-mxs-usb
-phy-omap-usb2
-phy-sun4i-usb
-phy-sun9i-usb ?
-phy-tegra-usb ?
-phy-twl4030-usb ?
-phy-twl6030-usb ?
diff --git a/debian/installer/modules/mmc-modules b/debian/installer/modules/mmc-modules
index ce8b1764f..0bae54ed6 100644
--- a/debian/installer/modules/mmc-modules
+++ b/debian/installer/modules/mmc-modules
@@ -7,3 +7,4 @@ tifm_sd ?
 dw_mmc ?
 dw_mmc_pltfm ?
 toshsd ?
+drivers/mmc/host/**
diff --git a/debian/installer/modules/usb-modules b/debian/installer/modules/usb-modules
index 3198f1039..7e87f8153 100644
--- a/debian/installer/modules/usb-modules
+++ b/debian/installer/modules/usb-modules
@@ -7,3 +7,7 @@ sl811_cs -
 sl811-hcd -
 u132-hcd -
 whci-hcd -
+
+# Include USB PHY drivers by default
+drivers/phy/phy-*-usb* ?
+drivers/usb/phy/* ?
diff --git a/debian/installer/package-list b/debian/installer/package-list
index 74dfeb162..f51c4436b 100644
--- a/debian/installer/package-list
+++ b/debian/installer/package-list
@@ -300,7 +300,7 @@ Description: MMC/SD/SDIO core modules
  This package contains core modules for MMC/SD/SDIO support.
 
 Package: mmc-modules
-Depends: kernel-image, core-modules, mmc-core-modules
+Depends: kernel-image, core-modules, mmc-core-modules, usb-modules
 Priority: extra
 Description: MMC/SD card modules
  This package contains modules needed to support MMC (multimedia) and