Merge "pm8x41: Choose the right SPMI register offsets for the target"