mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 09/14] at91sam9x5ek: Configure MMC in DT
Date: Thu, 23 Mar 2017 06:23:53 -0700	[thread overview]
Message-ID: <20170323132358.8539-10-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20170323132358.8539-1-andrew.smirnov@gmail.com>

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/boards/at91sam9x5ek/init.c | 20 --------------------
 arch/arm/dts/at91sam9x5ek.dts       |  5 +++++
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c
index fca5e7d..8acb23c 100644
--- a/arch/arm/boards/at91sam9x5ek/init.c
+++ b/arch/arm/boards/at91sam9x5ek/init.c
@@ -168,25 +168,6 @@ static void ek_add_device_lcdc(void)
 static void ek_add_device_lcdc(void) {}
 #endif
 
-/*
- * MCI (SD/MMC)
- */
-/* mci0 detect_pin is revision dependent */
-static struct atmel_mci_platform_data mci0_data = {
-	.bus_width	= 4,
-	.detect_pin	= AT91_PIN_PD15,
-	.wp_pin		= -EINVAL,
-};
-
-static void ek_add_device_mci(void)
-{
-	if (at91sam9x5ek_cm_is_vendor(VENDOR_COGENT))
-		mci0_data.detect_pin = -EINVAL;
-
-	/* MMC0 */
-	at91_add_device_mci(0, &mci0_data);
-}
-
 static const struct spi_board_info ek_cm_cogent_spi_devices[] = {
 	{
 		.name		= "mtd_dataflash",
@@ -255,7 +236,6 @@ static int at91sam9x5ek_devices_init(void)
 	ek_add_device_nand();
 	ek_add_device_eth();
 	ek_add_device_spi();
-	ek_add_device_mci();
 	ek_add_device_usb();
 	ek_add_device_lcdc();
 
diff --git a/arch/arm/dts/at91sam9x5ek.dts b/arch/arm/dts/at91sam9x5ek.dts
index f9ae091..00bb86a 100644
--- a/arch/arm/dts/at91sam9x5ek.dts
+++ b/arch/arm/dts/at91sam9x5ek.dts
@@ -9,6 +9,11 @@
 #include <arm/at91sam9x5ek.dtsi>
 
 / {
+	aliases {
+		mmc0 = &mmc0;
+		mmc1 = &mmc1;
+	};
+
 	i2c-gpio-0 {
 		status = "okay";
 	};
-- 
2.9.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2017-03-23 13:24 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-23 13:23 [PATCH 00/14] AT91, at91sam9x5ek updates (part III/III) Andrey Smirnov
2017-03-23 13:23 ` [PATCH 01/14] at91sam9x5ek: Convert to mult-image build Andrey Smirnov
2017-04-16  8:24   ` Sam Ravnborg
2017-04-19  9:46     ` Sascha Hauer
2017-03-23 13:23 ` [PATCH 02/14] at91sam9x5ek: Add CONFIG_KALLSYMS to defconfig Andrey Smirnov
2017-03-23 13:23 ` [PATCH 03/14] at91sam9x5ek: Add preliminary device tree support Andrey Smirnov
2017-03-23 13:23 ` [PATCH 04/14] at91sam9x5ek: Convert to use DT clock tree Andrey Smirnov
2017-03-23 13:23 ` [PATCH 05/14] at91sam9x5ek: Remove at91sam9x5ek_mem_init() Andrey Smirnov
2017-03-23 13:23 ` [PATCH 06/14] at91: Enable PINCTRL for SOC_AT91SAM9 Andrey Smirnov
2017-03-23 13:23 ` [PATCH 07/14] at91sam9x5ek: Configure LEDs in DT Andrey Smirnov
2017-03-23 13:23 ` [PATCH 08/14] at91sam9x5ek: Configure I2C via DT Andrey Smirnov
2017-03-23 13:23 ` Andrey Smirnov [this message]
2017-03-23 13:23 ` [PATCH 10/14] at91sam9x5ek: Configure SPI in DT Andrey Smirnov
2017-03-23 13:23 ` [PATCH 11/14] at91sam9x5ek: Configure 1-wire " Andrey Smirnov
2017-03-23 13:23 ` [PATCH 12/14] at91sam9x5ek: Configure USB " Andrey Smirnov
2017-03-23 13:23 ` [PATCH 13/14] at91sam9x5ek: Configure Ethernet " Andrey Smirnov
2017-03-23 13:23 ` [PATCH 14/14] at91sam9x5ek: Configure NAND " Andrey Smirnov
2017-03-29  6:33 ` [PATCH 00/14] AT91, at91sam9x5ek updates (part III/III) Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170323132358.8539-10-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox