* [PATCH v2 1/4] mmc: sdhci-xenon: use match data for controllers variants
2020-11-20 3:26 [PATCH v2 0/4] sdhci-xenon ACPI support Marcin Wojtas
@ 2020-11-20 3:26 ` Marcin Wojtas
2020-11-20 3:26 ` [PATCH v2 2/4] mmc: sdhci-xenon: switch to device_* API Marcin Wojtas
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Marcin Wojtas @ 2020-11-20 3:26 UTC (permalink / raw)
To: linux-kernel, linux-mmc
Cc: ulf.hansson, huziji, adrian.hunter, jaz, tn, ard.biesheuvel,
kostap, Marcin Wojtas
As a part of the ACPI support preparation resign from checking
compatible strings in the driver. Instead of that use a new
enum and assign the values to match data accordingly.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
drivers/mmc/host/sdhci-xenon.h | 8 ++++++++
drivers/mmc/host/sdhci-xenon-phy.c | 4 +++-
drivers/mmc/host/sdhci-xenon.c | 10 ++++++----
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/sdhci-xenon.h b/drivers/mmc/host/sdhci-xenon.h
index 593b82d7b68a..39e898605937 100644
--- a/drivers/mmc/host/sdhci-xenon.h
+++ b/drivers/mmc/host/sdhci-xenon.h
@@ -53,6 +53,13 @@
#define XENON_CTRL_HS200 0x5
#define XENON_CTRL_HS400 0x6
+enum xenon_variant {
+ XENON_A3700,
+ XENON_AP806,
+ XENON_AP807,
+ XENON_CP110
+};
+
struct xenon_priv {
unsigned char tuning_count;
/* idx of SDHC */
@@ -90,6 +97,7 @@ struct xenon_priv {
void *phy_params;
struct xenon_emmc_phy_regs *emmc_phy_regs;
bool restore_needed;
+ enum xenon_variant hw_version;
};
int xenon_phy_adj(struct sdhci_host *host, struct mmc_ios *ios);
diff --git a/drivers/mmc/host/sdhci-xenon-phy.c b/drivers/mmc/host/sdhci-xenon-phy.c
index 03ce57ef4585..c33e0cddc81a 100644
--- a/drivers/mmc/host/sdhci-xenon-phy.c
+++ b/drivers/mmc/host/sdhci-xenon-phy.c
@@ -651,11 +651,13 @@ static int get_dt_pad_ctrl_data(struct sdhci_host *host,
struct device_node *np,
struct xenon_emmc_phy_params *params)
{
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct xenon_priv *priv = sdhci_pltfm_priv(pltfm_host);
int ret = 0;
const char *name;
struct resource iomem;
- if (of_device_is_compatible(np, "marvell,armada-3700-sdhci"))
+ if (priv->hw_version == XENON_A3700)
params->pad_ctrl.set_soc_pad = armada_3700_soc_pad_voltage_set;
else
return 0;
diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
index 24c978de2a3f..1e7ce9b1a143 100644
--- a/drivers/mmc/host/sdhci-xenon.c
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -418,7 +418,7 @@ static int xenon_probe_dt(struct platform_device *pdev)
u32 tuning_count;
/* Disable HS200 on Armada AP806 */
- if (of_device_is_compatible(np, "marvell,armada-ap806-sdhci"))
+ if (priv->hw_version == XENON_AP806)
host->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200;
sdhc_id = 0x0;
@@ -495,6 +495,8 @@ static int xenon_probe(struct platform_device *pdev)
pltfm_host = sdhci_priv(host);
priv = sdhci_pltfm_priv(pltfm_host);
+ priv->hw_version = (unsigned long)device_get_match_data(&pdev->dev);
+
/*
* Link Xenon specific mmc_host_ops function,
* to replace standard ones in sdhci_ops.
@@ -667,9 +669,9 @@ static const struct dev_pm_ops sdhci_xenon_dev_pm_ops = {
};
static const struct of_device_id sdhci_xenon_dt_ids[] = {
- { .compatible = "marvell,armada-ap806-sdhci",},
- { .compatible = "marvell,armada-cp110-sdhci",},
- { .compatible = "marvell,armada-3700-sdhci",},
+ { .compatible = "marvell,armada-ap806-sdhci", .data = (void *)XENON_AP806},
+ { .compatible = "marvell,armada-cp110-sdhci", .data = (void *)XENON_CP110},
+ { .compatible = "marvell,armada-3700-sdhci", .data = (void *)XENON_A3700},
{}
};
MODULE_DEVICE_TABLE(of, sdhci_xenon_dt_ids);
--
2.29.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 2/4] mmc: sdhci-xenon: switch to device_* API
2020-11-20 3:26 [PATCH v2 0/4] sdhci-xenon ACPI support Marcin Wojtas
2020-11-20 3:26 ` [PATCH v2 1/4] mmc: sdhci-xenon: use match data for controllers variants Marcin Wojtas
@ 2020-11-20 3:26 ` Marcin Wojtas
2020-11-20 3:26 ` [PATCH v2 3/4] mmc: sdhci-xenon: use clk only with DT Marcin Wojtas
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Marcin Wojtas @ 2020-11-20 3:26 UTC (permalink / raw)
To: linux-kernel, linux-mmc
Cc: ulf.hansson, huziji, adrian.hunter, jaz, tn, ard.biesheuvel,
kostap, Marcin Wojtas
In order to support both ACPI and DT, modify the driver
to use device_* routines for obtaining the properties
values.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
drivers/mmc/host/sdhci-xenon.h | 4 +--
drivers/mmc/host/sdhci-xenon-phy.c | 36 +++++++++++---------
drivers/mmc/host/sdhci-xenon.c | 18 +++++-----
3 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/drivers/mmc/host/sdhci-xenon.h b/drivers/mmc/host/sdhci-xenon.h
index 39e898605937..3e9c6c908a79 100644
--- a/drivers/mmc/host/sdhci-xenon.h
+++ b/drivers/mmc/host/sdhci-xenon.h
@@ -101,8 +101,8 @@ struct xenon_priv {
};
int xenon_phy_adj(struct sdhci_host *host, struct mmc_ios *ios);
-int xenon_phy_parse_dt(struct device_node *np,
- struct sdhci_host *host);
+int xenon_phy_parse_params(struct device *dev,
+ struct sdhci_host *host);
void xenon_soc_pad_ctrl(struct sdhci_host *host,
unsigned char signal_voltage);
#endif
diff --git a/drivers/mmc/host/sdhci-xenon-phy.c b/drivers/mmc/host/sdhci-xenon-phy.c
index c33e0cddc81a..8cf3a375de65 100644
--- a/drivers/mmc/host/sdhci-xenon-phy.c
+++ b/drivers/mmc/host/sdhci-xenon-phy.c
@@ -691,35 +691,37 @@ static int get_dt_pad_ctrl_data(struct sdhci_host *host,
return ret;
}
-static int xenon_emmc_phy_parse_param_dt(struct sdhci_host *host,
- struct device_node *np,
- struct xenon_emmc_phy_params *params)
+static int xenon_emmc_phy_parse_params(struct sdhci_host *host,
+ struct device *dev,
+ struct xenon_emmc_phy_params *params)
{
u32 value;
params->slow_mode = false;
- if (of_property_read_bool(np, "marvell,xenon-phy-slow-mode"))
+ if (device_property_read_bool(dev, "marvell,xenon-phy-slow-mode"))
params->slow_mode = true;
params->znr = XENON_ZNR_DEF_VALUE;
- if (!of_property_read_u32(np, "marvell,xenon-phy-znr", &value))
+ if (!device_property_read_u32(dev, "marvell,xenon-phy-znr", &value))
params->znr = value & XENON_ZNR_MASK;
params->zpr = XENON_ZPR_DEF_VALUE;
- if (!of_property_read_u32(np, "marvell,xenon-phy-zpr", &value))
+ if (!device_property_read_u32(dev, "marvell,xenon-phy-zpr", &value))
params->zpr = value & XENON_ZPR_MASK;
params->nr_tun_times = XENON_TUN_CONSECUTIVE_TIMES;
- if (!of_property_read_u32(np, "marvell,xenon-phy-nr-success-tun",
- &value))
+ if (!device_property_read_u32(dev, "marvell,xenon-phy-nr-success-tun",
+ &value))
params->nr_tun_times = value & XENON_TUN_CONSECUTIVE_TIMES_MASK;
params->tun_step_divider = XENON_TUNING_STEP_DIVIDER;
- if (!of_property_read_u32(np, "marvell,xenon-phy-tun-step-divider",
- &value))
+ if (!device_property_read_u32(dev, "marvell,xenon-phy-tun-step-divider",
+ &value))
params->tun_step_divider = value & 0xFF;
- return get_dt_pad_ctrl_data(host, np, params);
+ if (dev->of_node)
+ return get_dt_pad_ctrl_data(host, dev->of_node, params);
+ return 0;
}
/* Set SoC PHY Voltage PAD */
@@ -813,7 +815,7 @@ int xenon_phy_adj(struct sdhci_host *host, struct mmc_ios *ios)
return ret;
}
-static int xenon_add_phy(struct device_node *np, struct sdhci_host *host,
+static int xenon_add_phy(struct device *dev, struct sdhci_host *host,
const char *phy_name)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -832,15 +834,15 @@ static int xenon_add_phy(struct device_node *np, struct sdhci_host *host,
if (ret)
return ret;
- return xenon_emmc_phy_parse_param_dt(host, np, priv->phy_params);
+ return xenon_emmc_phy_parse_params(host, dev, priv->phy_params);
}
-int xenon_phy_parse_dt(struct device_node *np, struct sdhci_host *host)
+int xenon_phy_parse_params(struct device *dev, struct sdhci_host *host)
{
const char *phy_type = NULL;
- if (!of_property_read_string(np, "marvell,xenon-phy-type", &phy_type))
- return xenon_add_phy(np, host, phy_type);
+ if (!device_property_read_string(dev, "marvell,xenon-phy-type", &phy_type))
+ return xenon_add_phy(dev, host, phy_type);
- return xenon_add_phy(np, host, "emmc 5.1 phy");
+ return xenon_add_phy(dev, host, "emmc 5.1 phy");
}
diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
index 1e7ce9b1a143..bfc76b0e3eaa 100644
--- a/drivers/mmc/host/sdhci-xenon.c
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -407,9 +407,9 @@ static void xenon_replace_mmc_host_ops(struct sdhci_host *host)
* Refer to XENON_SYS_CFG_INFO register
* tun-count: the interval between re-tuning
*/
-static int xenon_probe_dt(struct platform_device *pdev)
+static int xenon_probe_params(struct platform_device *pdev)
{
- struct device_node *np = pdev->dev.of_node;
+ struct device *dev = &pdev->dev;
struct sdhci_host *host = platform_get_drvdata(pdev);
struct mmc_host *mmc = host->mmc;
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -422,7 +422,7 @@ static int xenon_probe_dt(struct platform_device *pdev)
host->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200;
sdhc_id = 0x0;
- if (!of_property_read_u32(np, "marvell,xenon-sdhc-id", &sdhc_id)) {
+ if (!device_property_read_u32(dev, "marvell,xenon-sdhc-id", &sdhc_id)) {
nr_sdhc = sdhci_readl(host, XENON_SYS_CFG_INFO);
nr_sdhc &= XENON_NR_SUPPORTED_SLOT_MASK;
if (unlikely(sdhc_id > nr_sdhc)) {
@@ -434,8 +434,8 @@ static int xenon_probe_dt(struct platform_device *pdev)
priv->sdhc_id = sdhc_id;
tuning_count = XENON_DEF_TUNING_COUNT;
- if (!of_property_read_u32(np, "marvell,xenon-tun-count",
- &tuning_count)) {
+ if (!device_property_read_u32(dev, "marvell,xenon-tun-count",
+ &tuning_count)) {
if (unlikely(tuning_count >= XENON_TMR_RETUN_NO_PRESENT)) {
dev_err(mmc_dev(mmc), "Wrong Re-tuning Count. Set default value %d\n",
XENON_DEF_TUNING_COUNT);
@@ -444,7 +444,7 @@ static int xenon_probe_dt(struct platform_device *pdev)
}
priv->tuning_count = tuning_count;
- return xenon_phy_parse_dt(np, host);
+ return xenon_phy_parse_params(dev, host);
}
static int xenon_sdhc_prepare(struct sdhci_host *host)
@@ -528,12 +528,12 @@ static int xenon_probe(struct platform_device *pdev)
if (err)
goto err_clk_axi;
- sdhci_get_of_property(pdev);
+ sdhci_get_property(pdev);
xenon_set_acg(host, false);
- /* Xenon specific dt parse */
- err = xenon_probe_dt(pdev);
+ /* Xenon specific parameters parse */
+ err = xenon_probe_params(pdev);
if (err)
goto err_clk_axi;
--
2.29.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/4] mmc: sdhci-xenon: use clk only with DT
2020-11-20 3:26 [PATCH v2 0/4] sdhci-xenon ACPI support Marcin Wojtas
2020-11-20 3:26 ` [PATCH v2 1/4] mmc: sdhci-xenon: use match data for controllers variants Marcin Wojtas
2020-11-20 3:26 ` [PATCH v2 2/4] mmc: sdhci-xenon: switch to device_* API Marcin Wojtas
@ 2020-11-20 3:26 ` Marcin Wojtas
2020-11-24 11:31 ` Ulf Hansson
2020-11-20 3:26 ` [PATCH v2 4/4] mmc: sdhci-xenon: introduce ACPI support Marcin Wojtas
2020-12-02 8:29 ` [PATCH v2 0/4] sdhci-xenon " Adrian Hunter
4 siblings, 1 reply; 9+ messages in thread
From: Marcin Wojtas @ 2020-11-20 3:26 UTC (permalink / raw)
To: linux-kernel, linux-mmc
Cc: ulf.hansson, huziji, adrian.hunter, jaz, tn, ard.biesheuvel,
kostap, Marcin Wojtas
As a preparation for supporting ACPI, modify the driver
to use the clk framework only when booting with DT -
otherwise rely on the configuration done by firmware.
For that purpose introduce also a custom SDHCI get_max_clock
callback.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
drivers/mmc/host/sdhci-xenon.c | 80 +++++++++++++-------
1 file changed, 51 insertions(+), 29 deletions(-)
diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
index bfc76b0e3eaa..dfc3b5f62a6d 100644
--- a/drivers/mmc/host/sdhci-xenon.c
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -247,6 +247,16 @@ static void xenon_voltage_switch(struct sdhci_host *host)
sdhci_readw(host, SDHCI_HOST_CONTROL2);
}
+static unsigned int xenon_get_max_clock(struct sdhci_host *host)
+{
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+
+ if (pltfm_host->clk)
+ return sdhci_pltfm_clk_get_max_clock(host);
+ else
+ return pltfm_host->clock;
+}
+
static const struct sdhci_ops sdhci_xenon_ops = {
.voltage_switch = xenon_voltage_switch,
.set_clock = sdhci_set_clock,
@@ -254,7 +264,7 @@ static const struct sdhci_ops sdhci_xenon_ops = {
.set_bus_width = sdhci_set_bus_width,
.reset = xenon_reset,
.set_uhs_signaling = xenon_set_uhs_signaling,
- .get_max_clock = sdhci_pltfm_clk_get_max_clock,
+ .get_max_clock = xenon_get_max_clock,
};
static const struct sdhci_pltfm_data sdhci_xenon_pdata = {
@@ -483,6 +493,7 @@ static void xenon_sdhc_unprepare(struct sdhci_host *host)
static int xenon_probe(struct platform_device *pdev)
{
struct sdhci_pltfm_host *pltfm_host;
+ struct device *dev = &pdev->dev;
struct sdhci_host *host;
struct xenon_priv *priv;
int err;
@@ -503,25 +514,27 @@ static int xenon_probe(struct platform_device *pdev)
*/
xenon_replace_mmc_host_ops(host);
- pltfm_host->clk = devm_clk_get(&pdev->dev, "core");
- if (IS_ERR(pltfm_host->clk)) {
- err = PTR_ERR(pltfm_host->clk);
- dev_err(&pdev->dev, "Failed to setup input clk: %d\n", err);
- goto free_pltfm;
- }
- err = clk_prepare_enable(pltfm_host->clk);
- if (err)
- goto free_pltfm;
-
- priv->axi_clk = devm_clk_get(&pdev->dev, "axi");
- if (IS_ERR(priv->axi_clk)) {
- err = PTR_ERR(priv->axi_clk);
- if (err == -EPROBE_DEFER)
- goto err_clk;
- } else {
- err = clk_prepare_enable(priv->axi_clk);
+ if (dev->of_node) {
+ pltfm_host->clk = devm_clk_get(&pdev->dev, "core");
+ if (IS_ERR(pltfm_host->clk)) {
+ err = PTR_ERR(pltfm_host->clk);
+ dev_err(&pdev->dev, "Failed to setup input clk: %d\n", err);
+ goto free_pltfm;
+ }
+ err = clk_prepare_enable(pltfm_host->clk);
if (err)
- goto err_clk;
+ goto free_pltfm;
+
+ priv->axi_clk = devm_clk_get(&pdev->dev, "axi");
+ if (IS_ERR(priv->axi_clk)) {
+ err = PTR_ERR(priv->axi_clk);
+ if (err == -EPROBE_DEFER)
+ goto err_clk;
+ } else {
+ err = clk_prepare_enable(priv->axi_clk);
+ if (err)
+ goto err_clk;
+ }
}
err = mmc_of_parse(host->mmc);
@@ -561,9 +574,11 @@ static int xenon_probe(struct platform_device *pdev)
pm_runtime_put_noidle(&pdev->dev);
xenon_sdhc_unprepare(host);
err_clk_axi:
- clk_disable_unprepare(priv->axi_clk);
+ if (dev->of_node)
+ clk_disable_unprepare(priv->axi_clk);
err_clk:
- clk_disable_unprepare(pltfm_host->clk);
+ if (dev->of_node)
+ clk_disable_unprepare(pltfm_host->clk);
free_pltfm:
sdhci_pltfm_free(pdev);
return err;
@@ -574,6 +589,7 @@ static int xenon_remove(struct platform_device *pdev)
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct xenon_priv *priv = sdhci_pltfm_priv(pltfm_host);
+ struct device *dev = &pdev->dev;
pm_runtime_get_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
@@ -582,8 +598,10 @@ static int xenon_remove(struct platform_device *pdev)
sdhci_remove_host(host, 0);
xenon_sdhc_unprepare(host);
- clk_disable_unprepare(priv->axi_clk);
- clk_disable_unprepare(pltfm_host->clk);
+ if (dev->of_node) {
+ clk_disable_unprepare(priv->axi_clk);
+ clk_disable_unprepare(pltfm_host->clk);
+ }
sdhci_pltfm_free(pdev);
@@ -620,7 +638,8 @@ static int xenon_runtime_suspend(struct device *dev)
if (host->tuning_mode != SDHCI_TUNING_MODE_3)
mmc_retune_needed(host->mmc);
- clk_disable_unprepare(pltfm_host->clk);
+ if (dev->of_node)
+ clk_disable_unprepare(pltfm_host->clk);
/*
* Need to update the priv->clock here, or when runtime resume
* back, phy don't aware the clock change and won't adjust phy
@@ -637,10 +656,12 @@ static int xenon_runtime_resume(struct device *dev)
struct xenon_priv *priv = sdhci_pltfm_priv(pltfm_host);
int ret;
- ret = clk_prepare_enable(pltfm_host->clk);
- if (ret) {
- dev_err(dev, "can't enable mainck\n");
- return ret;
+ if (dev->of_node) {
+ ret = clk_prepare_enable(pltfm_host->clk);
+ if (ret) {
+ dev_err(dev, "can't enable mainck\n");
+ return ret;
+ }
}
if (priv->restore_needed) {
@@ -655,7 +676,8 @@ static int xenon_runtime_resume(struct device *dev)
goto out;
return 0;
out:
- clk_disable_unprepare(pltfm_host->clk);
+ if (dev->of_node)
+ clk_disable_unprepare(pltfm_host->clk);
return ret;
}
#endif /* CONFIG_PM */
--
2.29.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 3/4] mmc: sdhci-xenon: use clk only with DT
2020-11-20 3:26 ` [PATCH v2 3/4] mmc: sdhci-xenon: use clk only with DT Marcin Wojtas
@ 2020-11-24 11:31 ` Ulf Hansson
2020-11-25 11:50 ` Marcin Wojtas
0 siblings, 1 reply; 9+ messages in thread
From: Ulf Hansson @ 2020-11-24 11:31 UTC (permalink / raw)
To: Marcin Wojtas
Cc: Linux Kernel Mailing List, linux-mmc, Ziji Hu, Adrian Hunter,
jaz, tn, ard.biesheuvel, Kostya Porotchkin
On Fri, 20 Nov 2020 at 04:27, Marcin Wojtas <mw@semihalf.com> wrote:
>
> As a preparation for supporting ACPI, modify the driver
> to use the clk framework only when booting with DT -
> otherwise rely on the configuration done by firmware.
> For that purpose introduce also a custom SDHCI get_max_clock
> callback.
>
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
[...]
> @@ -561,9 +574,11 @@ static int xenon_probe(struct platform_device *pdev)
> pm_runtime_put_noidle(&pdev->dev);
> xenon_sdhc_unprepare(host);
> err_clk_axi:
> - clk_disable_unprepare(priv->axi_clk);
> + if (dev->of_node)
> + clk_disable_unprepare(priv->axi_clk);
> err_clk:
> - clk_disable_unprepare(pltfm_host->clk);
> + if (dev->of_node)
> + clk_disable_unprepare(pltfm_host->clk);
There's no need to check the dev->of_node, I believe. The
clk_disable_unprepare() is capable of managing a NULL pointer as
in-parameter.
[...]
Kind regards
Uffe
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/4] mmc: sdhci-xenon: use clk only with DT
2020-11-24 11:31 ` Ulf Hansson
@ 2020-11-25 11:50 ` Marcin Wojtas
0 siblings, 0 replies; 9+ messages in thread
From: Marcin Wojtas @ 2020-11-25 11:50 UTC (permalink / raw)
To: Ulf Hansson
Cc: Linux Kernel Mailing List, linux-mmc, Ziji Hu, Adrian Hunter,
Grzegorz Jaszczyk, Tomasz Nowicki, Ard Biesheuvel,
Kostya Porotchkin
Hi Ulf
wt., 24 lis 2020 o 12:31 Ulf Hansson <ulf.hansson@linaro.org> napisał(a):
>
> On Fri, 20 Nov 2020 at 04:27, Marcin Wojtas <mw@semihalf.com> wrote:
> >
> > As a preparation for supporting ACPI, modify the driver
> > to use the clk framework only when booting with DT -
> > otherwise rely on the configuration done by firmware.
> > For that purpose introduce also a custom SDHCI get_max_clock
> > callback.
> >
> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>
> [...]
>
> > @@ -561,9 +574,11 @@ static int xenon_probe(struct platform_device *pdev)
> > pm_runtime_put_noidle(&pdev->dev);
> > xenon_sdhc_unprepare(host);
> > err_clk_axi:
> > - clk_disable_unprepare(priv->axi_clk);
> > + if (dev->of_node)
> > + clk_disable_unprepare(priv->axi_clk);
> > err_clk:
> > - clk_disable_unprepare(pltfm_host->clk);
> > + if (dev->of_node)
> > + clk_disable_unprepare(pltfm_host->clk);
>
> There's no need to check the dev->of_node, I believe. The
> clk_disable_unprepare() is capable of managing a NULL pointer as
> in-parameter.
>
Indeed, clk_disable_unprepare() can handle the NULL pointers. I will
wait a couple of days for other comments/remarks and will update this
patch in v3.
Best regards,
Marcin
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 4/4] mmc: sdhci-xenon: introduce ACPI support
2020-11-20 3:26 [PATCH v2 0/4] sdhci-xenon ACPI support Marcin Wojtas
` (2 preceding siblings ...)
2020-11-20 3:26 ` [PATCH v2 3/4] mmc: sdhci-xenon: use clk only with DT Marcin Wojtas
@ 2020-11-20 3:26 ` Marcin Wojtas
2020-12-02 8:29 ` [PATCH v2 0/4] sdhci-xenon " Adrian Hunter
4 siblings, 0 replies; 9+ messages in thread
From: Marcin Wojtas @ 2020-11-20 3:26 UTC (permalink / raw)
To: linux-kernel, linux-mmc
Cc: ulf.hansson, huziji, adrian.hunter, jaz, tn, ard.biesheuvel,
kostap, Marcin Wojtas
Previous patches dropped the strict dependency on the OF_*
in the sdhci-xenon driver. As a result the ACPI support
can be introduced (except for the XENON_A3700 variant)
by adding the necessary ID's in the acpi_match_table.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
drivers/mmc/host/sdhci-xenon.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
index dfc3b5f62a6d..6d4f588d4c11 100644
--- a/drivers/mmc/host/sdhci-xenon.c
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -11,6 +11,7 @@
* Special thanks to Video BG4 project team.
*/
+#include <linux/acpi.h>
#include <linux/delay.h>
#include <linux/ktime.h>
#include <linux/module.h>
@@ -698,11 +699,22 @@ static const struct of_device_id sdhci_xenon_dt_ids[] = {
};
MODULE_DEVICE_TABLE(of, sdhci_xenon_dt_ids);
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id sdhci_xenon_acpi_ids[] = {
+ { .id = "MRVL0002", XENON_AP806},
+ { .id = "MRVL0003", XENON_AP807},
+ { .id = "MRVL0004", XENON_CP110},
+ {}
+};
+MODULE_DEVICE_TABLE(acpi, sdhci_xenon_acpi_ids);
+#endif
+
static struct platform_driver sdhci_xenon_driver = {
.driver = {
.name = "xenon-sdhci",
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
.of_match_table = sdhci_xenon_dt_ids,
+ .acpi_match_table = ACPI_PTR(sdhci_xenon_acpi_ids),
.pm = &sdhci_xenon_dev_pm_ops,
},
.probe = xenon_probe,
--
2.29.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 0/4] sdhci-xenon ACPI support
2020-11-20 3:26 [PATCH v2 0/4] sdhci-xenon ACPI support Marcin Wojtas
` (3 preceding siblings ...)
2020-11-20 3:26 ` [PATCH v2 4/4] mmc: sdhci-xenon: introduce ACPI support Marcin Wojtas
@ 2020-12-02 8:29 ` Adrian Hunter
2020-12-02 17:39 ` Marcin Wojtas
4 siblings, 1 reply; 9+ messages in thread
From: Adrian Hunter @ 2020-12-02 8:29 UTC (permalink / raw)
To: Marcin Wojtas, linux-kernel, linux-mmc
Cc: ulf.hansson, huziji, jaz, tn, ard.biesheuvel, kostap
On 20/11/20 5:26 am, Marcin Wojtas wrote:
> Hi,
>
> The second version of the sdhci-xenon ACPI support
> is now split into 4 patches instead of a single one.
> There are minor functional differencse - match_data
> introduction and using dedicated ACPI ID per
> controller variant.
>
> The MacchiatoBin firmware for testing can be obtained from:
> https://drive.google.com/file/d/1Y8BhyaCrksQgT_GPfpqqiYHpQ41kP8Kp
>
> Changelog:
> v1->v2
> * Split single commit to 4
> * Use device_match_data and dedicated ACPI ID's per controller
> variant
>
> Marcin Wojtas (4):
> mmc: sdhci-xenon: use match data for controllers variants
> mmc: sdhci-xenon: switch to device_* API
> mmc: sdhci-xenon: use clk only with DT
> mmc: sdhci-xenon: introduce ACPI support
>
> drivers/mmc/host/sdhci-xenon.h | 12 +-
> drivers/mmc/host/sdhci-xenon-phy.c | 40 ++++---
> drivers/mmc/host/sdhci-xenon.c | 120 +++++++++++++-------
> 3 files changed, 110 insertions(+), 62 deletions(-)
>
Not withstanding Ulf's comments:
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 0/4] sdhci-xenon ACPI support
2020-12-02 8:29 ` [PATCH v2 0/4] sdhci-xenon " Adrian Hunter
@ 2020-12-02 17:39 ` Marcin Wojtas
0 siblings, 0 replies; 9+ messages in thread
From: Marcin Wojtas @ 2020-12-02 17:39 UTC (permalink / raw)
To: Adrian Hunter
Cc: Linux Kernel Mailing List, linux-mmc, Ulf Hansson, Ziji Hu,
Grzegorz Jaszczyk, Tomasz Nowicki, Ard Biesheuvel,
Kostya Porotchkin
śr., 2 gru 2020 o 09:30 Adrian Hunter <adrian.hunter@intel.com> napisał(a):
>
> On 20/11/20 5:26 am, Marcin Wojtas wrote:
> > Hi,
> >
> > The second version of the sdhci-xenon ACPI support
> > is now split into 4 patches instead of a single one.
> > There are minor functional differencse - match_data
> > introduction and using dedicated ACPI ID per
> > controller variant.
> >
> > The MacchiatoBin firmware for testing can be obtained from:
> > https://drive.google.com/file/d/1Y8BhyaCrksQgT_GPfpqqiYHpQ41kP8Kp
> >
> > Changelog:
> > v1->v2
> > * Split single commit to 4
> > * Use device_match_data and dedicated ACPI ID's per controller
> > variant
> >
> > Marcin Wojtas (4):
> > mmc: sdhci-xenon: use match data for controllers variants
> > mmc: sdhci-xenon: switch to device_* API
> > mmc: sdhci-xenon: use clk only with DT
> > mmc: sdhci-xenon: introduce ACPI support
> >
> > drivers/mmc/host/sdhci-xenon.h | 12 +-
> > drivers/mmc/host/sdhci-xenon-phy.c | 40 ++++---
> > drivers/mmc/host/sdhci-xenon.c | 120 +++++++++++++-------
> > 3 files changed, 110 insertions(+), 62 deletions(-)
> >
>
> Not withstanding Ulf's comments:
>
> Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Thank you, I will push v3 right away.
Best regards,
Marcin
^ permalink raw reply [flat|nested] 9+ messages in thread