[SRU][Bionic/raspi2][PATCH] UBUNTU: [Config] raspi2: Remove upstream mmc modules

[Juerg Haefliger]

From: Adam Smith <blondesaluki at gmail.com>

BugLink: https://bugs.launchpad.net/bugs/1762835

The Bionic Linux-raspi2 kernel has both the upstream and downstream pi
mmc modules enabled. Running the latest server image users can see
this error in dmesg:

Error: Driver 'sdhost-bcm2835' is already registered, aborting...

Due to this error the pi server image is failing a testcase on the iso
tracker.  It is also not clear to users what mmc modules are in use.

The attached patch removes the upstream mmc modules from the kernel config.

Signed-off-by: Adam Smith <blondesaluki at gmail.com>
[juergh:
 - Adjusted context.
 - Kept CONFIG_MMC_SDHCI_IPROC=m to match rpi-4.19.y.]
Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 debian.raspi2/config/config.common.ubuntu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index f27d75f7e828..cb8132cdb3f7 100644
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -3484,7 +3484,7 @@ CONFIG_MMA9553=m
 CONFIG_MMC=y
 CONFIG_MMC35240=m
 CONFIG_MMC_ARMMMCI=y
-CONFIG_MMC_BCM2835=y
+# CONFIG_MMC_BCM2835 is not set
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-- 
2.20.1