Merge remote-tracking branch 'spi/for-5.7' into spi-linus (0c0c5b8f) · Commits · EulixOS / Software / Kernel

drivers/spi/spi-axi-spi-engine.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -489,22 +489,6 @@ static int spi_engine_probe(struct platform_device *pdev)

		spin_lock_init(&spi_engine->lock);

		spi_engine->base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(spi_engine->base)) {
		ret = PTR_ERR(spi_engine->base);
		goto err_put_master;
		}

		version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION);
		if (SPI_ENGINE_VERSION_MAJOR(version) != 1) {
		dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%c\n",
		SPI_ENGINE_VERSION_MAJOR(version),
		SPI_ENGINE_VERSION_MINOR(version),
		SPI_ENGINE_VERSION_PATCH(version));
		ret = -ENODEV;
		goto err_put_master;
		}

		spi_engine->clk = devm_clk_get(&pdev->dev, "s_axi_aclk");
		if (IS_ERR(spi_engine->clk)) {
		ret = PTR_ERR(spi_engine->clk);
		@@ -525,6 +509,22 @@ static int spi_engine_probe(struct platform_device *pdev)
		if (ret)
		goto err_clk_disable;

		spi_engine->base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(spi_engine->base)) {
		ret = PTR_ERR(spi_engine->base);
		goto err_ref_clk_disable;
		}

		version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION);
		if (SPI_ENGINE_VERSION_MAJOR(version) != 1) {
		dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%c\n",
		SPI_ENGINE_VERSION_MAJOR(version),
		SPI_ENGINE_VERSION_MINOR(version),
		SPI_ENGINE_VERSION_PATCH(version));
		ret = -ENODEV;
		goto err_ref_clk_disable;
		}

		writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_RESET);
		writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING);
		writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);

drivers/spi/spi-bcm-qspi.c

+23 −20

