Hi Johan, 

Here is the patch to replace no_hfp with hfp and DisableHFP with
EnableHFP. 

Let me know.

Thanks, 
Alok.