Group them together and change the naming to follow the common style in
ath6kl. No functional changes.
Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>