]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mmc: hi6220_dw_mmc: add fifoth_val to private data and set it in .probe
authorYang Xiwen <forbidden405@outlook.com>
Thu, 1 Feb 2024 14:05:44 +0000 (22:05 +0800)
committerJaehoon Chung <jh80.chung@samsung.com>
Mon, 15 Apr 2024 07:01:48 +0000 (16:01 +0900)
The value defaults to 0 and is ignored by dw_mmc code, so the other
users are not affected.

Setting this explicitly fixes some weird reading error found on Hi3798MV200.

Fixes: 8a5dc8140e62 ("mmc: hi6220_dw_mmc: add compatible for HC2910 support")
Signed-off-by: Yang Xiwen <forbidden405@outlook.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
drivers/mmc/hi6220_dw_mmc.c

index a4b80729764bcf3890ed2df80325e02112e3689d..dc0210402bd21fad9c8a17ca2eb67d959b01be74 100644 (file)
@@ -37,6 +37,7 @@ struct hi6220_dwmmc_priv_data {
 struct hisi_mmc_data {
        unsigned int clock;
        bool use_fifo;
+       u32 fifoth_val;
 };
 
 static int hi6220_dwmmc_of_to_plat(struct udevice *dev)
@@ -125,6 +126,7 @@ static int hi6220_dwmmc_probe(struct udevice *dev)
        host->mmc = &plat->mmc;
 
        host->fifo_mode = mmc_data->use_fifo;
+       host->fifoth_val = mmc_data->fifoth_val;
        host->mmc->priv = &priv->host;
        upriv->mmc = host->mmc;
        host->mmc->dev = dev;
@@ -154,13 +156,20 @@ static const struct hisi_mmc_data hi6220_mmc_data = {
        .use_fifo = false,
 };
 
+static const struct hisi_mmc_data hi3798mv2x_mmc_data = {
+       .clock = 50000000,
+       .use_fifo = false,
+       // FIFO depth is 256
+       .fifoth_val = MSIZE(4) | RX_WMARK(0x7f) | TX_WMARK(0x80),
+};
+
 static const struct udevice_id hi6220_dwmmc_ids[] = {
        { .compatible = "hisilicon,hi6220-dw-mshc",
          .data = (ulong)&hi6220_mmc_data },
        { .compatible = "hisilicon,hi3798cv200-dw-mshc",
          .data = (ulong)&hi6220_mmc_data },
        { .compatible = "hisilicon,hi3798mv200-dw-mshc",
-         .data = (ulong)&hi6220_mmc_data },
+         .data = (ulong)&hi3798mv2x_mmc_data },
        { .compatible = "hisilicon,hi3660-dw-mshc",
          .data = (ulong)&hi3660_mmc_data },
        { }