* struct qcom_icc_node - Qualcomm specific interconnect nodes
   * @name: the node name used in debugfs

@@ -35,36 +55,48 @@ struct qcom_icc_provider {
   * @buswidth: width of the interconnect between a node and the bus (bytes)
   * @mas_rpm_id:	RPM id for devices that are bus masters
   * @slv_rpm_id:	RPM id for devices that are bus slaves
+ * @qos: NoC QoS setting parameters
   * @rate: current bus clock rate in Hz
   */
  struct qcom_icc_node {
  	unsigned char *name;
  	u16 id;
-	u16 links[QCOM_MAX_LINKS];
+	const u16 *links;
  	u16 num_links;
  	u16 buswidth;
  	int mas_rpm_id;
  	int slv_rpm_id;
+	struct qcom_icc_qos qos;
  	u64 rate;
  };
  
  struct qcom_icc_desc {
  	struct qcom_icc_node **nodes;
  	size_t num_nodes;
+	const char ** clocks;

+	size_t num_clocks;
+	bool is_bimc_node;
+	const struct regmap_config *regmap_cfg;
  };
  
  #define DEFINE_QNODE(_name, _id, _buswidth, _mas_rpm_id, _slv_rpm_id,	\
  		     ...)						\
+		static const u16 _name ## _links[] = { __VA_ARGS__ };	\
+		\
  		static struct qcom_icc_node _name = {			\
  		.name = #_name,						\
  		.id = _id,						\
  		.buswidth = _buswidth,					\
  		.mas_rpm_id = _mas_rpm_id,				\
  		.slv_rpm_id = _slv_rpm_id,				\
-		.num_links = ARRAY_SIZE(((int[]){ __VA_ARGS__ })),	\
-		.links = { __VA_ARGS__ },				\
+		.num_links = ARRAY_SIZE(_name ## _links),		\
+		.links = _name ## _links,				\
  	}
  
+/* Valid for both NoC and BIMC */
+#define NOC_QOS_MODE_INVALID		-1
+#define NOC_QOS_MODE_FIXED		0x0
+#define NOC_QOS_MODE_BYPASS		0x2
  
  int qnoc_probe(struct platform_device *pdev);
  int qnoc_remove(struct platform_device *pdev);

diff --git a/drivers/interconnect/qcom/sdm660.c b/drivers/interconnect/qcom/sdm660.c
index 4a72f9677d4e..384dd3661757 100644
--- a/drivers/interconnect/qcom/sdm660.c
+++ b/drivers/interconnect/qcom/sdm660.c

@@ -16,42 +16,9 @@
  #include <linux/regmap.h>
  #include <linux/slab.h>
  
+#include "icc-rpm.h"
  #include "smd-rpm.h"
  
-#define RPM_BUS_MASTER_REQ	0x73616d62
-#define RPM_BUS_SLAVE_REQ	0x766c7362
-
-/* BIMC QoS */
-#define M_BKE_REG_BASE(n)		(0x300 + (0x4000 * n))
-#define M_BKE_EN_ADDR(n)		(M_BKE_REG_BASE(n))
-#define M_BKE_HEALTH_CFG_ADDR(i, n)	(M_BKE_REG_BASE(n) + 0x40 + (0x4 * i))
-
-#define M_BKE_HEALTH_CFG_LIMITCMDS_MASK	0x80000000
-#define M_BKE_HEALTH_CFG_AREQPRIO_MASK	0x300
-#define M_BKE_HEALTH_CFG_PRIOLVL_MASK	0x3
-#define M_BKE_HEALTH_CFG_AREQPRIO_SHIFT	0x8
-#define M_BKE_HEALTH_CFG_LIMITCMDS_SHIFT 0x1f
-
-#define M_BKE_EN_EN_BMASK		0x1
-
-/* Valid for both NoC and BIMC */
-#define NOC_QOS_MODE_INVALID		-1
-#define NOC_QOS_MODE_FIXED		0x0
-#define NOC_QOS_MODE_LIMITER		0x1
-#define NOC_QOS_MODE_BYPASS		0x2
-
-/* NoC QoS */
-#define NOC_PERM_MODE_FIXED		1
-#define NOC_PERM_MODE_BYPASS		(1 << NOC_QOS_MODE_BYPASS)
-
-#define NOC_QOS_PRIORITYn_ADDR(n)	(0x8 + (n * 0x1000))
-#define NOC_QOS_PRIORITY_P1_MASK	0xc
-#define NOC_QOS_PRIORITY_P0_MASK	0x3
-#define NOC_QOS_PRIORITY_P1_SHIFT	0x2
-
-#define NOC_QOS_MODEn_ADDR(n)		(0xc + (n * 0x1000))
-#define NOC_QOS_MODEn_MASK		0x3
-
  enum {
  	SDM660_MASTER_IPA = 1,
  	SDM660_MASTER_CNOC_A2NOC,

@@ -160,94 +127,20 @@ enum {
  	SDM660_SNOC,
  };
  
-#define to_qcom_provider(_provider) \
-	container_of(_provider, struct qcom_icc_provider, provider)
-
-static const struct clk_bulk_data bus_clocks[] = {
-	{ .id = "bus" },
-	{ .id = "bus_a" },
+static const char * bus_mm_clocks[] = {