Fixing compliing errors with TEGRA_IOMMU_SMMU enabled and also fixing a merge error in tegra-otg.c