Merge "arm/dt: msm9625: Fix compilation errors"