svn commit: r355623 - in head/sys: arm64/conf conf
Emmanuel Vadot
manu at FreeBSD.org
Wed Dec 11 18:36:08 UTC 2019
Author: manu
Date: Wed Dec 11 18:36:07 2019
New Revision: 355623
URL: https://svnweb.freebsd.org/changeset/base/355623
Log:
arm64: Add explicit devices for dwmmc variant
We used to include the hisi version if soc_hisi_hi6220 was present,
include the altera version if dwmmc_altera was present and include
the rockchip version if soc_rockchip_rk3328 was present.
Now every version have it's own device directive.
The rockchip version isn't named dwmmc_rockchip because all other
rockchip driver are named rk_XXX.
MFC after: 1 month
Modified:
head/sys/arm64/conf/GENERIC
head/sys/conf/files.arm64
Modified: head/sys/arm64/conf/GENERIC
==============================================================================
--- head/sys/arm64/conf/GENERIC Wed Dec 11 18:24:43 2019 (r355622)
+++ head/sys/arm64/conf/GENERIC Wed Dec 11 18:36:07 2019 (r355623)
@@ -196,6 +196,8 @@ device mmc # mmc/sd bus
device mmcsd # mmc/sd flash cards
device dwmmc
device dwmmc_altera
+device dwmmc_hisi
+device rk_dwmmc
device rk_emmcphy
# Serial (COM) ports
Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64 Wed Dec 11 18:24:43 2019 (r355622)
+++ head/sys/conf/files.arm64 Wed Dec 11 18:36:07 2019 (r355623)
@@ -241,9 +241,9 @@ dev/hwpmc/hwpmc_arm64.c optional hwpmc
dev/hwpmc/hwpmc_arm64_md.c optional hwpmc
dev/mbox/mbox_if.m optional soc_brcm_bcm2837
dev/mmc/host/dwmmc.c optional dwmmc fdt
-dev/mmc/host/dwmmc_altera.c optional dwmmc fdt dwmmc_altera
-dev/mmc/host/dwmmc_hisi.c optional dwmmc fdt soc_hisi_hi6220
-dev/mmc/host/dwmmc_rockchip.c optional dwmmc fdt soc_rockchip_rk3328
+dev/mmc/host/dwmmc_altera.c optional dwmmc dwmmc_altera fdt
+dev/mmc/host/dwmmc_hisi.c optional dwmmc dwmmc_hisi fdt
+dev/mmc/host/dwmmc_rockchip.c optional dwmmc rk_dwmmc fdt
dev/neta/if_mvneta_fdt.c optional neta fdt
dev/neta/if_mvneta.c optional neta mdio mii
dev/ofw/ofw_cpu.c optional fdt
More information about the svn-src-all
mailing list