Merge branch 'arm32-for-6.15' into arm32-for-6.16

The v6.15 PR contained the transition to "qcom,calibration-variant" and
was not accepted due to the risk of breaking bisection support. Merge
the arm32-for-6.15 tag in order to bring these patches into v6.16.