diff --git a/drivers/scsi/ufs/ufs-tegra-common.c b/drivers/scsi/ufs/ufs-tegra-common.c index 1875f37b..6c7727c3 100644 --- a/drivers/scsi/ufs/ufs-tegra-common.c +++ b/drivers/scsi/ufs/ufs-tegra-common.c @@ -2268,7 +2268,9 @@ static int ufs_tegra_init(struct ufs_hba *hba) ufs_virt_base_addr = NV_ADDRESS_MAP_T23X_UFSHC_VIRT_BASE; ufs_virt_addr_range = UFS_AUX_ADDR_VIRT_RANGE_23X; virt_ctrl_en = UFS_AUX_ADDR_VIRT_CTRL_EN; +#if defined(NV_UFSHCD_QUIRKS_ENUM_HAS_UFSHCD_QUIRK_BROKEN_POWER_SEQUENCE) ufs_tegra->hba->quirks |= UFSHCD_QUIRK_BROKEN_PWR_SEQUENCE; +#endif } else { ufs_aux_base_addr = NV_ADDRESS_MAP_UFSHC_AUX_BASE; ufs_aux_addr_range = UFS_AUX_ADDR_RANGE; diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile index dfb24469..6991f81a 100644 --- a/scripts/conftest/Makefile +++ b/scripts/conftest/Makefile @@ -199,6 +199,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += tty_operations_struct_write_has_u8_ptr_arg NV_CONFTEST_FUNCTION_COMPILE_TESTS += tty_operations_struct_set_termios_has_const_ktermios_arg NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufs_hba_variant_ops_suspend_has_status_arg NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufshcd_quirks_enum_has_ufshcd_quirk_broken_64bit_address +NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufshcd_quirks_enum_has_ufshcd_quirk_broken_power_seqeunce NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_connection_struct_present NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_match_type_enum_present NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_subdev_nf_init diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh index 0e1c7038..eb632c33 100755 --- a/scripts/conftest/conftest.sh +++ b/scripts/conftest/conftest.sh @@ -8357,6 +8357,20 @@ compile_test() { compile_check_conftest "$CODE" "NV_UFSHCD_QUIRKS_ENUM_HAS_UFSHCD_QUIRK_BROKEN_64BIT_ADDRESS" "" "types" ;; + ufshcd_quirks_enum_has_ufshcd_quirk_broken_power_seqeunce) + # + # Determine if the 'UFSHCD_QUIRK_BROKEN_PWR_SEQUENCE' is defined in the + # enum ufshcd_quirks. + # + # + CODE=" + #include + enum ufshcd_quirks quirk = UFSHCD_QUIRK_BROKEN_PWR_SEQUENCE; + " + + compile_check_conftest "$CODE" "NV_UFSHCD_QUIRKS_ENUM_HAS_UFSHCD_QUIRK_BROKEN_POWER_SEQUENCE" "" "types" + ;; + v4l2_async_connection_struct_present) # # Determine if the 'struct v4l2_async_connection' present or not.