Thomas Davis would like a contract extension from the Carolina Panthers before the start of training camp.

"That's something all players in the last year of their deal, especially for guys who have put up the numbers I've put up and played the way I've played the last few years, you'd hope something get worked out," Davis said. "We're not actively talking now, but hopefully we can do something before training camp happens."

Davis is entering the final year of his contract. The Panthers don't have a strong history of rewarding players with extra money later in their careers. DeAngelo Williams, Jordan Gross and Steve Smith have all departed.

"From a football standpoint and a community standpoint, Charlotte is always going to be home for me, and that's my mindset," Davis said. "I feel like there are a lot of people within our organization who feel the same way about me. But at the end of the day, it is a business and I understand that. Whatever happens moving forward there won't be any hard feelings from me. But I definitely plan on extending my career beyond this year.

"Hopefully that would never come to fruition with me that I would have to play for another team. That's not something that I look to do. And hopefully we can get something worked out here soon in terms of a contract extension. I don't think you'll find a player who cares more about the organization or a team than I do the Carolina Panthers. It goes above and beyond being a football player. I totally embrace the 'Keep Pounding' motto and it's part of my lifestyle and everything I do."

Greg Olsen wants to restructure his contract with the Carolina Panthers.

Olsen has made the Pro Bowl in each of the last three seasons and wants to be paid among the best at his position.

He is the NFL's seventh-highest paid tight end at $7.5 million annually.

"In the ideal world, [a restructured contract] would be great," Olsen said. "I'm very confident on where I stand in the league and where I belong. Both productivity and all things considered, there's nobody that's been more productive or more consistent than I have. And I'll stand on that until the cows come home.

"You can make of that what you may. I feel comfortable with where I belong, and hopefully other people do, too."

Ron Rivera believes Christian McCaffrey is being "punished" by an NFL rule that doesn't allow rookies to participate in offseason workouts other than rookie camp until their school year ends.

For McCaffrey, that means he can't fully practice with the Carolina Panthers until June 14.

The Panthers used the eighth overall pick on McCaffrey last month.

"I just think if a young man on his own is not going to enroll, don't hold that against him," Rivera said. "You don't know who you're going to get through the draft. If those young men decided on their own, then they're being punished for something that is their choice.

"It really only hurts the player. He's got to come in [late] and learn and grow and fit in."

Cam Newton is ahead of schedule rehabbing his shoulder following surgery.

"He is ahead of schedule," coach Ron Rivera said after Monday's voluntary workout. "We're not putting him ahead of schedule. He's doing all the band work, all the stretching, all the rehab he's supposed to."

Newton had surgery to repair a partially torn rotator cuff on March 30.