Retirement tax questions

In the TurboTax, Box 7 P is return of contribution taxable in 2015.  I don't see a choice for taxable in 2016.  Does it mean I shall enter 1099-R with P next year?  I don't want to confuse IRS when next year comes, they might be looking for this 1099-R with "p" reported by Charles Schwab.