Contributions for the year of the tax return are to be entered under Deductions & Credits -> Retirement and Investments -> Traditional and Roth IRA Contributions.
Regarding Form 8606 line 22, there is no need to differentiate. TurboTax puts on Form 8606 line 2022 the contributions for the year of the tax return (entered as described above) plus the prior year basis in Roth IRA contributions entered or tracked separately.
