To upgrade the SSRS edition you just need to re-run the SSRS installer and choose "Upgrade Edition". There you can enter your license and upgrade the edition.
To upgrade to a newer version of SQL AND upgrade to a new edition you'll need to run the setup twice:
I just dealt with this issue today; the whole upgrade process was a bit frustrating and not nearly as streamlined or seamless as the MS Documentation implied.