linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <patrice.chotard@st.com>
To: Russell King <linux@armlinux.org.uk>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	Michael Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Linus Walleij <linus.walleij@linaro.org>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Alexandre Torgue <alexandre.torgue@st.com>
Cc: <linux-mmc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-clk@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-gpio@vger.kernel.org>, <devicetree@vger.kernel.org>,
	Patrice Chotard <patrice.chotard@st.com>,
	Andrea Merello <andrea.merello@gmail.com>
Subject: [PATCH v2 05/15] mmc: mmci: Add STM32 variant
Date: Tue, 16 Jan 2018 13:30:49 +0100	[thread overview]
Message-ID: <1516105859-3525-6-git-send-email-patrice.chotard@st.com> (raw)
In-Reply-To: <1516105859-3525-1-git-send-email-patrice.chotard@st.com>

From: Patrice Chotard <patrice.chotard@st.com>

STM32F4 and STM32F7 MCUs has a SDIO controller that looks like
an ARM PL810.
This patch adds the STM32 variant so that mmci driver supports it.

Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
---

v2: _ Replace "pl180" by "PL180" in commit message

 drivers/mmc/host/mmci.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 2a7aea7..560b2fd 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -244,6 +244,23 @@ struct variant_data {
 	.opendrain		= MCI_OD,
 };
 
+static struct variant_data variant_stm32 = {
+	.fifosize		= 32 * 4,
+	.fifohalfsize		= 8 * 4,
+	.clkreg			= MCI_CLK_ENABLE,
+	.clkreg_enable		= MCI_ST_UX500_HWFCEN,
+	.clkreg_8bit_bus_enable = MCI_ST_8BIT_BUS,
+	.clkreg_neg_edge_enable	= MCI_ST_UX500_NEG_EDGE,
+	.datalength_bits	= 24,
+	.datactrl_mask_sdio	= MCI_DPSM_ST_SDIOEN,
+	.st_sdio		= true,
+	.st_clkdiv		= true,
+	.pwrreg_powerup		= MCI_PWR_ON,
+	.f_max			= 48000000,
+	.pwrreg_clkgate		= true,
+	.pwrreg_nopower		= true,
+};
+
 static struct variant_data variant_qcom = {
 	.fifosize		= 16 * 4,
 	.fifohalfsize		= 8 * 4,
@@ -2025,6 +2042,11 @@ static int mmci_runtime_resume(struct device *dev)
 		.mask   = 0xf0ffffff,
 		.data	= &variant_ux500v2,
 	},
+	{
+		.id     = 0x00880180,
+		.mask   = 0x00ffffff,
+		.data	= &variant_stm32,
+	},
 	/* Qualcomm variants */
 	{
 		.id     = 0x00051180,
-- 
1.9.1

  parent reply	other threads:[~2018-01-16 12:36 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-16 12:30 [PATCH v2 00/15] Add MMCI support for STM32F SoCs family patrice.chotard
2018-01-16 12:30 ` [PATCH v2 01/15] mmc: mmci: Don't pretend all variants to have MMCIMASK1 register patrice.chotard
2018-01-16 12:30 ` [PATCH v2 02/15] mmc: mmci: Don't pretend all variants to have MCI_STARBITERR flag patrice.chotard
2018-01-16 12:30 ` [PATCH v2 03/15] mmc: mmci: Don't pretend all variants to have OPENDRAIN bit patrice.chotard
2018-01-17  9:33   ` Ulf Hansson
2018-01-18 13:24     ` Patrice CHOTARD
2018-01-16 12:30 ` [PATCH v2 04/15] mmc: mmci: Add support for setting pad type via pinctrl patrice.chotard
2018-01-17  9:34   ` Ulf Hansson
2018-01-18 13:35     ` Patrice CHOTARD
2018-01-16 12:30 ` patrice.chotard [this message]
2018-01-16 12:30 ` [PATCH v2 06/15] ARM: dts: stm32: Add SDIO controller for stm32f746 patrice.chotard
2018-01-16 12:30 ` [PATCH v2 07/15] ARM: dts: stm32: Add SDIO controller for stm32f429 patrice.chotard
2018-01-16 12:30 ` [PATCH v2 08/15] ARM: dts: stm32: Add pin map for SDIO controller on stm32f4 patrice.chotard
2018-01-16 12:30 ` [PATCH v2 09/15] ARM: dts: stm32: Enable SDIO controller on stm32f469 disco board patrice.chotard
2018-01-16 12:30 ` [PATCH v2 10/15] ARM: dts: stm32: Enable SDIO controller on stm32429i-eval board patrice.chotard
2018-01-16 12:30 ` [PATCH v2 11/15] ARM: stm32: Add AMBA support for STM32F4 and STM32F7 SoCs patrice.chotard
2018-01-16 12:30 ` [PATCH v2 12/15] ARM: configs: stm32: Enable MMC_ARMMMCI support patrice.chotard
2018-01-16 12:30 ` [PATCH v2 13/15] ARM: configs: stm32: Enable EXT3_FS support patrice.chotard
2018-01-16 12:30 ` [PATCH v2 14/15] clk: stm32: Add clk entry for SDMMC2 on stm32F769 patrice.chotard
2018-02-26  8:41   ` Patrice CHOTARD
2018-03-01  9:12     ` Linus Walleij
2018-03-01  9:42       ` Patrice CHOTARD
2018-03-15 21:24       ` Stephen Boyd
2018-01-16 12:30 ` [PATCH v2 15/15] gpio: stmpe: i2c transfer are forbiden in atomic context patrice.chotard

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=1516105859-3525-6-git-send-email-patrice.chotard@st.com \
    --to=patrice.chotard@st.com \
    --cc=alexandre.torgue@st.com \
    --cc=andrea.merello@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=mturquette@baylibre.com \
    --cc=robh+dt@kernel.org \
    --cc=sboyd@codeaurora.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).