I think most of these comments were pretty straightforward except for pulling out the "struct aspeed_i2c_controller" into a interrupt controller, which is now known as "struct aspeed_i2c_ic". See https://lkml.org/lkml/2017/3/28/20 for details.