raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

mmc: sdhci-of-dwcmshc: define sdio timeout clocks

Browse Source 
Signed-off-by: Liam Fraser <liam@raspberrypi.com>

mmc: sdhci-of-dwcmshc: rp1 sdio changes

Signed-off-by: Phil Elwell <phil@raspberrypi.com>

drivers: mmc: sdhci-of-dwcmshc: add RP1 dt ID and quirks

Differentiate the RP1 variant of the Designware MSHC controller(s).

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
This commit is contained in:
Liam Fraser
2019-03-14 16:01:26 +00:00
committed by Dom Cobley
parent 07c0fe0f55
commit 23e4f6b74d
3 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/mmc/host/sdhci-of-dwcmshc.c
View File

@@ -221,6 +221,7 @@ struct rk35xx_priv {
struct dwcmshc_priv {
struct clk *bus_clk;
struct clk *sdio_clk;
int vendor_specific_area1; /* P_VENDOR_SPECIFIC_AREA1 reg */
int vendor_specific_area2; /* P_VENDOR_SPECIFIC_AREA2 reg */
@@ -302,6 +303,17 @@ static void dwcmshc_reset(struct sdhci_host *host, u8 mask)
sdhci_writel(host, SDHCI_INT_RESPONSE, SDHCI_INT_STATUS);
}
static void dwcmshc_set_clock(struct sdhci_host *host, unsigned int clock)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host);
if (priv->sdio_clk)
clk_set_rate(priv->sdio_clk, clock);
sdhci_set_clock(host, clock);
}
static unsigned int dwcmshc_get_max_clock(struct sdhci_host *host)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -1101,10 +1113,11 @@ static int sg2042_init(struct device *dev, struct sdhci_host *host,
}
static const struct sdhci_ops sdhci_dwcmshc_ops = {
.set_clock = sdhci_set_clock,
.set_clock = dwcmshc_set_clock,
.set_bus_width = sdhci_set_bus_width,
.set_uhs_signaling = dwcmshc_set_uhs_signaling,
.get_max_clock = dwcmshc_get_max_clock,
.get_timeout_clock = sdhci_pltfm_clk_get_timeout_clock,
.reset = dwcmshc_reset,
.adma_write_desc = dwcmshc_adma_write_desc,
.irq = dwcmshc_cqe_irq_handler,
@@ -1177,8 +1190,10 @@ static const struct sdhci_ops sdhci_dwcmshc_sg2042_ops = {
static const struct dwcmshc_pltfm_data sdhci_dwcmshc_pdata = {
.pdata = {
.ops = &sdhci_dwcmshc_ops,
.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
SDHCI_QUIRK_BROKEN_CARD_DETECTION,
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
SDHCI_QUIRK2_BROKEN_HS200,
},
};
@@ -1193,6 +1208,17 @@ static const struct dwcmshc_pltfm_data sdhci_dwcmshc_bf3_pdata = {
};
#endif
static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rp1_pdata = {
.pdata = {
.ops = &sdhci_dwcmshc_ops,
.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
SDHCI_QUIRK_BROKEN_CARD_DETECTION,
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
SDHCI_QUIRK2_BROKEN_HS200 |
SDHCI_QUIRK2_SPURIOUS_INT_RESP,
}
};
static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rk35xx_pdata = {
.pdata = {
.ops = &sdhci_dwcmshc_rk35xx_ops,
@@ -1315,6 +1341,10 @@ dsbl_cqe_caps:
}
static const struct of_device_id sdhci_dwcmshc_dt_ids[] = {
{
.compatible = "raspberrypi,rp1-dwcmshc",
.data = &sdhci_dwcmshc_rp1_pdata,
},
{
.compatible = "rockchip,rk3588-dwcmshc",
.data = &sdhci_dwcmshc_rk35xx_pdata,
@@ -1407,13 +1437,32 @@ static int dwcmshc_probe(struct platform_device *pdev)
priv->bus_clk = devm_clk_get(dev, "bus");
if (!IS_ERR(priv->bus_clk))
clk_prepare_enable(priv->bus_clk);
pltfm_host->timeout_clk = devm_clk_get(dev, "timeout");
if (!IS_ERR(pltfm_host->timeout_clk))
err = clk_prepare_enable(pltfm_host->timeout_clk);
if (err)
return err;
priv->sdio_clk = devm_clk_get_optional(&pdev->dev, "sdio");
}
pltfm_host->timeout_clk = devm_clk_get(&pdev->dev, "timeout");
if (IS_ERR(pltfm_host->timeout_clk)) {
err = PTR_ERR(pltfm_host->timeout_clk);
dev_err(&pdev->dev, "failed to get timeout clk: %d\n", err);
return err;
}
err = clk_prepare_enable(pltfm_host->timeout_clk);
if (err)
return err;
err = mmc_of_parse(host->mmc);
if (err)
goto err_clk;
sdhci_get_of_property(pdev);
sdhci_enable_v4_mode(host);
priv->vendor_specific_area1 =
sdhci_readl(host, DWCMSHC_P_VENDOR_AREA1) & DWCMSHC_AREA1_MASK;
@@ -1473,6 +1522,7 @@ err_rpm:
pm_runtime_put_noidle(dev);
err_clk:
clk_disable_unprepare(pltfm_host->clk);
clk_disable_unprepare(pltfm_host->timeout_clk);
clk_disable_unprepare(priv->bus_clk);
clk_bulk_disable_unprepare(priv->num_other_clks, priv->other_clks);
return err;

8
drivers/mmc/host/sdhci-pltfm.c
View File

@@ -32,6 +32,14 @@ unsigned int sdhci_pltfm_clk_get_max_clock(struct sdhci_host *host)
}
EXPORT_SYMBOL_GPL(sdhci_pltfm_clk_get_max_clock);
unsigned int sdhci_pltfm_clk_get_timeout_clock(struct sdhci_host *host)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
return clk_get_rate(pltfm_host->timeout_clk);
}
EXPORT_SYMBOL_GPL(sdhci_pltfm_clk_get_timeout_clock);
static const struct sdhci_ops sdhci_pltfm_ops = {
.set_clock = sdhci_set_clock,
.set_bus_width = sdhci_set_bus_width,

3
drivers/mmc/host/sdhci-pltfm.h
View File

@@ -20,6 +20,7 @@ struct sdhci_pltfm_data {
struct sdhci_pltfm_host {
struct clk *clk;
struct clk *timeout_clk;
/* migrate from sdhci_of_host */
unsigned int clock;
@@ -105,6 +106,8 @@ extern void sdhci_pltfm_remove(struct platform_device *pdev);
extern unsigned int sdhci_pltfm_clk_get_max_clock(struct sdhci_host *host);
extern unsigned int sdhci_pltfm_clk_get_timeout_clock(struct sdhci_host *host);
static inline void *sdhci_pltfm_priv(struct sdhci_pltfm_host *host)
{
return host->private;