From dbec0d53903524821120eb4478bb120e2b7b51b6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 21 Jul 2014 17:54:37 -0600 Subject: [PATCH] SAMA5D4-EK: HSMCI0 must use XDMAC0 (or made unsecure) --- configs/sama5d4-ek/nsh/defconfig | 8 +++++--- configs/sama5d4-ek/nxwm/defconfig | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig index 8c74636a57..5dd8cab1c5 100644 --- a/configs/sama5d4-ek/nsh/defconfig +++ b/configs/sama5d4-ek/nsh/defconfig @@ -205,8 +205,8 @@ CONFIG_SAMA5_HSMCI0=y # CONFIG_SAMA5_TC2 is not set # CONFIG_SAMA5_PWM is not set # CONFIG_SAMA5_ADC is not set -# CONFIG_SAMA5_XDMAC0 is not set -CONFIG_SAMA5_XDMAC1=y +CONFIG_SAMA5_XDMAC0=y +# CONFIG_SAMA5_XDMAC1 is not set CONFIG_SAMA5_UHPHS=y # CONFIG_SAMA5_UDPHS is not set CONFIG_SAMA5_EMACB=y @@ -214,6 +214,8 @@ CONFIG_SAMA5_EMAC0=y # CONFIG_SAMA5_EMAC1 is not set CONFIG_SAMA5_LCDC=y # CONFIG_SAMA5_ISI is not set +# CONFIG_SAMA5_SSC0 is not set +# CONFIG_SAMA5_SSC1 is not set # CONFIG_SAMA5_SHA is not set CONFIG_SAMA5_TRNG=y # CONFIG_SAMA5_ARM is not set @@ -292,7 +294,7 @@ CONFIG_SAMA5_TWI0_FREQUENCY=100000 # # HSMCI device driver options # -CONFIG_SAMA5_HSMCI0_XDMAC1=y +CONFIG_SAMA5_HSMCI0_XDMAC0=y # CONFIG_SAMA5_HSMCI_RDPROOF is not set # CONFIG_SAMA5_HSMCI_WRPROOF is not set diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig index b1fcb13686..efd10a8f11 100644 --- a/configs/sama5d4-ek/nxwm/defconfig +++ b/configs/sama5d4-ek/nxwm/defconfig @@ -205,8 +205,8 @@ CONFIG_SAMA5_HSMCI0=y # CONFIG_SAMA5_TC2 is not set # CONFIG_SAMA5_PWM is not set # CONFIG_SAMA5_ADC is not set -# CONFIG_SAMA5_XDMAC0 is not set -CONFIG_SAMA5_XDMAC1=y +CONFIG_SAMA5_XDMAC0=y +# CONFIG_SAMA5_XDMAC1 is not set CONFIG_SAMA5_UHPHS=y # CONFIG_SAMA5_UDPHS is not set CONFIG_SAMA5_EMACB=y @@ -214,6 +214,8 @@ CONFIG_SAMA5_EMAC0=y # CONFIG_SAMA5_EMAC1 is not set CONFIG_SAMA5_LCDC=y # CONFIG_SAMA5_ISI is not set +# CONFIG_SAMA5_SSC0 is not set +# CONFIG_SAMA5_SSC1 is not set # CONFIG_SAMA5_SHA is not set CONFIG_SAMA5_TRNG=y # CONFIG_SAMA5_ARM is not set @@ -292,7 +294,7 @@ CONFIG_SAMA5_TWI0_FREQUENCY=100000 # # HSMCI device driver options # -CONFIG_SAMA5_HSMCI0_XDMAC1=y +CONFIG_SAMA5_HSMCI0_XDMAC0=y # CONFIG_SAMA5_HSMCI_RDPROOF is not set # CONFIG_SAMA5_HSMCI_WRPROOF is not set