Yes, both are tax deductible. Rules for 2018 have changed though. The home equity part of the money has to have been spent on the house with the equity loan to improve it. Theres also a cap. Enter both amounts. I think TT gives you a space to enter the extra interest. Or enter it when TT asks you did you pay any more interest on this property.