From: Bo Shen <voice.shen@atmel.com>
To: s.hauer@pengutronix.de, plagnioj@jcrosoft.com
Cc: barebox@lists.infradead.org
Subject: [PATCH] ARM: atmel: sama5d3xek: fix conflict between w1 and led
Date: Tue, 20 Jan 2015 15:31:25 +0800 [thread overview]
Message-ID: <1421739085-21150-1-git-send-email-voice.shen@atmel.com> (raw)
As the 1-wire and LED d2 use the same pin (PE25) on the EK board.
So, make LED enable only when the 1-wire is disabled.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
arch/arm/boards/sama5d3xek/init.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boards/sama5d3xek/init.c b/arch/arm/boards/sama5d3xek/init.c
index 0b83147..ce05108 100644
--- a/arch/arm/boards/sama5d3xek/init.c
+++ b/arch/arm/boards/sama5d3xek/init.c
@@ -49,11 +49,13 @@
#include "hw_version.h"
+#ifdef CONFIG_W1_MASTER_GPIO
struct w1_gpio_platform_data w1_pdata = {
.pin = AT91_PIN_PE25,
.ext_pullup_enable_pin = -EINVAL,
.is_open_drain = 0,
};
+#endif
#if defined(CONFIG_NAND_ATMEL)
static struct atmel_nand_data nand_pdata = {
@@ -323,11 +325,13 @@ struct gpio_led leds[] = {
.name = "d1",
},
}, {
+#ifndef CONFIG_W1_MASTER_GPIO
.gpio = AT91_PIN_PE25,
.active_low = 1,
.led = {
.name = "d2",
},
+#endif
},
};
@@ -353,6 +357,7 @@ static int at91sama5d3xek_mem_init(void)
}
mem_initcall(at91sama5d3xek_mem_init);
+#ifdef CONFIG_W1_MASTER_GPIO
static void ek_add_device_w1(void)
{
at91_set_gpio_input(w1_pdata.pin, 0);
@@ -361,6 +366,9 @@ static void ek_add_device_w1(void)
at91sama5d3xek_devices_detect_hw();
}
+#else
+static void ek_add_device_w1(void) {}
+#endif
#ifdef CONFIG_POLLER
/*
--
2.3.0.rc0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2015-01-20 7:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-20 7:31 Bo Shen [this message]
2015-01-21 9:41 ` Sascha Hauer
2015-01-21 9:56 ` Jean-Christophe PLAGNIOL-VILLARD
2015-01-21 10:03 ` Bo Shen
2015-01-23 7:58 ` Jean-Christophe PLAGNIOL-VILLARD
2015-01-23 8:35 ` Bo Shen
2015-01-23 9:18 ` Jean-Christophe PLAGNIOL-VILLARD
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=1421739085-21150-1-git-send-email-voice.shen@atmel.com \
--to=voice.shen@atmel.com \
--cc=barebox@lists.infradead.org \
--cc=plagnioj@jcrosoft.com \
--cc=s.hauer@pengutronix.de \
/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