Skip to contentSkip to conversation

ARM: at91: mmc portA support is only for at91sam9g20ek_2mmc board

PATCH In review Josh Wu 3 participants 4 messages Jan 19, 2015 – Feb 7, 2015 Arm/Microchip (AT91) SoC support

lore
Share & tools
lore

Josh Wu

author
#0 lore raw

PATCH 1/1 ARM: at91: mmc portA support is only for at91sam9g20ek_2mmc board

Current the MMC support will enable MCI port A, Which is only exist for 2mmc board.
So by default we need to disable MMC (port A) support. And only enable it for 2mmc board. Otherwise, dataflash won't work in at91sam9260ek board as MMC has confliction with Dataflash in the CLK pin.

Signed-off-by Josh Wu <[email protected]>

---

 configs/at91sam9g20ek_2mmc_defconfig | 3 +++
 configs/at91sam9g20ek_mmc_defconfig  | 3 ---
 include/configs/at91sam9260ek.h      | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 configs/at91sam9g20ek_2mmc_defconfig
 delete mode 100644 configs/at91sam9g20ek_mmc_defconfig
configs/at91sam9g20ek_2mmc_defconfig new file +3 -0
new file mode 100644
index 0000000..4eef04f
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
+CONFIG_ARM=y
+CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9g20ek_mmc_defconfig deleted +0 -3
deleted file mode 100644
index 8cca2e5..0000000
@@ -1,3 +0,0 @@
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_MMC"
-CONFIG_ARM=y
-CONFIG_TARGET_AT91SAM9260EK=y
include/configs/at91sam9260ek.h +4 -2
index a6a80de..c4b2e16 100644
@@ -90,7 +90,6 @@
 #define CONFIG_CMD_PING		1
 #define CONFIG_CMD_DHCP		1
 #define CONFIG_CMD_NAND		1
-#define CONFIG_CMD_MMC
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_USB		1
 

@@ -133,14 +132,17 @@
 # define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9260EK
 #endif
 
-/* DataFlash */
 #ifndef CONFIG_AT91SAM9G20EK_2MMC
+/* DataFlash */
 #define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH		1
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS		2
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1	0xD0000000	/* CS1 */
 #define AT91_SPI_CLK			15000000
+#else
+/* Enable MMC. The MCCK is conflicted with DataFlash */
+#define CONFIG_CMD_MMC
 #endif
 
 #ifdef CONFIG_AT91SAM9G20EK
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 ARM: at91: mmc portA support is only for at91sam9g20ek_2mmc board

Hi Josh,

configs/at91sam9g20ek_mmc_defconfig

Quoted 30 lines · Josh Wu

Current the MMC support will enable MCI port A, Which is only exist for 2mmc board.
So by default we need to disable MMC (port A) support. And only enable it for 2mmc board. Otherwise, dataflash won't work in at91sam9260ek board as MMC has confliction with Dataflash in the CLK pin.

Signed-off-by Josh Wu <[email protected]>

---

  configs/at91sam9g20ek_2mmc_defconfig | 3 +++
  configs/at91sam9g20ek_mmc_defconfig  | 3 ---
  include/configs/at91sam9260ek.h      | 6 ++++--
  3 files changed, 7 insertions(+), 5 deletions(-)

create mode 100644 configs/at91sam9g20ek_2mmc_defconfig delete mode 100644 configs/at91sam9g20ek_mmc_defconfig

configs/at91sam9g20ek_2mmc_defconfig new file +3 -0
new file mode 100644
index 0000000..4eef04f
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
+CONFIG_ARM=y
+CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9g20ek_mmc_defconfig deleted +0 -0
deleted file mode 100644
index 8cca2e5..0000000

If removed this default configuration file, we can not use mmc at all, am I right?

Quoted 26 lines
configs/at91sam9g20ek_mmc_defconfig deleted +0 -3
@@ -1,3 +0,0 @@
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_MMC"
-CONFIG_ARM=y
-CONFIG_TARGET_AT91SAM9260EK=y
include/configs/at91sam9260ek.h +1 -2
index a6a80de..c4b2e16 100644
@@ -90,7 +90,6 @@
  #define CONFIG_CMD_PING		1
  #define CONFIG_CMD_DHCP		1
  #define CONFIG_CMD_NAND		1
-#define CONFIG_CMD_MMC
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_USB		1
 

@@ -133,14 +132,17 @@
  # define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9260EK
  #endif
 
-/* DataFlash */
  #ifndef CONFIG_AT91SAM9G20EK_2MMC
+/* DataFlash */
  #define CONFIG_ATMEL_DATAFLASH_SPI
  #define CONFIG_HAS_DATAFLASH		1

include/configs/at91sam9260ek.h line 148

Quoted 10 lines
include/configs/at91sam9260ek.h +3 -0
  #define CONFIG_SYS_MAX_DATAFLASH_BANKS		2
  #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
  #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1	0xD0000000	/* CS1 */
  #define AT91_SPI_CLK			15000000
+#else
+/* Enable MMC. The MCCK is conflicted with DataFlash */
+#define CONFIG_CMD_MMC
  #endif
 
  #ifdef CONFIG_AT91SAM9G20EK

Best Regards,
Bo Shen

author
#2 lore raw

PATCH 1/1 ARM: at91: mmc portA support is only for at91sam9g20ek_2mmc board

Hi, Bo

Quoted 31 lines · Bo Shen

Hi Josh,

Quoted 28 lines · Josh Wu

Current the MMC support will enable MCI port A, Which is only exist for 2mmc board.
So by default we need to disable MMC (port A) support. And only enable it for 2mmc board. Otherwise, dataflash won't work in at91sam9260ek board
as MMC has confliction with Dataflash in the CLK pin.

Signed-off-by Josh Wu <[email protected]>

---

  configs/at91sam9g20ek_2mmc_defconfig | 3 +++
  configs/at91sam9g20ek_mmc_defconfig  | 3 ---
  include/configs/at91sam9260ek.h      | 6 ++++--
  3 files changed, 7 insertions(+), 5 deletions(-)

create mode 100644 configs/at91sam9g20ek_2mmc_defconfig delete mode 100644 configs/at91sam9g20ek_mmc_defconfig

configs/at91sam9g20ek_2mmc_defconfig new file +3 -0
new file mode 100644
index 0000000..4eef04f
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
+CONFIG_ARM=y
+CONFIG_TARGET_AT91SAM9260EK=y
(quoted diff) +0 -0
Quoted 8 lines

configs/at91sam9g20ek_mmc_defconfig

Quoted 5 lines

b/configs/at91sam9g20ek_mmc_defconfig
deleted file mode 100644
index 8cca2e5..0000000

configs/at91sam9g20ek_mmc_defconfig deleted +0 -0

If removed this default configuration file, we can not use mmc at all, am I right?

I change this file name from 'at91sam9g20ek_mmc_defconfig' to 'at91sam9g20ek_2mmc_defconfig'.
So only when you use 'at91sam9g20ek_2mmc_defconfig', the mmc is enabled.

Best Regards,
Josh Wu

Quoted 41 lines
Quoted 28 lines
configs/at91sam9g20ek_mmc_defconfig deleted +0 -3
@@ -1,3 +0,0 @@
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_MMC"
-CONFIG_ARM=y
-CONFIG_TARGET_AT91SAM9260EK=y
include/configs/at91sam9260ek.h +1 -2
index a6a80de..c4b2e16 100644
@@ -90,7 +90,6 @@
  #define CONFIG_CMD_PING        1
  #define CONFIG_CMD_DHCP        1
  #define CONFIG_CMD_NAND        1
-#define CONFIG_CMD_MMC
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_USB        1
 

@@ -133,14 +132,17 @@
  # define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9260EK
  #endif
 
-/* DataFlash */
  #ifndef CONFIG_AT91SAM9G20EK_2MMC
+/* DataFlash */
  #define CONFIG_ATMEL_DATAFLASH_SPI
  #define CONFIG_HAS_DATAFLASH        1

include/configs/at91sam9260ek.h line 148

Quoted 10 lines
include/configs/at91sam9260ek.h +3 -0
  #define CONFIG_SYS_MAX_DATAFLASH_BANKS        2
  #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0    0xC0000000 /* CS0 */
  #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1    0xD0000000 /* CS1 */
  #define AT91_SPI_CLK            15000000
+#else
+/* Enable MMC. The MCCK is conflicted with DataFlash */
+#define CONFIG_CMD_MMC
  #endif
 
  #ifdef CONFIG_AT91SAM9G20EK

Best Regards,
Bo Shen

#3 lore raw
In reply to Josh Wu

Dear Josh Wu,

Quoted 7 lines · Josh Wu

Current the MMC support will enable MCI port A, Which is only exist for 2mmc board.
So by default we need to disable MMC (port A) support. And only enable it for 2mmc board. Otherwise, dataflash won't work in at91sam9260ek board as MMC has confliction with Dataflash in the CLK pin.

Signed-off-by Josh Wu <[email protected]>
Quoted 8 lines

---

configs/at91sam9g20ek_2mmc_defconfig | 3 +++
configs/at91sam9g20ek_mmc_defconfig  | 3 ---
include/configs/at91sam9260ek.h      | 6 ++++--
3 files changed, 7 insertions(+), 5 deletions(-)

create mode 100644 configs/at91sam9g20ek_2mmc_defconfig delete mode 100644 configs/at91sam9g20ek_mmc_defconfig

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann