domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm27xx: disable duplicate sdhost driver

Browse Source 
Enabling both CONFIG_MMC_BCM2835 and CONFIG_MMC_BCM2835_SDHOST causes this
error in dmesg:
Error: Driver 'sdhost-bcm2835' is already registered, aborting...

Disabling CONFIG_MMC_BCM2835 and leaving CONFIG_MMC_BCM2835_SDHOST enabled
avoids this error.

Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B

Signed-off-by: John Audia <therealgraysky@proton.me>
[Disable driver for all subtargets, refresh configs, tweak description]
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
John Audia
2022-11-19 08:41:25 -05:00
committed by Álvaro Fernández Rojas
parent eaba63cdde
commit 3f7cc9d014
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/linux/bcm27xx/bcm2708/config-5.15
View File

@@ -105,7 +105,6 @@ CONFIG_CPU_THUMB_CAPABLE=y
CONFIG_CPU_TLB_V6=y CONFIG_CPU_TLB_V6=y
CONFIG_CPU_V6K=y CONFIG_CPU_V6K=y
CONFIG_CRC16=y CONFIG_CRC16=y
CONFIG_CRYPTO_BLAKE2S=y
CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
@@ -237,7 +236,7 @@ CONFIG_MFD_SYSCON=y
CONFIG_MIGHT_HAVE_CACHE_L2X0=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y
CONFIG_MIGRATION=y CONFIG_MIGRATION=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_BCM2835=y # CONFIG_MMC_BCM2835 is not set
CONFIG_MMC_BCM2835_DMA=y CONFIG_MMC_BCM2835_DMA=y
CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_MMC=y
CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2

3
target/linux/bcm27xx/bcm2709/config-5.15
View File

@@ -123,7 +123,6 @@ CONFIG_CPU_THUMB_CAPABLE=y
CONFIG_CPU_TLB_V7=y CONFIG_CPU_TLB_V7=y
CONFIG_CPU_V7=y CONFIG_CPU_V7=y
CONFIG_CRC16=y CONFIG_CRC16=y
CONFIG_CRYPTO_BLAKE2S=y
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32C=y
@@ -295,7 +294,7 @@ CONFIG_MICROCHIP_PHY=y
CONFIG_MIGHT_HAVE_CACHE_L2X0=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y
CONFIG_MIGRATION=y CONFIG_MIGRATION=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_BCM2835=y # CONFIG_MMC_BCM2835 is not set
CONFIG_MMC_BCM2835_DMA=y CONFIG_MMC_BCM2835_DMA=y
CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_MMC=y
CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2

4
target/linux/bcm27xx/bcm2710/config-5.15
View File

@@ -127,7 +127,6 @@ CONFIG_CRC16=y
CONFIG_CRYPTO_AES_ARM64=y CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_ARM64_BS=y CONFIG_CRYPTO_AES_ARM64_BS=y
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
CONFIG_CRYPTO_BLAKE2S=y
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32C=y
@@ -290,7 +289,7 @@ CONFIG_MFD_SYSCON=y
CONFIG_MICROCHIP_PHY=y CONFIG_MICROCHIP_PHY=y
CONFIG_MIGRATION=y CONFIG_MIGRATION=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_BCM2835=y # CONFIG_MMC_BCM2835 is not set
CONFIG_MMC_BCM2835_DMA=y CONFIG_MMC_BCM2835_DMA=y
CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_MMC=y
CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
@@ -422,6 +421,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_TIMER_OF=y CONFIG_TIMER_OF=y
CONFIG_TIMER_PROBE=y CONFIG_TIMER_PROBE=y
CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
CONFIG_TREE_RCU=y CONFIG_TREE_RCU=y
CONFIG_TREE_SRCU=y CONFIG_TREE_SRCU=y
# CONFIG_UCLAMP_TASK is not set # CONFIG_UCLAMP_TASK is not set

4
target/linux/bcm27xx/bcm2711/config-5.15
View File

@@ -131,7 +131,6 @@ CONFIG_CRC16=y
CONFIG_CRYPTO_AES_ARM64=y CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_ARM64_BS=y CONFIG_CRYPTO_AES_ARM64_BS=y
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
CONFIG_CRYPTO_BLAKE2S=y
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32C=y
@@ -297,7 +296,7 @@ CONFIG_MFD_CORE=y
CONFIG_MFD_SYSCON=y CONFIG_MFD_SYSCON=y
CONFIG_MIGRATION=y CONFIG_MIGRATION=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_BCM2835=y # CONFIG_MMC_BCM2835 is not set
CONFIG_MMC_BCM2835_DMA=y CONFIG_MMC_BCM2835_DMA=y
CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_MMC=y
CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
@@ -432,6 +431,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_TIMER_OF=y CONFIG_TIMER_OF=y
CONFIG_TIMER_PROBE=y CONFIG_TIMER_PROBE=y
CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
CONFIG_TREE_RCU=y CONFIG_TREE_RCU=y
CONFIG_TREE_SRCU=y CONFIG_TREE_SRCU=y
# CONFIG_UCLAMP_TASK is not set # CONFIG_UCLAMP_TASK is not set