From 1309260f3068939c134cf91160346dbbc7d0df03 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 2 Jan 2016 16:44:57 +0000
Subject: [PATCH] udeb: Add USB PHY drivers to usb-modules and delete
 duplicates in core-modules

This leaves only PCIe PHYs in core-modules.
---
 debian/changelog                                  |  3 ++-
 .../armhf/modules/armhf-armmp/core-modules        | 15 +--------------
 .../armhf/modules/armhf-armmp/sata-modules        |  2 ++
 .../armhf/modules/armhf-armmp/usb-modules         | 15 +++++++++++++--
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1941b16e1..2d9f0bb47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ linux (4.3.3-3) UNRELEASED; urgency=medium
   * ptrace: being capable wrt a process requires mapped uids/gids
     (CVE-2015-8709)
   * KEYS: Fix race between read and revoke (CVE-2015-7550)
-  * [armhf] udeb: Add modular clock, GPIO, PHY and regulator drivers to
+  * [armhf] udeb: Add modular clock, GPIO, PCIe PHY and regulator drivers to
     core-modules (Closes: #809521)
+  * [armhf] udeb: Add more USB PHY drivers to usb-modules
   * drm/nouveau/pmu: do not assume a PMU is present (Closes: #809481)
   * [x86] drm/i915: Don't compare has_drrs strictly in pipe config
     (Closes: #808720)
diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules
index 0f439dccf..4d0f60146 100644
--- a/debian/installer/armhf/modules/armhf-armmp/core-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/core-modules
@@ -10,22 +10,9 @@ gpio-da9052 ?
 gpio-pca953x ?
 gpio-viperboard ?
 
-# PHY
-phy-am335x ?
-phy-am335x-control ?
-phy-exynos-usb2 ?
-phy-exynos5-usbdrd ?
-phy-exynos5250-sata ?
-phy-generic ?
-phy-mxs-usb ?
+# PCIe PHYs
 phy-omap-control ?
-phy-omap-usb2k ?
-phy-sun4i-usb ?
-phy-sun9i-usb ?
-phy-tegra-usb ?
 phy-ti-pipe3 ?
-phy-twl4030-usb ?
-phy-twl6030-usb ?
 
 # Regulators
 anatop-regulator ?
diff --git a/debian/installer/armhf/modules/armhf-armmp/sata-modules b/debian/installer/armhf/modules/armhf-armmp/sata-modules
index 2adb57f89..70d5e3674 100644
--- a/debian/installer/armhf/modules/armhf-armmp/sata-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/sata-modules
@@ -4,4 +4,6 @@ ahci_imx
 ahci_sunxi
 ahci_tegra
 sata_highbank
+
+# SATA PHYs
 phy-exynos5250-sata
diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/armhf/modules/armhf-armmp/usb-modules
index c16fab693..0be12dd08 100644
--- a/debian/installer/armhf/modules/armhf-armmp/usb-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules
@@ -8,7 +8,18 @@ ehci-exynos
 ehci-omap
 ehci-orion
 ehci-tegra
-phy-exynos-usb2
-phy-omap-usb2
 ci_hdrc_imx
+
+# 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 ?