Merge branch '20230201041853.1934355-1-quic_bjorande@quicinc.com' into drivers-for-6.3

diff --cc drivers/soc/qcom/Kconfig
Simple merge

diff --cc drivers/soc/qcom/Makefile
index 6e02333,8d62a17..6e88da8
--- 1/drivers/soc/qcom/Makefile
--- 2/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@@ -8,9 -8,10 +8,11 @@@ obj-$(CONFIG_QCOM_GSBI)        +=      qcom_gsbi.
  obj-$(CONFIG_QCOM_MDT_LOADER) += mdt_loader.o
  obj-$(CONFIG_QCOM_OCMEM)      += ocmem.o
  obj-$(CONFIG_QCOM_PDR_HELPERS)        += pdr_interface.o
+ obj-$(CONFIG_QCOM_PMIC_GLINK) += pmic_glink.o
+ obj-$(CONFIG_QCOM_PMIC_GLINK) += pmic_glink_altmode.o
  obj-$(CONFIG_QCOM_QMI_HELPERS)        += qmi_helpers.o
  qmi_helpers-y += qmi_encdec.o qmi_interface.o
 +obj-$(CONFIG_QCOM_RAMP_CTRL)  += ramp_controller.o
  obj-$(CONFIG_QCOM_RMTFS_MEM)  += rmtfs_mem.o
  obj-$(CONFIG_QCOM_RPMH)               += qcom_rpmh.o
  qcom_rpmh-y                   += rpmh-rsc.o