Skip to content

Commit 875691c

Browse files
committed
Merge tag 'at91-fixes-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes
Microchip AT91 fixes for v6.17 This update includes: - adaptation to the SDHCI capabilities on sama7d65 curiosity board DT as SDHCI quirks are not in place yet. SD/MMC don't work without these - addition of one Kconfig symbol that is already used in DMA tree for 6.17. XDMA cannot be selected if not present. * tag 'at91-fixes-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: microchip: sama7d65: Force SDMMC Legacy mode ARM: at91: select ARCH_MICROCHIP Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents f2e8f1f + 217efb4 commit 875691c

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

arch/arm/boot/dts/microchip/at91-sama7d65_curiosity.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@
387387

388388
&sdmmc1 {
389389
bus-width = <4>;
390+
no-1-8-v;
391+
sdhci-caps-mask = <0x0 0x00200000>;
390392
pinctrl-names = "default";
391393
pinctrl-0 = <&pinctrl_sdmmc1_default>;
392394
status = "okay";

arch/arm/mach-at91/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2+
config ARCH_MICROCHIP
3+
bool
4+
25
menuconfig ARCH_AT91
36
bool "AT91/Microchip SoCs"
47
depends on (CPU_LITTLE_ENDIAN && (ARCH_MULTI_V4T || ARCH_MULTI_V5)) || \
@@ -8,6 +11,7 @@ menuconfig ARCH_AT91
811
select GPIOLIB
912
select PINCTRL
1013
select SOC_BUS
14+
select ARCH_MICROCHIP
1115

1216
if ARCH_AT91
1317
config SOC_SAMV7

0 commit comments

Comments
 (0)