Add support for Amlogic Meson MMC driver

From: Carlo Caione <[email protected]>

Signed-off-by Carlo Caione <[email protected]>

---
 .../devicetree/bindings/mmc/meson-mmc.txt          | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/meson-mmc.txt

Documentation/devicetree/bindings/mmc/meson-mmc.txt new file +8 -0

new file mode 100644
index 0000000..328157e
@@ -0,0 +1,30 @@
+* Amlogic Meson MMC controller
+
+The highspeed MMC host controller on Amlogic SoCs provides an interface
+for MMC, SD, SDIO and SDHC types of memory cards.
+
+Supported maximum speeds are the ones of the eMMC standard 4.41 as well
+as the speed of SD standard 2.0.
+

Documentation/devicetree/bindings/mmc/meson-mmc.txt new file +12 -0

+ - for cd, bus-width and additional generic mmc parameters
+   please refer to mmc.txt within this directory
+
+Examples:
+	mmc0: mmc at c1108c20 {
+		pinctrl-names = "sdio_b";
+		pinctrl-0 = <&mmc0_sd_b_pins>;
+		compatible = "amlogic,meson-mmc";
+		reg = <0xc1108c20 0x20>;
+		interrupts = <0 28 1>;
+		clocks = <&clkc CLKID_CLK81>;
+	};

Signature · 1 line

1.9.1

Quoted 27 lines · Carlo Caione

From: Carlo Caione <[email protected]>

Signed-off-by Carlo Caione <[email protected]>

---
 .../devicetree/bindings/mmc/meson-mmc.txt          | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/meson-mmc.txt

Documentation/devicetree/bindings/mmc/meson-mmc.txt new file +13 -0

new file mode 100644
index 0000000..328157e
@@ -0,0 +1,30 @@
+* Amlogic Meson MMC controller
+
+The highspeed MMC host controller on Amlogic SoCs provides an interface
+for MMC, SD, SDIO and SDHC types of memory cards.
+
+Supported maximum speeds are the ones of the eMMC standard 4.41 as well
+as the speed of SD standard 2.0.
+
+Required properties:
+ - compatible : "amlogic,meson-mmc"
+ - reg : mmc controller base registers
+ - interrupts : mmc controller interrupt
+ - clocks : phandle to clock provider

Documentation/devicetree/bindings/mmc/meson-mmc.txt line 18

Quoted 5 lines

Documentation/devicetree/bindings/mmc/meson-mmc.txt new file +5 -0

+ - pinctrl-names : should contain "sdio_a" or "sdio_b"
+ - pinctrl-0: Should specify pin control groups used for this controller
+
+Optional properties:
+ - meson,sd-port : 0 for port A, 1 for port B

This is different than the pinctrl-names? It needs a better description including what is the default if absent.

Add a driver for the SD/MMC host found on the Amlogic Meson SoCs. This is an MMC controller which provides an interface between the application processor and various memory cards. It supports the SD specification v2.0 and the eMMC specification v4.41.

Signed-off-by Carlo Caione <[email protected]>

Hi Carlo,

Am 27.02.2016 um 19:01 schrieb Carlo Caione:

Quoted 6 lines

Add a driver for the SD/MMC host found on the Amlogic Meson SoCs. This is an MMC controller which provides an interface between the application processor and various memory cards. It supports the SD specification v2.0 and the eMMC specification v4.41.

Signed-off-by Carlo Caione <[email protected]>

Enabling this driver on top of my v2 arm64 gxbb series, I get:

CC drivers/mmc/host/meson-mmc.o
drivers/mmc/host/meson-mmc.c: In function 'meson_mmc_probe':
drivers/mmc/host/meson-mmc.c:471:12: error: implicit declaration of function 'devm_pinctrl_get' [-Werror=implicit-function-declaration]

  pinctrl = devm_pinctrl_get(&pdev->dev);
            ^
drivers/mmc/host/meson-mmc.c:471:10: warning: assignment makes pointer
from integer without a cast [-Wint-conversion]
  pinctrl = devm_pinctrl_get(&pdev->dev);
          ^

cc1: some warnings being treated as errors scripts/Makefile.build:258: recipe for target 'drivers/mmc/host/meson-mmc.o' failed
make[3]: *** [drivers/mmc/host/meson-mmc.o] Error 1 scripts/Makefile.build:407: recipe for target 'drivers/mmc/host' failed make[2]: *** [drivers/mmc/host] Error 2 scripts/Makefile.build:407: recipe for target 'drivers/mmc' failed make[1]: *** [drivers/mmc] Error 2
Makefile:959: recipe for target 'drivers' failed
make: *** [drivers] Error 2

Either this is missing a Kconfig dependency on PINCTRL, or should be using #ifdef CONFIG_PINCTRL or some other guard.

For gxbb we could just ignore this in the hopes that Nicolas will have a working pinctrl driver soon, but it might reappear for COMPILE_TEST.

From: Carlo Caione <[email protected]>

Add a driver for the SD/MMC host found on the Amlogic Meson SoCs. This is an MMC controller which provides an interface between the application processor and various memory cards. It supports the SD specification v2.0 and the eMMC specification v4.41.

Signed-off-by Carlo Caione <[email protected]>

drivers/mmc/host/meson-mmc.c new file +28 -0

+
+       if (host->error) {
+               cmd->error = host->error;
+               spin_unlock_irqrestore(&host->lock, flags);
+               mmc_request_done(mmc, mrq);
+               return;
+       }
+
+       if (data) {
+               ret = meson_mmc_map_dma(host, data, data->flags);
+               if (ret < 0) {
+                       dev_err(mmc_dev(mmc), "map DMA failed\n");
+                       cmd->error = ret;
+                       data->error = ret;
+                       spin_unlock_irqrestore(&host->lock, flags);
+                       mmc_request_done(mmc, mrq);
+                       return;
+               }
+               writel(sg_dma_address(data->sg), host->base + SDIO_ADDR);
+       }
+
+       host->mrq = mrq;
+       meson_mmc_start_cmd(mmc, mrq->cmd);
+
+       spin_unlock_irqrestore(&host->lock, flags);
+
+       schedule_delayed_work(&host->timeout_work, host->timeout);
+}

drivers/mmc/host/meson-mmc.c new file +27 -0

+
+       return IRQ_HANDLED;
+}
+
+void meson_mmc_read_response(struct meson_mmc_host *host)
+{
+       struct mmc_command *cmd = host->mrq->cmd;
+       u32 mult;
+       int i, resp[4] = { 0 };
+
+       mult = readl(host->base + SDIO_MULT);
+       mult |= REG_MULT_WR_RD_OUT_IND;
+       mult &= ~(REG_MULT_RD_INDEX_M << REG_MULT_RD_INDEX_S);
+       writel(mult, host->base + SDIO_MULT);
+
+       if (cmd->flags & MMC_RSP_136) {
+               for (i = 0; i <= 3; i++)
+                       resp[3 - i] = readl(host->base + SDIO_ARGU);
+               cmd->resp[0] = (resp[0] << 8) | ((resp[1] >> 24) & 0xff);
+               cmd->resp[1] = (resp[1] << 8) | ((resp[2] >> 24) & 0xff);
+               cmd->resp[2] = (resp[2] << 8) | ((resp[3] >> 24) & 0xff);
+               cmd->resp[3] = (resp[3] << 8);
+       } else if (cmd->flags & MMC_RSP_PRESENT) {
+               cmd->resp[0] = readl(host->base + SDIO_ARGU);
+       }
+}
+

drivers/mmc/host/meson-mmc.c new file +51 -0

+
+       mrq = host->mrq;
+       data = mrq->data;
+
+       if (!mrq) {
+               spin_unlock_irqrestore(&host->lock, flags);
+               return IRQ_HANDLED;
+       }
+
+       if (host->cmd_is_stop)
+               goto out;
+
+       irqs = readl(host->base + SDIO_IRQS);
+       send = readl(host->base + SDIO_SEND);
+
+       mrq->cmd->error = 0;
+
+       if (!data) {
+               if (!((irqs & REG_IRQS_RESP_CRC7) ||
+                     (send & REG_SEND_RESP_NO_CRC7)))
+                       mrq->cmd->error = -EILSEQ;
+               else
+                       meson_mmc_read_response(host);
+       } else {
+               if (!((irqs & REG_IRQS_RD_CRC16) ||
+                     (irqs & REG_IRQS_WR_CRC16))) {
+                       mrq->cmd->error = -EILSEQ;
+               } else {
+                       data->bytes_xfered = data->blksz * data->blocks;
+                       dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
+                                    ((data->flags & MMC_DATA_READ) ?
+                                    DMA_FROM_DEVICE : DMA_TO_DEVICE));
+               }
+       }
+
+       if (mrq->stop) {
+               host->cmd_is_stop = true;
+               meson_mmc_start_cmd(host->mmc, mrq->stop);
+               spin_unlock_irqrestore(&host->lock, flags);
+               return IRQ_HANDLED;
+       }
+
+out:
+       host->cmd_is_stop = false;
+       host->mrq = NULL;
+       spin_unlock_irqrestore(&host->lock, flags);
+       mmc_request_done(host->mmc, mrq);
+
+       return IRQ_HANDLED;
+}
+

drivers/mmc/host/meson-mmc.c new file +24 -0

+static int meson_mmc_probe(struct platform_device *pdev)
+{
+       struct mmc_host *mmc;
+       struct meson_mmc_host *host;
+       struct pinctrl *pinctrl;
+       struct resource *res;
+       int ret, irq;
+       u32 port;
+
+       mmc = mmc_alloc_host(sizeof(struct meson_mmc_host), &pdev->dev);
+       if (!mmc) {
+               dev_err(&pdev->dev, "mmc alloc host failed\n");
+               return -ENOMEM;
+       }
+
+       host = mmc_priv(mmc);
+       host->mmc = mmc;
+       host->timeout = msecs_to_jiffies(10000);
+       host->port = 0;
+
+       if (!of_property_read_u32(pdev->dev.of_node, "meson,sd-port", &port))
+               host->port = port;
+
+

drivers/mmc/host/meson-mmc.c new file +53 -0

+                                       host);
+       if (ret)
+               goto error_free_host;
+
+       host->clk = devm_clk_get(&pdev->dev, NULL);
+       if (IS_ERR(host->clk)) {
+               ret = PTR_ERR(host->clk);
+               goto error_free_host;
+       }
+
+       ret = clk_prepare_enable(host->clk);
+       if (ret) {
+               dev_err(&pdev->dev, "Enable clk error %d\n", ret);
+               goto error_free_host;
+       }
+
+       /* we do not support scatter lists in hardware */
+       mmc->max_segs = 1;
+       mmc->max_req_size = SDIO_BOUNCE_REQ_SIZE;
+       mmc->max_seg_size = mmc->max_req_size;
+       mmc->max_blk_count = 256;
+       mmc->max_blk_size = mmc->max_req_size / mmc->max_blk_count;
+       mmc->f_min = 300000;
+       mmc->f_max = 50000000;
+       mmc->caps |= MMC_CAP_4_BIT_DATA;
+       mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
+       mmc->caps2 |= MMC_CAP2_NO_SDIO;
+       mmc->ocr_avail = MMC_VDD_33_34;
+       mmc->ops = &meson_mmc_ops;
+
+       spin_lock_init(&host->lock);
+
+       INIT_DELAYED_WORK(&host->timeout_work, meson_mmc_timeout);
+
+       pinctrl = devm_pinctrl_get(&pdev->dev);
+       if (IS_ERR(pinctrl)) {
+               ret = PTR_ERR(pinctrl);
+               goto error;
+       }
+
+       ret = mmc_of_parse(mmc);
+       if (ret)
+               goto error;
+
+       platform_set_drvdata(pdev, mmc);
+
+       ret = mmc_add_host(mmc);
+       if (ret)
+               goto error;
+
+       dev_info(&pdev->dev, "base:0x%p irq:%u port:%u\n",
+                host->base, irq, host->port);
+

From: Carlo Caione <[email protected]>

Enable the MMC for the Meson8b platforms.

Signed-off-by Carlo Caione <[email protected]>

arch/arm/boot/dts/meson8b.dtsi +0 -0

index 8bad557..25d795c 100644
@@ -187,6 +187,22 @@
 					function = "uart_ao";

Hi Carlo,

Quoted 5 lines · Carlo Caione

From: Carlo Caione <[email protected]>

Enable the MMC for the Meson8b platforms.

Signed-off-by Carlo Caione <[email protected]>

[...]

Quoted 12 lines

arch/arm/boot/dts/meson8b.dtsi +4 -0

index 8bad557..25d795c 100644
@@ -187,6 +187,22 @@
                                      function = "uart_ao";
                              };
                      };
+
+                     mmc0_sd_b_pins: mmc0_sd_b {
+                             mux {
+                                     groups = "sd_d1_b", "sd_d0_b", "sd_clk_b", "sd_cmd_b",

arch/arm/boot/dts/meson8b.dtsi line 197

Quoted 4 lines

arch/arm/boot/dts/meson8b.dtsi +4 -0

+                                              "sd_d3_b", "sd_d2_b";
+                                     function = "sd_b";
+                             };
+                     };

These pins are added under pinctrl_aobus, but in the pinctrl driver, they're under cbus. If I move this into the pinctrl_cbus node, I get it to work on my odroid-c1, and am able to mount/use an MMC rootfs.