74 lines
2.8 KiB
Diff
74 lines
2.8 KiB
Diff
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
|
|
index fc62773602ec..1518b64112b7 100644
|
|
--- a/drivers/mmc/host/sunxi-mmc.c
|
|
+++ b/drivers/mmc/host/sunxi-mmc.c
|
|
@@ -244,6 +244,7 @@ struct sunxi_idma_des {
|
|
|
|
struct sunxi_mmc_cfg {
|
|
u32 idma_des_size_bits;
|
|
+ u32 idma_des_shift;
|
|
const struct sunxi_mmc_clk_delay *clk_delays;
|
|
|
|
/* does the IP block support autocalibration? */
|
|
@@ -343,7 +344,7 @@ static int sunxi_mmc_init_host(struct sunxi_mmc_host *host)
|
|
/* Enable CEATA support */
|
|
mmc_writel(host, REG_FUNS, SDXC_CEATA_ON);
|
|
/* Set DMA descriptor list base address */
|
|
- mmc_writel(host, REG_DLBA, host->sg_dma);
|
|
+ mmc_writel(host, REG_DLBA, host->sg_dma >> host->cfg->idma_des_shift);
|
|
|
|
rval = mmc_readl(host, REG_GCTRL);
|
|
rval |= SDXC_INTERRUPT_ENABLE_BIT;
|
|
@@ -373,8 +374,10 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host,
|
|
|
|
next_desc += sizeof(struct sunxi_idma_des);
|
|
pdes[i].buf_addr_ptr1 =
|
|
- cpu_to_le32(sg_dma_address(&data->sg[i]));
|
|
- pdes[i].buf_addr_ptr2 = cpu_to_le32((u32)next_desc);
|
|
+ cpu_to_le32(sg_dma_address(&data->sg[i]) >>
|
|
+ host->cfg->idma_des_shift);
|
|
+ pdes[i].buf_addr_ptr2 = cpu_to_le32((u32)next_desc >>
|
|
+ host->cfg->idma_des_shift);
|
|
}
|
|
|
|
pdes[0].config |= cpu_to_le32(SDXC_IDMAC_DES0_FD);
|
|
@@ -1178,6 +1181,23 @@ static const struct sunxi_mmc_cfg sun50i_a64_emmc_cfg = {
|
|
.needs_new_timings = true,
|
|
};
|
|
|
|
+static const struct sunxi_mmc_cfg sun50i_a100_cfg = {
|
|
+ .idma_des_size_bits = 16,
|
|
+ .idma_des_shift = 2,
|
|
+ .clk_delays = NULL,
|
|
+ .can_calibrate = true,
|
|
+ .mask_data0 = true,
|
|
+ .needs_new_timings = true,
|
|
+};
|
|
+
|
|
+static const struct sunxi_mmc_cfg sun50i_a100_emmc_cfg = {
|
|
+ .idma_des_size_bits = 13,
|
|
+ .idma_des_shift = 2,
|
|
+ .clk_delays = NULL,
|
|
+ .can_calibrate = true,
|
|
+ .needs_new_timings = true,
|
|
+};
|
|
+
|
|
static const struct of_device_id sunxi_mmc_of_match[] = {
|
|
{ .compatible = "allwinner,sun4i-a10-mmc", .data = &sun4i_a10_cfg },
|
|
{ .compatible = "allwinner,sun5i-a13-mmc", .data = &sun5i_a13_cfg },
|
|
@@ -1186,6 +1207,8 @@ static const struct of_device_id sunxi_mmc_of_match[] = {
|
|
{ .compatible = "allwinner,sun9i-a80-mmc", .data = &sun9i_a80_cfg },
|
|
{ .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg },
|
|
{ .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg },
|
|
{ .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg },
|
|
+ { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg },
|
|
+ { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg },
|
|
{ /* sentinel */ }
|
|
};
|
|
--
|
|
|
|
# Note
|
|
# This patch has been modified to allow proper applying.
|
|
# The line
|
|
# { .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg },
|
|
# as been added to compensate for another patch applied before this one.
|