Merge "arm/dt: Correct HDMI Tx controller's supply type for msm8974"