This patch set adds SDHCI support for the Nuvoton NPCM Baseboard
Management Controller (BMC).
Deeply sorry it took that long until sending version three, promise to try
to do better on the next versions (if needed) :-),
The NPCM SDHCI driver tested on NPCM750 and NPCM845 EVB.
Addressed comments from:
- Andy Shevchenko : https://www.spinics.net/lists/linux-mmc/msg74824.html
- Adrian Hunter : https://www.spinics.net/lists/linux-mmc/msg73353.html
- Guenter Roeck : https://www.spinics.net/lists/linux-mmc/msg74822.html
Changes since version 2:
- Add data to handle architecture-specific SDHCI parameters.
- Change config place in make and kconfig files.
- Calling sdhci_pltfm_free to to avoid a memory leak on error.
Changes since version 1:
- Use correct spaces in the dt-bindings.
- Drop unused labels from dt-bindings.
- Order by module name in the make a configuration.
- Remove unnecessary blank lines.
- Using devm_clk_get_optional instead of devm_clk_get.
Tomer Maimon (2):
dt-bindings: mmc: npcm,sdhci: Document NPCM SDHCI controller
mmc: sdhci-npcm: Add NPCM SDHCI driver
.../devicetree/bindings/mmc/npcm,sdhci.yaml | 45 +++++++++
drivers/mmc/host/Kconfig | 8 ++
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/sdhci-npcm.c | 99 +++++++++++++++++++
4 files changed, 153 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mmc/npcm,sdhci.yaml
create mode 100644 drivers/mmc/host/sdhci-npcm.c
--
2.33.0
Add Nuvoton NPCM BMC sdhci-pltfm controller driver.
Signed-off-by: Tomer Maimon <[email protected]>
Acked-by: Adrian Hunter <[email protected]>
---
drivers/mmc/host/Kconfig | 8 +++
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/sdhci-npcm.c | 99 +++++++++++++++++++++++++++++++++++
3 files changed, 108 insertions(+)
create mode 100644 drivers/mmc/host/sdhci-npcm.c
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 554e67103c1a..3999d4fddc73 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -429,6 +429,14 @@ config MMC_SDHCI_IPROC
If unsure, say N.
+config MMC_SDHCI_NPCM
+ tristate "Secure Digital Host Controller Interface support for NPCM"
+ depends on ARCH_NPCM || COMPILE_TEST
+ depends on MMC_SDHCI_PLTFM
+ help
+ This provides support for the SD/eMMC controller found in
+ NPCM BMC family SoCs.
+
config MMC_MESON_GX
tristate "Amlogic S905/GX*/AXG SD/MMC Host Controller support"
depends on ARCH_MESON|| COMPILE_TEST
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index a693fa3d3f1c..d0be4465f3ec 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -89,6 +89,7 @@ obj-$(CONFIG_MMC_SDHCI_OF_DWCMSHC) += sdhci-of-dwcmshc.o
obj-$(CONFIG_MMC_SDHCI_OF_SPARX5) += sdhci-of-sparx5.o
obj-$(CONFIG_MMC_SDHCI_BCM_KONA) += sdhci-bcm-kona.o
obj-$(CONFIG_MMC_SDHCI_IPROC) += sdhci-iproc.o
+obj-$(CONFIG_MMC_SDHCI_NPCM) += sdhci-npcm.o
obj-$(CONFIG_MMC_SDHCI_MSM) += sdhci-msm.o
obj-$(CONFIG_MMC_SDHCI_ST) += sdhci-st.o
obj-$(CONFIG_MMC_SDHCI_MICROCHIP_PIC32) += sdhci-pic32.o
diff --git a/drivers/mmc/host/sdhci-npcm.c b/drivers/mmc/host/sdhci-npcm.c
new file mode 100644
index 000000000000..59ccadb05aa2
--- /dev/null
+++ b/drivers/mmc/host/sdhci-npcm.c
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * NPCM SDHC MMC host controller driver.
+ *
+ * Copyright (c) 2020 Nuvoton Technology corporation.
+ */
+
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/mmc.h>
+#include <linux/module.h>
+#include <linux/of.h>
+
+#include "sdhci-pltfm.h"
+
+static const struct sdhci_pltfm_data npcm7xx_sdhci_pdata = {
+ .quirks = SDHCI_QUIRK_DELAY_AFTER_POWER,
+ .quirks2 = SDHCI_QUIRK2_STOP_WITH_TC |
+ SDHCI_QUIRK2_NO_1_8_V,
+};
+
+static const struct sdhci_pltfm_data npcm8xx_sdhci_pdata = {
+ .quirks = SDHCI_QUIRK_DELAY_AFTER_POWER,
+ .quirks2 = SDHCI_QUIRK2_STOP_WITH_TC,
+};
+
+static int npcm_sdhci_probe(struct platform_device *pdev)
+{
+ const struct sdhci_pltfm_data *data;
+ struct sdhci_pltfm_host *pltfm_host;
+ struct device *dev = &pdev->dev;
+ struct sdhci_host *host;
+ u32 caps;
+ int ret;
+
+ data = of_device_get_match_data(dev);
+ if (!data)
+ return -EINVAL;
+
+ host = sdhci_pltfm_init(pdev, data, 0);
+ if (IS_ERR(host))
+ return PTR_ERR(host);
+
+ pltfm_host = sdhci_priv(host);
+
+ pltfm_host->clk = devm_clk_get_optional(&pdev->dev, NULL);
+ if (IS_ERR(pltfm_host->clk)) {
+ ret = PTR_ERR(pltfm_host->clk);
+ goto err_sdhci;
+ }
+
+ ret = clk_prepare_enable(pltfm_host->clk);
+ if (ret)
+ goto err_sdhci;
+
+ caps = sdhci_readl(host, SDHCI_CAPABILITIES);
+ if (caps & SDHCI_CAN_DO_8BIT)
+ host->mmc->caps |= MMC_CAP_8_BIT_DATA;
+
+ ret = mmc_of_parse(host->mmc);
+ if (ret)
+ goto err_sdhci_clk;
+
+ ret = sdhci_add_host(host);
+ if (ret)
+ goto err_sdhci_clk;
+
+ return 0;
+
+err_sdhci_clk:
+ clk_disable_unprepare(pltfm_host->clk);
+err_sdhci:
+ sdhci_pltfm_free(pdev);
+ return ret;
+}
+
+static const struct of_device_id npcm_sdhci_of_match[] = {
+ { .compatible = "nuvoton,npcm750-sdhci", .data = &npcm7xx_sdhci_pdata, },
+ { .compatible = "nuvoton,npcm845-sdhci", .data = &npcm8xx_sdhci_pdata, },
+ { }
+};
+MODULE_DEVICE_TABLE(of, npcm_sdhci_of_match);
+
+static struct platform_driver npcm_sdhci_driver = {
+ .driver = {
+ .name = "npcm-sdhci",
+ .of_match_table = npcm_sdhci_of_match,
+ .pm = &sdhci_pltfm_pmops,
+ },
+ .probe = npcm_sdhci_probe,
+ .remove_new = sdhci_pltfm_remove,
+};
+module_platform_driver(npcm_sdhci_driver);
+
+MODULE_DESCRIPTION("NPCM Secure Digital Host Controller Interface driver");
+MODULE_AUTHOR("Tomer Maimon <[email protected]>");
+MODULE_LICENSE("GPL");
--
2.33.0
Add binding for Nuvoton NPCM SDHCI controller.
Signed-off-by: Tomer Maimon <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
---
.../devicetree/bindings/mmc/npcm,sdhci.yaml | 45 +++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mmc/npcm,sdhci.yaml
diff --git a/Documentation/devicetree/bindings/mmc/npcm,sdhci.yaml b/Documentation/devicetree/bindings/mmc/npcm,sdhci.yaml
new file mode 100644
index 000000000000..196fdbfa16ed
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/npcm,sdhci.yaml
@@ -0,0 +1,45 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mmc/npcm,sdhci.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NPCM SDHCI Controller
+
+maintainers:
+ - Tomer Maimon <[email protected]>
+
+allOf:
+ - $ref: mmc-controller.yaml#
+
+properties:
+ compatible:
+ enum:
+ - nuvoton,npcm750-sdhci
+ - nuvoton,npcm845-sdhci
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - clocks
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ mmc@f0840000 {
+ compatible = "nuvoton,npcm750-sdhci";
+ reg = <0xf0840000 0x200>;
+ interrupts = <0 27 4>;
+ clocks = <&clk 4>;
+ };
--
2.33.0
Hi Andy,
Thanks for your comments.
On Mon, 2 Oct 2023 at 21:22, Andy Shevchenko <[email protected]> wrote:
>
> On Mon, Oct 2, 2023 at 8:51 PM Tomer Maimon <[email protected]> wrote:
> >
> > Add Nuvoton NPCM BMC sdhci-pltfm controller driver.
>
> ...
>
> > +/*
> > + * NPCM SDHC MMC host controller driver.
> > + *
> > + * Copyright (c) 2020 Nuvoton Technology corporation.
>
> Shouldn't it be at least 2020,2023 ?
will change to 2023
>
> > + */
>
> ...
>
> > +#include <linux/clk.h>
> > +#include <linux/err.h>
> > +#include <linux/io.h>
> > +#include <linux/mmc/host.h>
> > +#include <linux/mmc/mmc.h>
>
> + mod_devicetable.h
why?
> > +#include <linux/module.h>
> > +#include <linux/of.h>
>
> ...
>
> > + pltfm_host->clk = devm_clk_get_optional(&pdev->dev, NULL);
> > + if (IS_ERR(pltfm_host->clk)) {
> > + ret = PTR_ERR(pltfm_host->clk);
> > + goto err_sdhci;
> > + }
> > +
> > + ret = clk_prepare_enable(pltfm_host->clk);
> > + if (ret)
> > + goto err_sdhci;
>
> Why not use devm_clk_get_optional_enabled()?
Will do
>
> --
> With Best Regards,
> Andy Shevchenko
Best regards,
Tomer
On Mon, Oct 2, 2023 at 8:51 PM Tomer Maimon <[email protected]> wrote:
>
> Add Nuvoton NPCM BMC sdhci-pltfm controller driver.
...
> +/*
> + * NPCM SDHC MMC host controller driver.
> + *
> + * Copyright (c) 2020 Nuvoton Technology corporation.
Shouldn't it be at least 2020,2023 ?
> + */
...
> +#include <linux/clk.h>
> +#include <linux/err.h>
> +#include <linux/io.h>
> +#include <linux/mmc/host.h>
> +#include <linux/mmc/mmc.h>
+ mod_devicetable.h
> +#include <linux/module.h>
> +#include <linux/of.h>
...
> + pltfm_host->clk = devm_clk_get_optional(&pdev->dev, NULL);
> + if (IS_ERR(pltfm_host->clk)) {
> + ret = PTR_ERR(pltfm_host->clk);
> + goto err_sdhci;
> + }
> +
> + ret = clk_prepare_enable(pltfm_host->clk);
> + if (ret)
> + goto err_sdhci;
Why not use devm_clk_get_optional_enabled()?
--
With Best Regards,
Andy Shevchenko