From 60e4a3d3a7afc9583d58ecabeb8f893aaa123f3f Mon Sep 17 00:00:00 2001
From: David Dai <daidavid1@codeaurora.org>
Date: Thu, 5 May 2016 16:45:09 -0700
Subject: ARM: dts: msm: Add mnoc ahb bus fab for msmcobalt

Add mnoc ahb fab used by clients to request for different
speeds on configuration paths.

CRs-Fixed: 1013346
Change-Id: Ic5f3598644a6d93796b8613117e42ff692168c3c
Signed-off-by: David Dai <daidavid1@codeaurora.org>
---
 arch/arm/boot/dts/qcom/msmcobalt-bus.dtsi | 41 +++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 13 deletions(-)

(limited to 'arch')

diff --git a/arch/arm/boot/dts/qcom/msmcobalt-bus.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-bus.dtsi
index 90b32be9c9cf..45eee0caaac9 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-bus.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-bus.dtsi
@@ -22,11 +22,12 @@
 			<0x1660000 0x60000>,
 			<0x1700000 0x60000>,
 			<0x17900000 0x10000>,
+			<0x1740000 0x10000>,
 			<0x1740000 0x10000>;
 
 		reg-names = "snoc-base", "bimc-base", "cnoc-base",
 			"a1noc-base", "a2noc-base", "gnoc-base",
-			"mnoc-base";
+			"mmnoc-ahb-base", "mnoc-base";
 
 		/*Buses*/
 		fab_a1noc: fab-a1noc {
@@ -131,6 +132,20 @@
 				<&clock_gcc clk_snoc_a_clk>;
 		};
 
+		fab_mnoc_ahb: fab-mnoc-ahb {
+			cell-id = <MSM_BUS_FAB_MMSS_AHB>;
+			label = "fab-mnoc-ahb";
+			qcom,fab-dev;
+			qcom,base-name = "mmnoc-ahb-base";
+			qcom,bypass-qos-prg;
+			qcom,setrate-only-clk;
+			qcom,bus-type = <1>;
+			clock-names = "bus_clk", "bus_a_clk";
+			clocks = <&clock_mmss clk_ahb_clk_src>,
+			     <&clock_mmss clk_ahb_clk_src>;
+		};
+
+
 		/*Masters*/
 
 		mas_pcie_0: mas-pcie-0 {
@@ -423,7 +438,7 @@
 				&slv_venus_throttle_cfg &slv_display_cfg
 				&slv_mmss_clk_cfg &slv_vmem_cfg
 				&slv_mmss_clk_xpu_cfg &slv_smmu_cfg>;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,mas-rpm-id = <ICBID_MASTER_CNOC_MNOC_MMSS_CFG>;
 		};
 
@@ -1121,7 +1136,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_CAMERA_CFG>;
 		};
 
@@ -1131,7 +1146,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_CAMERA_THROTTLE_CFG>;
 		};
 
@@ -1141,7 +1156,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_MISC_CFG>;
 		};
 
@@ -1151,7 +1166,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_VENUS_THROTTLE_CFG>;
 		};
 
@@ -1161,7 +1176,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_VENUS_CFG>;
 		};
 
@@ -1171,7 +1186,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_VMEM_CFG>;
 			qcom,enable-only-clk;
 			clock-names = "node_clk";
@@ -1184,7 +1199,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_MMSS_CLK_XPU_CFG>;
 		};
 
@@ -1194,7 +1209,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_MMSS_CLK_CFG>;
 		};
 
@@ -1204,7 +1219,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_DISPLAY_CFG>;
 		};
 
@@ -1214,7 +1229,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_DISPLAY_THROTTLE_CFG>;
 		};
 
@@ -1224,7 +1239,7 @@
 			qcom,buswidth = <8>;
 			qcom,agg-ports = <1>;
 			qcom,ap-owned;
-			qcom,bus-dev = <&fab_mnoc>;
+			qcom,bus-dev = <&fab_mnoc_ahb>;
 			qcom,slv-rpm-id = <ICBID_SLAVE_MMSS_SMMU_CFG>;
 		};
 
-- 
cgit v1.2.3