From: Kishon Vijay Abraham I <kishon@ti.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
Tony Lindgren <tony@atomide.com>,
Adrian Hunter <adrian.hunter@intel.com>
Cc: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Russell King <linux@armlinux.org.uk>,
Kishon Vijay Abraham I <kishon@ti.com>,
<linux-mmc@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH v2 03/16] mmc: sdhci-omap: Add custom set_uhs_signaling sdhci_host ops
Date: Mon, 5 Feb 2018 18:20:16 +0530 [thread overview]
Message-ID: <20180205125029.21570-4-kishon@ti.com> (raw)
In-Reply-To: <20180205125029.21570-1-kishon@ti.com>
UHS-1 DDR50 and MMC DDR52 mode require DDR bit to be
set in the configuration register (MMCHS_CON). Add
sdhci-omap specific set_uhs_signaling ops to set
this bit. Also while setting the UHSMS bit, clock should be
disabled.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci-omap.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
index df927f3faaf6..86b6cc0a5380 100644
--- a/drivers/mmc/host/sdhci-omap.c
+++ b/drivers/mmc/host/sdhci-omap.c
@@ -31,6 +31,7 @@
#define SDHCI_OMAP_CON 0x12c
#define CON_DW8 BIT(5)
#define CON_DMA_MASTER BIT(20)
+#define CON_DDR BIT(19)
#define CON_CLKEXTFREE BIT(16)
#define CON_PADEN BIT(15)
#define CON_INIT BIT(1)
@@ -461,6 +462,26 @@ static void sdhci_omap_init_74_clocks(struct sdhci_host *host, u8 power_mode)
enable_irq(host->irq);
}
+static void sdhci_omap_set_uhs_signaling(struct sdhci_host *host,
+ unsigned int timing)
+{
+ u32 reg;
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);
+
+ sdhci_omap_stop_clock(omap_host);
+
+ reg = sdhci_omap_readl(omap_host, SDHCI_OMAP_CON);
+ if (timing == MMC_TIMING_UHS_DDR50 || timing == MMC_TIMING_MMC_DDR52)
+ reg |= CON_DDR;
+ else
+ reg &= ~CON_DDR;
+ sdhci_omap_writel(omap_host, SDHCI_OMAP_CON, reg);
+
+ sdhci_set_uhs_signaling(host, timing);
+ sdhci_omap_start_clock(omap_host);
+}
+
static struct sdhci_ops sdhci_omap_ops = {
.set_clock = sdhci_omap_set_clock,
.set_power = sdhci_omap_set_power,
@@ -470,7 +491,7 @@ static struct sdhci_ops sdhci_omap_ops = {
.set_bus_width = sdhci_omap_set_bus_width,
.platform_send_init_74_clocks = sdhci_omap_init_74_clocks,
.reset = sdhci_reset,
- .set_uhs_signaling = sdhci_set_uhs_signaling,
+ .set_uhs_signaling = sdhci_omap_set_uhs_signaling,
};
static int sdhci_omap_set_capabilities(struct sdhci_omap_host *omap_host)
--
2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Kishon Vijay Abraham I <kishon@ti.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
Tony Lindgren <tony@atomide.com>,
Adrian Hunter <adrian.hunter@intel.com>
Cc: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Russell King <linux@armlinux.org.uk>,
Kishon Vijay Abraham I <kishon@ti.com>,
linux-mmc@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 03/16] mmc: sdhci-omap: Add custom set_uhs_signaling sdhci_host ops
Date: Mon, 5 Feb 2018 18:20:16 +0530 [thread overview]
Message-ID: <20180205125029.21570-4-kishon@ti.com> (raw)
In-Reply-To: <20180205125029.21570-1-kishon@ti.com>
UHS-1 DDR50 and MMC DDR52 mode require DDR bit to be
set in the configuration register (MMCHS_CON). Add
sdhci-omap specific set_uhs_signaling ops to set
this bit. Also while setting the UHSMS bit, clock should be
disabled.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci-omap.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
index df927f3faaf6..86b6cc0a5380 100644
--- a/drivers/mmc/host/sdhci-omap.c
+++ b/drivers/mmc/host/sdhci-omap.c
@@ -31,6 +31,7 @@
#define SDHCI_OMAP_CON 0x12c
#define CON_DW8 BIT(5)
#define CON_DMA_MASTER BIT(20)
+#define CON_DDR BIT(19)
#define CON_CLKEXTFREE BIT(16)
#define CON_PADEN BIT(15)
#define CON_INIT BIT(1)
@@ -461,6 +462,26 @@ static void sdhci_omap_init_74_clocks(struct sdhci_host *host, u8 power_mode)
enable_irq(host->irq);
}
+static void sdhci_omap_set_uhs_signaling(struct sdhci_host *host,
+ unsigned int timing)
+{
+ u32 reg;
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);
+
+ sdhci_omap_stop_clock(omap_host);
+
+ reg = sdhci_omap_readl(omap_host, SDHCI_OMAP_CON);
+ if (timing == MMC_TIMING_UHS_DDR50 || timing == MMC_TIMING_MMC_DDR52)
+ reg |= CON_DDR;
+ else
+ reg &= ~CON_DDR;
+ sdhci_omap_writel(omap_host, SDHCI_OMAP_CON, reg);
+
+ sdhci_set_uhs_signaling(host, timing);
+ sdhci_omap_start_clock(omap_host);
+}
+
static struct sdhci_ops sdhci_omap_ops = {
.set_clock = sdhci_omap_set_clock,
.set_power = sdhci_omap_set_power,
@@ -470,7 +491,7 @@ static struct sdhci_ops sdhci_omap_ops = {
.set_bus_width = sdhci_omap_set_bus_width,
.platform_send_init_74_clocks = sdhci_omap_init_74_clocks,
.reset = sdhci_reset,
- .set_uhs_signaling = sdhci_set_uhs_signaling,
+ .set_uhs_signaling = sdhci_omap_set_uhs_signaling,
};
static int sdhci_omap_set_capabilities(struct sdhci_omap_host *omap_host)
--
2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: kishon@ti.com (Kishon Vijay Abraham I)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 03/16] mmc: sdhci-omap: Add custom set_uhs_signaling sdhci_host ops
Date: Mon, 5 Feb 2018 18:20:16 +0530 [thread overview]
Message-ID: <20180205125029.21570-4-kishon@ti.com> (raw)
In-Reply-To: <20180205125029.21570-1-kishon@ti.com>
UHS-1 DDR50 and MMC DDR52 mode require DDR bit to be
set in the configuration register (MMCHS_CON). Add
sdhci-omap specific set_uhs_signaling ops to set
this bit. Also while setting the UHSMS bit, clock should be
disabled.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci-omap.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
index df927f3faaf6..86b6cc0a5380 100644
--- a/drivers/mmc/host/sdhci-omap.c
+++ b/drivers/mmc/host/sdhci-omap.c
@@ -31,6 +31,7 @@
#define SDHCI_OMAP_CON 0x12c
#define CON_DW8 BIT(5)
#define CON_DMA_MASTER BIT(20)
+#define CON_DDR BIT(19)
#define CON_CLKEXTFREE BIT(16)
#define CON_PADEN BIT(15)
#define CON_INIT BIT(1)
@@ -461,6 +462,26 @@ static void sdhci_omap_init_74_clocks(struct sdhci_host *host, u8 power_mode)
enable_irq(host->irq);
}
+static void sdhci_omap_set_uhs_signaling(struct sdhci_host *host,
+ unsigned int timing)
+{
+ u32 reg;
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);
+
+ sdhci_omap_stop_clock(omap_host);
+
+ reg = sdhci_omap_readl(omap_host, SDHCI_OMAP_CON);
+ if (timing == MMC_TIMING_UHS_DDR50 || timing == MMC_TIMING_MMC_DDR52)
+ reg |= CON_DDR;
+ else
+ reg &= ~CON_DDR;
+ sdhci_omap_writel(omap_host, SDHCI_OMAP_CON, reg);
+
+ sdhci_set_uhs_signaling(host, timing);
+ sdhci_omap_start_clock(omap_host);
+}
+
static struct sdhci_ops sdhci_omap_ops = {
.set_clock = sdhci_omap_set_clock,
.set_power = sdhci_omap_set_power,
@@ -470,7 +491,7 @@ static struct sdhci_ops sdhci_omap_ops = {
.set_bus_width = sdhci_omap_set_bus_width,
.platform_send_init_74_clocks = sdhci_omap_init_74_clocks,
.reset = sdhci_reset,
- .set_uhs_signaling = sdhci_set_uhs_signaling,
+ .set_uhs_signaling = sdhci_omap_set_uhs_signaling,
};
static int sdhci_omap_set_capabilities(struct sdhci_omap_host *omap_host)
--
2.11.0
next prev parent reply other threads:[~2018-02-05 12:51 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-05 12:50 [PATCH v2 00/16] mmc: sdhci-omap: Add UHS/HS200 mode support Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 01/16] mmc: sdhci-omap: Update 'power_mode' outside sdhci_omap_init_74_clocks Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 02/16] mmc: sdhci-omap: Add card_busy host ops Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I [this message]
2018-02-05 12:50 ` [PATCH v2 03/16] mmc: sdhci-omap: Add custom set_uhs_signaling sdhci_host ops Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 04/16] mmc: sdhci-omap: Add tuning support Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 05/16] mmc: sdhci-omap: Workaround for Errata i802 Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 06/16] mmc: sdhci_omap: Add support to set IODELAY values Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 07/16] mmc: sdhci_omap: Fix sdhci-omap quirks Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 08/16] mmc: sdhci-omap: Add support to override f_max and iodelay from pdata Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-14 9:53 ` Ulf Hansson
2018-02-14 9:53 ` Ulf Hansson
2018-02-14 17:24 ` Tony Lindgren
2018-02-14 17:24 ` Tony Lindgren
2018-02-16 8:08 ` Kishon Vijay Abraham I
2018-02-16 8:08 ` Kishon Vijay Abraham I
2018-02-16 8:08 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 09/16] mmc: sdhci: Add quirk to disable HW timeout Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-19 8:51 ` Adrian Hunter
2018-02-19 8:51 ` Adrian Hunter
2018-02-19 8:51 ` Adrian Hunter
2018-03-05 9:30 ` Kishon Vijay Abraham I
2018-03-05 9:30 ` Kishon Vijay Abraham I
2018-03-05 9:30 ` Kishon Vijay Abraham I
2018-03-05 9:38 ` Adrian Hunter
2018-03-05 9:38 ` Adrian Hunter
2018-03-14 13:25 ` Kishon Vijay Abraham I
2018-03-14 13:25 ` Kishon Vijay Abraham I
2018-03-14 13:25 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 10/16] mmc: sdhci: Fix to use data_timer only for data line commands Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-19 8:03 ` Adrian Hunter
2018-02-19 8:03 ` Adrian Hunter
2018-02-19 8:03 ` Adrian Hunter
2018-02-19 12:55 ` Kishon Vijay Abraham I
2018-02-19 12:55 ` Kishon Vijay Abraham I
2018-02-19 12:55 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 11/16] mmc: sdhci: Program a relatively accurate SW timeout value Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-16 7:17 ` Kishon Vijay Abraham I
2018-02-16 7:17 ` Kishon Vijay Abraham I
2018-02-16 7:17 ` Kishon Vijay Abraham I
2018-02-19 9:24 ` Adrian Hunter
2018-02-19 9:24 ` Adrian Hunter
2018-02-19 9:24 ` Adrian Hunter
2018-02-19 13:13 ` Adrian Hunter
2018-02-19 13:13 ` Adrian Hunter
2018-02-19 13:13 ` Adrian Hunter
2018-02-05 12:50 ` [PATCH v2 12/16] mmc: sdhci-omap: Workaround for Errata i834 Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 13/16] dt-bindings: sdhci-omap: Add K2G specific binding Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 14/16] mmc: sdhci-omap: Add support for MMC/SD controller in k2g SoC Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` [PATCH v2 15/16] mmc: sdhci-omap: Add SPDX identifier Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 21:50 ` Joe Perches
2018-02-05 21:50 ` Joe Perches
2018-02-05 21:50 ` Joe Perches
2018-02-19 9:33 ` Adrian Hunter
2018-02-19 9:33 ` Adrian Hunter
2018-02-19 9:33 ` Adrian Hunter
2018-02-05 12:50 ` [PATCH v2 16/16] ARM: OMAP2+: Use sdhci-omap specific pdata-quirks for MMC/SD on DRA74x EVM Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-05 12:50 ` Kishon Vijay Abraham I
2018-02-14 10:38 ` [PATCH v2 00/16] mmc: sdhci-omap: Add UHS/HS200 mode support Ulf Hansson
2018-02-14 10:38 ` Ulf Hansson
2018-02-14 10:38 ` Ulf Hansson
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=20180205125029.21570-4-kishon@ti.com \
--to=kishon@ti.com \
--cc=adrian.hunter@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.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.