diff --git a/drivers/scsi/ufs/ufs-tegra.c b/drivers/scsi/ufs/ufs-tegra.c
index bada9abe..780ee83d 100644
--- a/drivers/scsi/ufs/ufs-tegra.c
+++ b/drivers/scsi/ufs/ufs-tegra.c
@@ -22,16 +22,16 @@
 #include <linux/debugfs.h>
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0)
 #include <drivers-private/scsi/ufs/k515/ufshcd-pltfrm.h>
 #include <drivers-private/scsi/ufs/k515/ufshcd.h>
 #include <drivers-private/scsi/ufs/k515/unipro.h>
 #include <drivers-private/scsi/ufs/k515/ufshci.h>
 #else
-#include <drivers-private/scsi/ufs/k517/ufshcd-pltfrm.h>
-#include <drivers-private/scsi/ufs/k517/ufshcd.h>
-#include <drivers-private/scsi/ufs/k517/unipro.h>
-#include <drivers-private/scsi/ufs/k517/ufshci.h>
+#include <drivers-private/scsi/ufs/k516/ufshcd-pltfrm.h>
+#include <drivers-private/scsi/ufs/k516/ufshcd.h>
+#include <drivers-private/scsi/ufs/k516/unipro.h>
+#include <drivers-private/scsi/ufs/k516/ufshci.h>
 #endif
 
 #include "ufs-tegra.h"
diff --git a/include/drivers-private/scsi/ufs/k517/ufs.h b/include/drivers-private/scsi/ufs/k516/ufs.h
similarity index 100%
rename from include/drivers-private/scsi/ufs/k517/ufs.h
rename to include/drivers-private/scsi/ufs/k516/ufs.h
diff --git a/include/drivers-private/scsi/ufs/k517/ufs_quirks.h b/include/drivers-private/scsi/ufs/k516/ufs_quirks.h
similarity index 100%
rename from include/drivers-private/scsi/ufs/k517/ufs_quirks.h
rename to include/drivers-private/scsi/ufs/k516/ufs_quirks.h
diff --git a/include/drivers-private/scsi/ufs/k517/ufshcd-pltfrm.h b/include/drivers-private/scsi/ufs/k516/ufshcd-pltfrm.h
similarity index 100%
rename from include/drivers-private/scsi/ufs/k517/ufshcd-pltfrm.h
rename to include/drivers-private/scsi/ufs/k516/ufshcd-pltfrm.h
diff --git a/include/drivers-private/scsi/ufs/k517/ufshcd.h b/include/drivers-private/scsi/ufs/k516/ufshcd.h
similarity index 100%
rename from include/drivers-private/scsi/ufs/k517/ufshcd.h
rename to include/drivers-private/scsi/ufs/k516/ufshcd.h
diff --git a/include/drivers-private/scsi/ufs/k517/ufshci.h b/include/drivers-private/scsi/ufs/k516/ufshci.h
similarity index 100%
rename from include/drivers-private/scsi/ufs/k517/ufshci.h
rename to include/drivers-private/scsi/ufs/k516/ufshci.h
diff --git a/include/drivers-private/scsi/ufs/k517/unipro.h b/include/drivers-private/scsi/ufs/k516/unipro.h
similarity index 100%
rename from include/drivers-private/scsi/ufs/k517/unipro.h
rename to include/drivers-private/scsi/ufs/k516/unipro.h