Some fixes spotted during review

Signed-off-by: Anton Kolesov <anton.kolesov@synopsys.com>
Unify register addresses locations

Signed-off-by: Anton Kolesov <anton.kolesov@synopsys.com>