v6->v7: 1.Update commit message of [2/6]. 2.Adjust includes in [4/6], add blank line as Paul Cercueil's suggest, and Move "*cgu" into x1830_cgu_init() as a local variable. 3.Update commit message of [6/6].
v6->v7: 1.Update commit message of [2/6]. 2.Adjust includes in [4/6], add blank line as Paul Cercueil's suggest, and Move "*cgu" into x1830_cgu_init() as a local variable. 3.Update commit message of [6/6].