scsi: ufs: Fix build for Linux v5.16

When building the UFS driver for Linux v5.16 some header files such as
keyslot-manager.h are not found and the build fails. Update the UFS
driver and reorganise the header files to fix the build for Linux v5.16.

Bug 3820317

Change-Id: I10eea40411369e4c5d6809086bb1c35628c0bbad
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2791963
Reviewed-by: Kartik . <kkartik@nvidia.com>
Reviewed-by: Abhilash G <abhilashg@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>

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"