l900: update and cleanup init

Change-Id: Ibe8ca3ce03fcdd6ff78b17b0d274a65c2044e3fe