Commit 2dcfd281 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/stm32',... 

Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/stm32', 'spi/topic/sunxi', 'spi/topic/tegra' and 'spi/topic/tools' into spi-next
parents 17c49e53 61a8dec5 d5e9a4a4 36bc7491 e60dfe07 e9d4650d

Documentation/devicetree/bindings/spi/sh-msiof.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
			 "renesas,msiof-r8a7792" (R-Car V2H)

			 "renesas,msiof-r8a7793" (R-Car M2-N)

			 "renesas,msiof-r8a7794" (R-Car E2)

			 "renesas,msiof-r8a7795" (R-Car H3)

			 "renesas,msiof-r8a7796" (R-Car M3-W)

			 "renesas,msiof-sh73a0" (SH-Mobile AG5)

			 "renesas,sh-mobile-msiof" (generic SH-Mobile compatibile device)

drivers/spi/spi-sh-msiof.c

+23 −9
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct sh_msiof_chipdata { 
	u16 tx_fifo_size;

	u16 rx_fifo_size;

	u16 master_flags;

	u16 min_div;

};



struct sh_msiof_spi_priv {
@@ -49,6 +50,7 @@ struct sh_msiof_spi_priv { 
	struct completion done;

	unsigned int tx_fifo_size;

	unsigned int rx_fifo_size;

	unsigned int min_div;

	void *tx_dma_page;

	void *rx_dma_page;

	dma_addr_t tx_dma_addr;
@@ -261,6 +263,8 @@ static void sh_msiof_spi_set_clk_regs(struct sh_msiof_spi_priv *p, 
	if (!WARN_ON(!spi_hz || !parent_rate))

		div = DIV_ROUND_UP(parent_rate, spi_hz);



	div = max_t(unsigned long, div, p->min_div);



	for (k = 0; k < ARRAY_SIZE(sh_msiof_spi_div_table); k++) {

		brps = DIV_ROUND_UP(div, sh_msiof_spi_div_table[k].div);

		/* SCR_BRDV_DIV_1 is valid only if BRPS is x 1/1 or x 1/2 */
@@ -998,24 +1002,33 @@ static const struct sh_msiof_chipdata sh_data = { 
	.tx_fifo_size = 64,

	.rx_fifo_size = 64,

	.master_flags = 0,

	.min_div = 1,

};



static const struct sh_msiof_chipdata rcar_gen2_data = {

	.tx_fifo_size = 64,

	.rx_fifo_size = 64,

	.master_flags = SPI_MASTER_MUST_TX,

	.min_div = 1,

};



static const struct sh_msiof_chipdata r8a779x_data = {

static const struct sh_msiof_chipdata rcar_gen3_data = {

	.tx_fifo_size = 64,

	.rx_fifo_size = 64,

	.master_flags = SPI_MASTER_MUST_TX,

	.min_div = 2,

};



static const struct of_device_id sh_msiof_match[] = {

	{ .compatible = "renesas,sh-mobile-msiof", .data = &sh_data },

	{ .compatible = "renesas,msiof-r8a7790",   .data = &r8a779x_data },

	{ .compatible = "renesas,msiof-r8a7791",   .data = &r8a779x_data },

	{ .compatible = "renesas,msiof-r8a7792",   .data = &r8a779x_data },

	{ .compatible = "renesas,msiof-r8a7793",   .data = &r8a779x_data },

	{ .compatible = "renesas,msiof-r8a7794",   .data = &r8a779x_data },

	{ .compatible = "renesas,rcar-gen2-msiof", .data = &r8a779x_data },

	{ .compatible = "renesas,msiof-r8a7796",   .data = &r8a779x_data },

	{ .compatible = "renesas,rcar-gen3-msiof", .data = &r8a779x_data },

	{ .compatible = "renesas,msiof-r8a7790",   .data = &rcar_gen2_data },

	{ .compatible = "renesas,msiof-r8a7791",   .data = &rcar_gen2_data },

	{ .compatible = "renesas,msiof-r8a7792",   .data = &rcar_gen2_data },

	{ .compatible = "renesas,msiof-r8a7793",   .data = &rcar_gen2_data },

	{ .compatible = "renesas,msiof-r8a7794",   .data = &rcar_gen2_data },

	{ .compatible = "renesas,rcar-gen2-msiof", .data = &rcar_gen2_data },

	{ .compatible = "renesas,msiof-r8a7796",   .data = &rcar_gen3_data },

	{ .compatible = "renesas,rcar-gen3-msiof", .data = &rcar_gen3_data },

	{ .compatible = "renesas,sh-msiof",        .data = &sh_data }, /* Deprecated */

	{},

};
@@ -1230,6 +1243,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, p);

	p->master = master;

	p->info = info;

	p->min_div = chipdata->min_div;



	init_completion(&p->done);

drivers/spi/spi-stm32.c

+1 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ static int stm32_spi_probe(struct platform_device *pdev) 
		goto err_master_put;

	}



	spi->rst = devm_reset_control_get(&pdev->dev, NULL);

	spi->rst = devm_reset_control_get_exclusive(&pdev->dev, NULL);

	if (!IS_ERR(spi->rst)) {

		reset_control_assert(spi->rst);

		udelay(2);

drivers/spi/spi-sun6i.c

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static int sun6i_spi_probe(struct platform_device *pdev) 


	init_completion(&sspi->done);



	sspi->rstc = devm_reset_control_get(&pdev->dev, NULL);

	sspi->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);

	if (IS_ERR(sspi->rstc)) {

		dev_err(&pdev->dev, "Couldn't get reset controller\n");

		ret = PTR_ERR(sspi->rstc);

drivers/spi/spi-tegra114.c

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ static int tegra_spi_probe(struct platform_device *pdev) 
		goto exit_free_irq;

	}



	tspi->rst = devm_reset_control_get(&pdev->dev, "spi");

	tspi->rst = devm_reset_control_get_exclusive(&pdev->dev, "spi");

	if (IS_ERR(tspi->rst)) {

		dev_err(&pdev->dev, "can not get reset\n");

		ret = PTR_ERR(tspi->rst);