diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index bc7cc4088eea..4af1642806fd 100644
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -728,6 +728,10 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi)
 	u32 inactive_cycles;
 	u8 cs_state;
 
+	setup->unit = SPI_DELAY_UNIT_SCK;
+	hold->unit = SPI_DELAY_UNIT_SCK;
+	inactive->unit = SPI_DELAY_UNIT_SCK;
+
 	if (setup->unit != SPI_DELAY_UNIT_SCK ||
 	    hold->unit != SPI_DELAY_UNIT_SCK ||
 	    inactive->unit != SPI_DELAY_UNIT_SCK) {