Unverified Commit becbca18 authored by Mark Brown's avatar Mark Brown
Browse files

Merge existing fixes from spi/for-5.15

parents 6880fa6c 2bab9409

drivers/spi/spi-rockchip.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -600,6 +600,12 @@ static int rockchip_spi_transfer_one( 
	int ret;

	int ret;

	bool use_dma;

	bool use_dma;





	/* Zero length transfers won't trigger an interrupt on completion */

	if (!xfer->len) {

		spi_finalize_current_transfer(ctlr);

		return 1;

	}



	WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) &&

	WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) &&

		(readl_relaxed(rs->regs + ROCKCHIP_SPI_SR) & SR_BUSY));

		(readl_relaxed(rs->regs + ROCKCHIP_SPI_SR) & SR_BUSY));

drivers/spi/spi-tegra20-slink.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -204,9 +204,6 @@ struct tegra_slink_data { 
	struct dma_async_tx_descriptor		*tx_dma_desc;

	struct dma_async_tx_descriptor		*tx_dma_desc;

};

};





static int tegra_slink_runtime_suspend(struct device *dev);

static int tegra_slink_runtime_resume(struct device *dev);



static inline u32 tegra_slink_readl(struct tegra_slink_data *tspi,

static inline u32 tegra_slink_readl(struct tegra_slink_data *tspi,

		unsigned long reg)

		unsigned long reg)

{

{
@@ -1185,6 +1182,7 @@ static int tegra_slink_resume(struct device *dev) 
}

}

#endif

#endif





#ifdef CONFIG_PM

static int tegra_slink_runtime_suspend(struct device *dev)

static int tegra_slink_runtime_suspend(struct device *dev)

{

{

	struct spi_master *master = dev_get_drvdata(dev);

	struct spi_master *master = dev_get_drvdata(dev);
@@ -1210,6 +1208,7 @@ static int tegra_slink_runtime_resume(struct device *dev) 
	}

	}

	return 0;

	return 0;

}

}

#endif /* CONFIG_PM */





static const struct dev_pm_ops slink_pm_ops = {

static const struct dev_pm_ops slink_pm_ops = {

	SET_RUNTIME_PM_OPS(tegra_slink_runtime_suspend,

	SET_RUNTIME_PM_OPS(tegra_slink_runtime_suspend,