Original line number	Diff line number	Diff line
		@@ -612,19 +612,15 @@ static int update_qspi_trans_byte_count(struct bcm_qspi *qspi,
		if (qt->trans->cs_change &&
		(flags & TRANS_STATUS_BREAK_CS_CHANGE))
		ret \|= TRANS_STATUS_BREAK_CS_CHANGE;
		if (ret)
		goto done;

		dev_dbg(&qspi->pdev->dev, "advance msg exit\n");
		if (bcm_qspi_mspi_transfer_is_last(qspi, qt))
		ret = TRANS_STATUS_BREAK_EOM;
		ret \|= TRANS_STATUS_BREAK_EOM;
		else
		ret = TRANS_STATUS_BREAK_NO_BYTES;
		ret \|= TRANS_STATUS_BREAK_NO_BYTES;

		qt->trans = NULL;
		}

		done:
		dev_dbg(&qspi->pdev->dev, "trans %p len %d byte %d ret %x\n",
		qt->trans, qt->trans ? qt->trans->len : 0, qt->byte, ret);
		return ret;
		@@ -670,7 +666,7 @@ static void read_from_hw(struct bcm_qspi *qspi, int slots)
		if (buf)
		buf[tp.byte] = read_rxram_slot_u8(qspi, slot);
		dev_dbg(&qspi->pdev->dev, "RD %02x\n",
		buf ? buf[tp.byte] : 0xff);
		buf ? buf[tp.byte] : 0x0);
		} else {
		u16 *buf = tp.trans->rx_buf;

		@@ -678,7 +674,7 @@ static void read_from_hw(struct bcm_qspi *qspi, int slots)
		buf[tp.byte / 2] = read_rxram_slot_u16(qspi,
		slot);
		dev_dbg(&qspi->pdev->dev, "RD %04x\n",
		buf ? buf[tp.byte] : 0xffff);
		buf ? buf[tp.byte / 2] : 0x0);
		}

		update_qspi_trans_byte_count(qspi, &tp,
		@@ -733,13 +729,13 @@ static int write_to_hw(struct bcm_qspi qspi, struct spi_device spi)
		while (!tstatus && slot < MSPI_NUM_CDRAM) {
		if (tp.trans->bits_per_word <= 8) {
		const u8 *buf = tp.trans->tx_buf;
		u8 val = buf ? buf[tp.byte] : 0xff;
		u8 val = buf ? buf[tp.byte] : 0x00;

		write_txram_slot_u8(qspi, slot, val);
		dev_dbg(&qspi->pdev->dev, "WR %02x\n", val);
		} else {
		const u16 *buf = tp.trans->tx_buf;
		u16 val = buf ? buf[tp.byte / 2] : 0xffff;
		u16 val = buf ? buf[tp.byte / 2] : 0x0000;

		write_txram_slot_u16(qspi, slot, val);
		dev_dbg(&qspi->pdev->dev, "WR %04x\n", val);
		@@ -771,7 +767,16 @@ static int write_to_hw(struct bcm_qspi qspi, struct spi_device spi)
		bcm_qspi_write(qspi, MSPI, MSPI_NEWQP, 0);
		bcm_qspi_write(qspi, MSPI, MSPI_ENDQP, slot - 1);

		if (tstatus & TRANS_STATUS_BREAK_DESELECT) {
		/*
		* case 1) EOM =1, cs_change =0: SSb inactive
		* case 2) EOM =1, cs_change =1: SSb stay active
		* case 3) EOM =0, cs_change =0: SSb stay active
		* case 4) EOM =0, cs_change =1: SSb inactive
		*/
		if (((tstatus & TRANS_STATUS_BREAK_DESELECT)
		== TRANS_STATUS_BREAK_CS_CHANGE) \|\|
		((tstatus & TRANS_STATUS_BREAK_DESELECT)
		== TRANS_STATUS_BREAK_EOM)) {
		mspi_cdram = read_cdram_slot(qspi, slot - 1) &
		~MSPI_CDRAM_CONT_BIT;
		write_cdram_slot(qspi, slot - 1, mspi_cdram);
		@@ -1222,6 +1227,11 @@ int bcm_qspi_probe(struct platform_device *pdev,
		}

		qspi = spi_master_get_devdata(master);

		qspi->clk = devm_clk_get_optional(&pdev->dev, NULL);
		if (IS_ERR(qspi->clk))
		return PTR_ERR(qspi->clk);

		qspi->pdev = pdev;
		qspi->trans_pos.trans = NULL;
		qspi->trans_pos.byte = 0;
		@@ -1335,13 +1345,6 @@ int bcm_qspi_probe(struct platform_device *pdev,
		qspi->soc_intc = NULL;
		}

		qspi->clk = devm_clk_get(&pdev->dev, NULL);
		if (IS_ERR(qspi->clk)) {
		dev_warn(dev, "unable to get clock\n");
		ret = PTR_ERR(qspi->clk);
		goto qspi_probe_err;
		}

		ret = clk_prepare_enable(qspi->clk);
		if (ret) {
		dev_err(dev, "failed to prepare clock\n");
		@@ -1406,7 +1409,7 @@ static int __maybe_unused bcm_qspi_suspend(struct device *dev)
		bcm_qspi_read(qspi, BSPI, BSPI_STRAP_OVERRIDE_CTRL);

		spi_master_suspend(qspi->master);
		clk_disable(qspi->clk);
		clk_disable_unprepare(qspi->clk);
		bcm_qspi_hw_uninit(qspi);

		return 0;
		@@ -1424,7 +1427,7 @@ static int __maybe_unused bcm_qspi_resume(struct device *dev)
		qspi->soc_intc->bcm_qspi_int_set(qspi->soc_intc, MSPI_DONE,
		true);

		ret = clk_enable(qspi->clk);
		ret = clk_prepare_enable(qspi->clk);
		if (!ret)
		spi_master_resume(qspi->master);

drivers/spi/spi-bcm2835.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1347,7 +1347,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
		goto out_dma_release;
		}

		err = devm_spi_register_controller(&pdev->dev, ctlr);
		err = spi_register_controller(ctlr);
		if (err) {
		dev_err(&pdev->dev, "could not register SPI controller: %d\n",
		err);
		@@ -1374,6 +1374,8 @@ static int bcm2835_spi_remove(struct platform_device *pdev)

		bcm2835_debugfs_remove(bs);

		spi_unregister_controller(ctlr);

		/* Clear FIFOs, and disable the HW block */
		bcm2835_wr(bs, BCM2835_SPI_CS,
		BCM2835_SPI_CS_CLEAR_RX \| BCM2835_SPI_CS_CLEAR_TX);

drivers/spi/spi-bcm2835aux.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -569,7 +569,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)
		goto out_clk_disable;
		}

		err = devm_spi_register_master(&pdev->dev, master);
		err = spi_register_master(master);
		if (err) {
		dev_err(&pdev->dev, "could not register SPI master: %d\n", err);
		goto out_clk_disable;
		@@ -593,6 +593,8 @@ static int bcm2835aux_spi_remove(struct platform_device *pdev)

		bcm2835aux_debugfs_remove(bs);

		spi_unregister_master(master);

		bcm2835aux_spi_reset_hw(bs);

		/* disable the HW block by releasing the clock */

drivers/spi/spi-dw.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -526,7 +526,7 @@ int dw_spi_add_host(struct device dev, struct dw_spi dws)
		}
		}

		ret = devm_spi_register_controller(dev, master);
		ret = spi_register_controller(master);
		if (ret) {
		dev_err(&master->dev, "problem registering spi master\n");
		goto err_dma_exit;
		@@ -550,6 +550,8 @@ void dw_spi_remove_host(struct dw_spi *dws)
		{
		dw_spi_debugfs_remove(dws);

		spi_unregister_controller(dws->master);

		if (dws->dma_ops && dws->dma_ops->dma_exit)
		dws->dma_ops->dma_exit(dws);