From: Andrea Merello <andrea.merello@gmail.com>
To: ulf.hansson@linaro.org, mcoquelin.stm32@gmail.com,
alexandre.torgue@st.com
Cc: linux-mmc@vger.kernel.org, bruherrera@gmail.com,
Andrea Merello <andrea.merello@gmail.com>
Subject: [PATCH v2 3/9] mmc: mmci: don't pretend all variants to have MCI_STARBITERR flag
Date: Tue, 10 Jan 2017 09:42:10 +0100 [thread overview]
Message-ID: <1484037736-25029-4-git-send-email-andrea.merello@gmail.com> (raw)
In-Reply-To: <1484037736-25029-1-git-send-email-andrea.merello@gmail.com>
This patch prepares for supporting the STM32 variant, that has no such bit
in the status register.
Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
---
drivers/mmc/host/mmci.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 54c2fc3..fbb5728 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -114,6 +114,7 @@ struct variant_data {
bool qcom_fifo;
bool qcom_dml;
bool reversed_irq_handling;
+ bool has_start_err;
};
static __maybe_unused struct variant_data variant_arm = {
@@ -123,6 +124,7 @@ static __maybe_unused struct variant_data variant_arm = {
.pwrreg_powerup = MCI_PWR_UP,
.f_max = 100000000,
.reversed_irq_handling = true,
+ .has_start_err = true,
};
static __maybe_unused struct variant_data variant_arm_extended_fifo = {
@@ -131,6 +133,7 @@ static __maybe_unused struct variant_data variant_arm_extended_fifo = {
.datalength_bits = 16,
.pwrreg_powerup = MCI_PWR_UP,
.f_max = 100000000,
+ .has_start_err = true,
};
static __maybe_unused struct variant_data variant_arm_extended_fifo_hwfc = {
@@ -140,6 +143,7 @@ static __maybe_unused struct variant_data variant_arm_extended_fifo_hwfc = {
.datalength_bits = 16,
.pwrreg_powerup = MCI_PWR_UP,
.f_max = 100000000,
+ .has_start_err = true,
};
static __maybe_unused struct variant_data variant_u300 = {
@@ -155,6 +159,7 @@ static __maybe_unused struct variant_data variant_u300 = {
.signal_direction = true,
.pwrreg_clkgate = true,
.pwrreg_nopower = true,
+ .has_start_err = true,
};
static __maybe_unused struct variant_data variant_nomadik = {
@@ -171,6 +176,7 @@ static __maybe_unused struct variant_data variant_nomadik = {
.signal_direction = true,
.pwrreg_clkgate = true,
.pwrreg_nopower = true,
+ .has_start_err = true,
};
static __maybe_unused struct variant_data variant_ux500 = {
@@ -193,6 +199,7 @@ static __maybe_unused struct variant_data variant_ux500 = {
.busy_detect_flag = MCI_ST_CARDBUSY,
.busy_detect_mask = MCI_ST_BUSYENDMASK,
.pwrreg_nopower = true,
+ .has_start_err = true,
};
static __maybe_unused struct variant_data variant_ux500v2 = {
@@ -217,6 +224,7 @@ static __maybe_unused struct variant_data variant_ux500v2 = {
.busy_detect_flag = MCI_ST_CARDBUSY,
.busy_detect_mask = MCI_ST_BUSYENDMASK,
.pwrreg_nopower = true,
+ .has_start_err = true,
};
static __maybe_unused struct variant_data variant_qcom = {
@@ -235,6 +243,7 @@ static __maybe_unused struct variant_data variant_qcom = {
.explicit_mclk_control = true,
.qcom_fifo = true,
.qcom_dml = true,
+ .has_start_err = true,
};
/* Busy detection for the ST Micro variant */
@@ -923,8 +932,9 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
return;
/* First check for errors */
- if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|
- MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
+ if (status & (MCI_DATACRCFAIL | MCI_DATATIMEOUT |
+ (host->variant->has_start_err ? MCI_STARTBITERR : 0) |
+ MCI_TXUNDERRUN | MCI_RXOVERRUN)) {
u32 remain, success;
/* Terminate the DMA transfer */
--
2.7.4
next prev parent reply other threads:[~2017-01-10 8:42 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 8:42 [PATCH v2 0/9] mmc: mmci: add support for STM32 SD controller Andrea Merello
2017-01-10 8:42 ` [PATCH v2 1/9] mmc: mmci: don't pretend IP variants with only one IRQ to have two mask regs Andrea Merello
2017-01-10 8:42 ` [PATCH v2 2/9] mmc: mmci: add support for not-amba, but still compatible, variants Andrea Merello
2017-01-10 8:42 ` Andrea Merello [this message]
2017-01-10 8:42 ` [PATCH v2 4/9] mmc: mmci: add support for setting pad type via pinctrl Andrea Merello
2017-01-10 8:42 ` [PATCH v2 5/9] mmc: mmci: add STM32 variant Andrea Merello
2017-01-10 8:42 ` [PATCH v2 6/9] DT: stm32f429: add pin map for SDIO controller Andrea Merello
2017-01-10 9:06 ` Alexandre Torgue
2017-01-10 8:42 ` [PATCH v2 7/9] DT: stm32f429: add node " Andrea Merello
2017-01-10 9:15 ` Alexandre Torgue
2017-01-10 8:42 ` [PATCH v2 8/9] DT: stm32f469-disco: " Andrea Merello
2017-01-10 9:18 ` Alexandre Torgue
2017-01-12 7:25 ` Andrea Merello
2017-01-12 8:34 ` Alexandre Torgue
2017-01-12 8:53 ` Andrea Merello
2017-01-13 15:01 ` Andrea Merello
2017-01-13 15:52 ` Alexandre Torgue
2017-01-13 16:12 ` Andrea Merello
2017-01-13 16:28 ` Alexandre Torgue
2017-01-13 18:40 ` Andrea Merello
2017-01-10 8:42 ` [PATCH v2 9/9] Documentation: document mmci STM32 DT binding Andrea Merello
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=1484037736-25029-4-git-send-email-andrea.merello@gmail.com \
--to=andrea.merello@gmail.com \
--cc=alexandre.torgue@st.com \
--cc=bruherrera@gmail.com \
--cc=linux-mmc@vger.kernel.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=ulf.hansson@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.