Merge branch 'qcom/20230526-topic-smd_icc-v7-0-09c78c175546@linaro.org' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git into icc-next

Merge the immutable branch from the qcom-tree, to get the changes that
move the management of SMD RPM bus clocks to the interconnect framework.

* 20230526-topic-smd_icc-v7-0-09c78c175546@linaro.org
  dt-bindings: interconnect: Add Qcom RPM ICC bindings
  soc: qcom: smd-rpm: Add QCOM_SMD_RPM_STATE_NUM
  soc: qcom: smd-rpm: Use tabs for defines
  clk: qcom: smd-rpm: Move some RPM resources to the common header
  soc: qcom: smd-rpm: Move icc_smd_rpm registration to clk-smd-rpm
  interconnect: qcom: icc-rpm: Introduce keep_alive
  interconnect: qcom: Add missing headers in icc-rpm.h
  interconnect: qcom: Fold smd-rpm.h into icc-rpm.h
  interconnect: qcom: smd-rpm: Add rpmcc handling skeleton code
  interconnect: qcom: Define RPM bus clocks
  interconnect: qcom: sdm660: Hook up RPM bus clk definitions
  interconnect: qcom: msm8996: Hook up RPM bus clk definitions
  interconnect: qcom: qcs404: Hook up RPM bus clk definitions
  interconnect: qcom: msm8939: Hook up RPM bus clk definitions
  interconnect: qcom: msm8916: Hook up RPM bus clk definitions
  interconnect: qcom: qcm2290: Hook up RPM bus clk definitions
  interconnect: qcom: icc-rpm: Control bus rpmcc from icc
  clk: qcom: smd-rpm: Separate out interconnect bus clocks
  interconnect: qcom: icc-rpm: Fix bucket number
  interconnect: qcom: icc-rpm: Set bandwidth on both contexts
  interconnect: qcom: icc-rpm: Set correct bandwidth through RPM bw req
  interconnect: qcom: icc-rpm: Fix bandwidth calculations

Link: https://lore.kernel.org/r/20230526-topic-smd_icc-v7-0-09c78c175546@linaro.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>

Author: Georgi Djakov

drivers/clk/qcom/clk-smd-rpm.c

@@ -29,7 +29,7 @@ qnoc-sm8250-objs			:= sm8250.o
 qnoc-sm8350-objs			:= sm8350.o
 qnoc-sm8450-objs			:= sm8450.o
 qnoc-sm8550-objs			:= sm8550.o
-icc-smd-rpm-objs			:= smd-rpm.o icc-rpm.o
+icc-smd-rpm-objs			:= smd-rpm.o icc-rpm.o icc-rpm-clocks.o
 
 obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o
 obj-$(CONFIG_INTERCONNECT_QCOM_MSM8916) += qnoc-msm8916.o

drivers/interconnect/qcom/Makefile

@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2023 Linaro Ltd
+ */
+
+#include <linux/soc/qcom/smd-rpm.h>
+
+#include "icc-rpm.h"
+
+const struct rpm_clk_resource aggre1_clk = {
+	.resource_type = QCOM_SMD_RPM_AGGR_CLK,
+	.clock_id = 1,
+};
+EXPORT_SYMBOL_GPL(aggre1_clk);
+
+const struct rpm_clk_resource aggre2_clk = {
+	.resource_type = QCOM_SMD_RPM_AGGR_CLK,
+	.clock_id = 2,
+};
+EXPORT_SYMBOL_GPL(aggre2_clk);
+
+const struct rpm_clk_resource bimc_clk = {
+	.resource_type = QCOM_SMD_RPM_MEM_CLK,
+	.clock_id = 0,
+};
+EXPORT_SYMBOL_GPL(bimc_clk);
+
+const struct rpm_clk_resource bus_0_clk = {
+	.resource_type = QCOM_SMD_RPM_BUS_CLK,
+	.clock_id = 0,
+};
+EXPORT_SYMBOL_GPL(bus_0_clk);
+
+const struct rpm_clk_resource bus_1_clk = {
+	.resource_type = QCOM_SMD_RPM_BUS_CLK,
+	.clock_id = 1,
+};
+EXPORT_SYMBOL_GPL(bus_1_clk);
+
+const struct rpm_clk_resource bus_2_clk = {
+	.resource_type = QCOM_SMD_RPM_BUS_CLK,
+	.clock_id = 2,
+};
+EXPORT_SYMBOL_GPL(bus_2_clk);
+
+const struct rpm_clk_resource mmaxi_0_clk = {
+	.resource_type = QCOM_SMD_RPM_MMAXI_CLK,
+	.clock_id = 0,
+};
+EXPORT_SYMBOL_GPL(mmaxi_0_clk);
+
+const struct rpm_clk_resource mmaxi_1_clk = {
+	.resource_type = QCOM_SMD_RPM_MMAXI_CLK,
+	.clock_id = 1,
+};
+EXPORT_SYMBOL_GPL(mmaxi_1_clk);
+
+const struct rpm_clk_resource qup_clk = {
+	.resource_type = QCOM_SMD_RPM_QUP_CLK,
+	.clock_id = 0,
+};
+EXPORT_SYMBOL_GPL(qup_clk);
+
+/* Branch clocks */
+const struct rpm_clk_resource aggre1_branch_clk = {
+	.resource_type = QCOM_SMD_RPM_AGGR_CLK,
+	.clock_id = 1,
+	.branch = true,
+};
+EXPORT_SYMBOL_GPL(aggre1_branch_clk);
+
+const struct rpm_clk_resource aggre2_branch_clk = {
+	.resource_type = QCOM_SMD_RPM_AGGR_CLK,
+	.clock_id = 2,
+	.branch = true,
+};
+EXPORT_SYMBOL_GPL(aggre2_branch_clk);