Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0430a7c7 authored by Icenowy Zheng's avatar Icenowy Zheng Committed by Vinod Koul
Browse files

dmaengine: sun6i: make gate bit in sun8i's DMA engines a common quirk 



Originally we enable a special gate bit when the compatible indicates
A23/33.

But according to BSP sources and user manuals, more SoCs will need this
gate bit.

So make it a common quirk configured in the config struct.

Signed-off-by: default avatarIcenowy Zheng <icenowy@aosc.xyz>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent a3f406d6

drivers/dma/sun6i-dma.c

+13 −7
Original line number Original line Diff line number Diff line
@@ -101,6 +101,17 @@ struct sun6i_dma_config { 
	u32 nr_max_channels;

	u32 nr_max_channels;

	u32 nr_max_requests;

	u32 nr_max_requests;

	u32 nr_max_vchans;

	u32 nr_max_vchans;

	/*

	 * In the datasheets/user manuals of newer Allwinner SoCs, a special

	 * bit (bit 2 at register 0x20) is present.

	 * It's named "DMA MCLK interface circuit auto gating bit" in the

	 * documents, and the footnote of this register says that this bit

	 * should be set up when initializing the DMA controller.

	 * Allwinner A23/A33 user manuals do not have this bit documented,

	 * however these SoCs really have and need this bit, as seen in the

	 * BSP kernel source code.

	 */

	bool gate_needed;

};

};





/*

/*
@@ -1009,6 +1020,7 @@ static struct sun6i_dma_config sun8i_a23_dma_cfg = { 
	.nr_max_channels = 8,

	.nr_max_channels = 8,

	.nr_max_requests = 24,

	.nr_max_requests = 24,

	.nr_max_vchans   = 37,

	.nr_max_vchans   = 37,

	.gate_needed	 = true,

};

};





static struct sun6i_dma_config sun8i_a83t_dma_cfg = {

static struct sun6i_dma_config sun8i_a83t_dma_cfg = {
@@ -1174,13 +1186,7 @@ static int sun6i_dma_probe(struct platform_device *pdev) 
		goto err_dma_unregister;

		goto err_dma_unregister;

	}

	}





	/*

	if (sdc->cfg->gate_needed)

	 * sun8i variant requires us to toggle a dma gating register,

	 * as seen in Allwinner's SDK. This register is not documented

	 * in the A23 user manual.

	 */

	if (of_device_is_compatible(pdev->dev.of_node,

				    "allwinner,sun8i-a23-dma"))

		writel(SUN8I_DMA_GATE_ENABLE, sdc->base + SUN8I_DMA_GATE);

		writel(SUN8I_DMA_GATE_ENABLE, sdc->base + SUN8I_DMA_GATE);





	return 0;

	return 0;