forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-08 01573e231f18eb2d99162747186f59511f56b64d 
 kernel/drivers/mmc/host/moxart-mmc.c
....@@ -111,8 +111,8 @@
111111 #define CLK_DIV_MASK		0x7f
112112 
113113 /* REG_BUS_WIDTH */
114
-#define BUS_WIDTH_8		BIT(2)
115
-#define BUS_WIDTH_4		BIT(1)
114
+#define BUS_WIDTH_4_SUPPORT	BIT(3)
115
+#define BUS_WIDTH_4		BIT(2)
116116 #define BUS_WIDTH_1		BIT(0)
117117 
118118 #define MMC_VDD_360		23
....@@ -527,9 +527,6 @@
527527 	case MMC_BUS_WIDTH_4:
528528 		writel(BUS_WIDTH_4, host->base + REG_BUS_WIDTH);
529529 		break;
530
-	case MMC_BUS_WIDTH_8:
531
-		writel(BUS_WIDTH_8, host->base + REG_BUS_WIDTH);
532
-		break;
533530 	default:
534531 		writel(BUS_WIDTH_1, host->base + REG_BUS_WIDTH);
535532 		break;
....@@ -569,37 +566,37 @@
569566 	if (!mmc) {
570567 		dev_err(dev, "mmc_alloc_host failed\n");
571568 		ret = -ENOMEM;
572
-		goto out;
569
+		goto out_mmc;
573570 	}
574571 
575572 	ret = of_address_to_resource(node, 0, &res_mmc);
576573 	if (ret) {
577574 		dev_err(dev, "of_address_to_resource failed\n");
578
-		goto out;
575
+		goto out_mmc;
579576 	}
580577 
581578 	irq = irq_of_parse_and_map(node, 0);
582579 	if (irq <= 0) {
583580 		dev_err(dev, "irq_of_parse_and_map failed\n");
584581 		ret = -EINVAL;
585
-		goto out;
582
+		goto out_mmc;
586583 	}
587584 
588585 	clk = devm_clk_get(dev, NULL);
589586 	if (IS_ERR(clk)) {
590587 		ret = PTR_ERR(clk);
591
-		goto out;
588
+		goto out_mmc;
592589 	}
593590 
594591 	reg_mmc = devm_ioremap_resource(dev, &res_mmc);
595592 	if (IS_ERR(reg_mmc)) {
596593 		ret = PTR_ERR(reg_mmc);
597
-		goto out;
594
+		goto out_mmc;
598595 	}
599596 
600597 	ret = mmc_of_parse(mmc);
601598 	if (ret)
602
-		goto out;
599
+		goto out_mmc;
603600 
604601 	host = mmc_priv(mmc);
605602 	host->mmc = mmc;
....@@ -608,8 +605,8 @@
608605 	host->timeout = msecs_to_jiffies(1000);
609606 	host->sysclk = clk_get_rate(clk);
610607 	host->fifo_width = readl(host->base + REG_FEATURE) << 2;
611
-	host->dma_chan_tx = dma_request_slave_channel_reason(dev, "tx");
612
-	host->dma_chan_rx = dma_request_slave_channel_reason(dev, "rx");
608
+	host->dma_chan_tx = dma_request_chan(dev, "tx");
609
+	host->dma_chan_rx = dma_request_chan(dev, "rx");
613610 
614611 	spin_lock_init(&host->lock);
615612 
....@@ -623,6 +620,14 @@
623620 		    PTR_ERR(host->dma_chan_rx) == -EPROBE_DEFER) {
624621 			ret = -EPROBE_DEFER;
625622 			goto out;
623
+		}
624
+		if (!IS_ERR(host->dma_chan_tx)) {
625
+			dma_release_channel(host->dma_chan_tx);
626
+			host->dma_chan_tx = NULL;
627
+		}
628
+		if (!IS_ERR(host->dma_chan_rx)) {
629
+			dma_release_channel(host->dma_chan_rx);
630
+			host->dma_chan_rx = NULL;
626631 		}
627632 		dev_dbg(dev, "PIO mode transfer enabled\n");
628633 		host->have_dma = false;
....@@ -646,16 +651,8 @@
646651 		dmaengine_slave_config(host->dma_chan_rx, &cfg);
647652 	}
648653 
649
-	switch ((readl(host->base + REG_BUS_WIDTH) >> 3) & 3) {
650
-	case 1:
654
+	if (readl(host->base + REG_BUS_WIDTH) & BUS_WIDTH_4_SUPPORT)
651655 		mmc->caps |= MMC_CAP_4_BIT_DATA;
652
-		break;
653
-	case 2:
654
-		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
655
-		break;
656
-	default:
657
-		break;
658
-	}
659656 
660657 	writel(0, host->base + REG_INTERRUPT_MASK);
661658 
....@@ -678,6 +675,11 @@
678675 	return 0;
679676 
680677 out:
678
+	if (!IS_ERR_OR_NULL(host->dma_chan_tx))
679
+		dma_release_channel(host->dma_chan_tx);
680
+	if (!IS_ERR_OR_NULL(host->dma_chan_rx))
681
+		dma_release_channel(host->dma_chan_rx);
682
+out_mmc:
681683 	if (mmc)
682684 		mmc_free_host(mmc);
683685 	return ret;
....@@ -690,19 +692,18 @@
690692 
691693 	dev_set_drvdata(&pdev->dev, NULL);
692694 
693
-	if (mmc) {
694
-		if (!IS_ERR(host->dma_chan_tx))
695
-			dma_release_channel(host->dma_chan_tx);
696
-		if (!IS_ERR(host->dma_chan_rx))
697
-			dma_release_channel(host->dma_chan_rx);
698
-		mmc_remove_host(mmc);
695
+	if (!IS_ERR_OR_NULL(host->dma_chan_tx))
696
+		dma_release_channel(host->dma_chan_tx);
697
+	if (!IS_ERR_OR_NULL(host->dma_chan_rx))
698
+		dma_release_channel(host->dma_chan_rx);
699
+	mmc_remove_host(mmc);
699700 
700
-		writel(0, host->base + REG_INTERRUPT_MASK);
701
-		writel(0, host->base + REG_POWER_CONTROL);
702
-		writel(readl(host->base + REG_CLOCK_CONTROL) | CLK_OFF,
703
-		       host->base + REG_CLOCK_CONTROL);
704
-		mmc_free_host(mmc);
705
-	}
701
+	writel(0, host->base + REG_INTERRUPT_MASK);
702
+	writel(0, host->base + REG_POWER_CONTROL);
703
+	writel(readl(host->base + REG_CLOCK_CONTROL) | CLK_OFF,
704
+	       host->base + REG_CLOCK_CONTROL);
705
+	mmc_free_host(mmc);
706
+
706707 	return 0;
707708 }
708709 
....@@ -718,6 +719,7 @@
718719 	.remove     = moxart_remove,
719720 	.driver     = {
720721 		.name		= "mmc-moxart",
722
+		.probe_type	= PROBE_PREFER_ASYNCHRONOUS,
721723 		.of_match_table	= moxart_mmc_match,
722724 	},
723725 };