Merge "u_ctrl_hsuart: Fix control port structure name" into msm-3.4