Merge "drivers: soc: Fix device naming"