topology: squash previous commits

Signed-off-by: Lens-F <tnoah12@gmail.com>