Merge branch 'icc-sa8775p' into icc-next
authorGeorgi Djakov <djakov@kernel.org>
Mon, 6 Feb 2023 13:39:41 +0000 (15:39 +0200)
committerGeorgi Djakov <djakov@kernel.org>
Mon, 6 Feb 2023 13:39:41 +0000 (15:39 +0200)
* icc-sa8775p
  dt-bindings: interconnect: qcom: document the interconnects for sa8775p
  interconnect: qcom: add a driver for sa8775p
  dt-bindings: interconnect: qcom,sa8775p-rpmh: fix a typo

Link: https://lore.kernel.org/r/20230118140825.242544-2-brgl@bgdev.pl
Signed-off-by: Georgi Djakov <djakov@kernel.org>
1  2 
drivers/interconnect/qcom/Kconfig
drivers/interconnect/qcom/Makefile

Simple merge
index cdd82839a4bf308ae8dc4361af66493d3e9d0521,32d90ff7960e7d6a59a49da045b71e1046af0336..ab988926433c7348be9b5af09306f1863f6b418d
@@@ -11,8 -11,8 +11,9 @@@ qnoc-msm8996-objs                     := msm8996.
  icc-osm-l3-objs                               := osm-l3.o
  qnoc-qcm2290-objs                     := qcm2290.o
  qnoc-qcs404-objs                      := qcs404.o
 +qnoc-qdu1000-objs                     := qdu1000.o
  icc-rpmh-obj                          := icc-rpmh.o
+ qnoc-sa8775p-objs                     := sa8775p.o
  qnoc-sc7180-objs                      := sc7180.o
  qnoc-sc7280-objs                        := sc7280.o
  qnoc-sc8180x-objs                     := sc8180x.o
@@@ -38,8 -36,8 +39,9 @@@ obj-$(CONFIG_INTERCONNECT_QCOM_MSM8996
  obj-$(CONFIG_INTERCONNECT_QCOM_OSM_L3) += icc-osm-l3.o
  obj-$(CONFIG_INTERCONNECT_QCOM_QCM2290) += qnoc-qcm2290.o
  obj-$(CONFIG_INTERCONNECT_QCOM_QCS404) += qnoc-qcs404.o
 +obj-$(CONFIG_INTERCONNECT_QCOM_QDU1000) += qnoc-qdu1000.o
  obj-$(CONFIG_INTERCONNECT_QCOM_RPMH) += icc-rpmh.o
+ obj-$(CONFIG_INTERCONNECT_QCOM_SA8775P) += qnoc-sa8775p.o
  obj-$(CONFIG_INTERCONNECT_QCOM_SC7180) += qnoc-sc7180.o
  obj-$(CONFIG_INTERCONNECT_QCOM_SC7280) += qnoc-sc7280.o
  obj-$(CONFIG_INTERCONNECT_QCOM_SC8180X) += qnoc-sc8180x.o