ARM: dts: Comment out the downstream clock bindings

Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>

11 files changed, 277 insertions, 277 deletions

diff --git a/arch/arm64/boot/dts/qcom/msm-iommu-v2.dtsi b/arch/arm64/boot/dts/qcom/msm-iommu-v2.dtsi
index 2aa3828704d..e8f7d4697d5 100644
--- a/arch/arm64/boot/dts/qcom/msm-iommu-v2.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm-iommu-v2.dtsi
@@ -22,9 +22,9 @@
 		interrupt-names = "global_cfg_NS_irq", "global_cfg_S_irq";
 		label = "gfx_iommu";
 		qcom,iommu-secure-id = <18>;
-		clocks = <&clock_gcc clk_gcc_smmu_cfg_clk>,
-			 <&clock_gcc clk_gcc_gfx_tcu_clk>;
-		clock-names = "iface_clk", "core_clk";
+//		clocks = <&clock_gcc clk_gcc_smmu_cfg_clk>,
+//			 <&clock_gcc clk_gcc_gfx_tcu_clk>;
+//		clock-names = "iface_clk", "core_clk";
 		status = "disabled";
 
 		qcom,iommu-ctx@1f09000 {
@@ -56,9 +56,9 @@
 		interrupt-names = "global_cfg_NS_irq", "global_cfg_S_irq";
 		label = "apps_iommu";
 		qcom,iommu-secure-id = <17>;
-		clocks = <&clock_gcc clk_gcc_smmu_cfg_clk>,
-			 <&clock_gcc clk_gcc_apss_tcu_clk>;
-		clock-names = "iface_clk", "core_clk";
+//		clocks = <&clock_gcc clk_gcc_smmu_cfg_clk>,
+//			 <&clock_gcc clk_gcc_apss_tcu_clk>;
+//		clock-names = "iface_clk", "core_clk";
 		qcom,cb-base-offset = <0x20000>;
 		status = "disabled";
 
diff --git a/arch/arm64/boot/dts/qcom/msm8916-bus.dtsi b/arch/arm64/boot/dts/qcom/msm8916-bus.dtsi
index 79f499cc326..e100e91d5c1 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-bus.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-bus.dtsi
@@ -10,7 +10,7 @@
  * GNU General Public License for more details.
  */
 
-#include <dt-bindings/msm/msm-bus-rule-ops.h>
+//#include <dt-bindings/msm/msm-bus-rule-ops.h>
 
 &soc {
 	ad_hoc_bus: ad-hoc-bus { };
diff --git a/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-cdp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-cdp.dtsi
index 561442ab365..397eeb22036 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-cdp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-cdp.dtsi
@@ -68,8 +68,8 @@
 		qcom,sensor-mode = <0>;
 		qcom,cci-master = <0>;
 		qcom,mclk-23880000;
-		clocks = <&clock_gcc clk_mclk1_clk_src>,
-				<&clock_gcc clk_gcc_camss_mclk1_clk>;
+//		clocks = <&clock_gcc clk_mclk1_clk_src>,
+//				<&clock_gcc clk_gcc_camss_mclk1_clk>;
 		clock-names = "cam_src_clk", "cam_clk";
 	};
 
@@ -110,8 +110,8 @@
 		qcom,cci-master = <0>;
 		qcom,mclk-23880000;
 		status = "ok";
-		clocks = <&clock_gcc clk_mclk0_clk_src>,
-				<&clock_gcc clk_gcc_camss_mclk0_clk>;
+//		clocks = <&clock_gcc clk_mclk0_clk_src>,
+//				<&clock_gcc clk_gcc_camss_mclk0_clk>;
 		clock-names = "cam_src_clk", "cam_clk";
 	};
 
@@ -146,8 +146,8 @@
 		qcom,cci-master = <0>;
 		qcom,mclk-23880000;
 		status = "ok";
-		clocks = <&clock_gcc clk_mclk1_clk_src>,
-				<&clock_gcc clk_gcc_camss_mclk1_clk>;
-		clock-names = "cam_src_clk", "cam_clk";
+//		clocks = <&clock_gcc clk_mclk1_clk_src>,
+//				<&clock_gcc clk_gcc_camss_mclk1_clk>;
+//		clock-names = "cam_src_clk", "cam_clk";
 	};
 };
diff --git a/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-mtp.dtsi
index 7636fbc7964..d1d9d69ec10 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-camera-sensor-mtp.dtsi
@@ -217,9 +217,9 @@
 		qcom,sensor-mode = <0>;
 		qcom,cci-master = <0>;
 		qcom,mclk-23880000;
-		clocks = <&clock_gcc clk_mclk1_clk_src>,
-				<&clock_gcc clk_gcc_camss_mclk1_clk>;
-		clock-names = "cam_src_clk", "cam_clk";
+//		clocks = <&clock_gcc clk_mclk1_clk_src>,
+//				<&clock_gcc clk_gcc_camss_mclk1_clk>;
+//		clock-names = "cam_src_clk", "cam_clk";
 	};
 
 	qcom,camera@0 {
@@ -260,9 +260,9 @@
 		qcom,cci-master = <0>;
 		qcom,mclk-23880000;
 		status = "ok";
-		clocks = <&clock_gcc clk_mclk0_clk_src>,
-				<&clock_gcc clk_gcc_camss_mclk0_clk>;
-		clock-names = "cam_src_clk", "cam_clk";
+//		clocks = <&clock_gcc clk_mclk0_clk_src>,
+//				<&clock_gcc clk_gcc_camss_mclk0_clk>;
+//		clock-names = "cam_src_clk", "cam_clk";
 	};
 
 	qcom,camera@1 {
@@ -296,8 +296,8 @@
 		qcom,cci-master = <0>;
 		qcom,mclk-23880000;
 		status = "ok";
-		clocks = <&clock_gcc clk_mclk1_clk_src>,
-				<&clock_gcc clk_gcc_camss_mclk1_clk>;
-		clock-names = "cam_src_clk", "cam_clk";
+//		clocks = <&clock_gcc clk_mclk1_clk_src>,
+//				<&clock_gcc clk_gcc_camss_mclk1_clk>;
+//		clock-names = "cam_src_clk", "cam_clk";
 	};
 };
diff --git a/arch/arm64/boot/dts/qcom/msm8916-camera.dtsi b/arch/arm64/boot/dts/qcom/msm8916-camera.dtsi
index 42655298d9f..3e4c98ded66 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-camera.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-camera.dtsi
@@ -24,17 +24,17 @@
 		reg-names = "csiphy", "csiphy_clk_mux";
 		interrupts = <0 78 0>;
 		interrupt-names = "csiphy";
-		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
-			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,
-			<&clock_gcc clk_csi0phytimer_clk_src>,
-			<&clock_gcc clk_gcc_camss_csi0phytimer_clk>,
-			<&clock_gcc clk_camss_ahb_clk_src>,
-			<&clock_gcc clk_gcc_camss_csi0phy_clk>,
-			<&clock_gcc clk_gcc_camss_ahb_clk>;
-		clock-names = "camss_top_ahb_clk", "ispif_ahb_clk",
-			"csiphy_timer_src_clk", "csiphy_timer_clk",
-			"camss_ahb_src", "csi_phy_clk",
-			"camss_ahb_clk";
+//		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
+//			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,
+//			<&clock_gcc clk_csi0phytimer_clk_src>,
+//			<&clock_gcc clk_gcc_camss_csi0phytimer_clk>,
+//			<&clock_gcc clk_camss_ahb_clk_src>,
+//			<&clock_gcc clk_gcc_camss_csi0phy_clk>,
+//			<&clock_gcc clk_gcc_camss_ahb_clk>;
+//		clock-names = "camss_top_ahb_clk", "ispif_ahb_clk",
+//			"csiphy_timer_src_clk", "csiphy_timer_clk",
+//			"camss_ahb_src", "csi_phy_clk",
+//			"camss_ahb_clk";
 		qcom,clock-rates = <0 0 200000000 0 0 0 0>;
 	};
 
@@ -46,17 +46,17 @@
 		reg-names = "csiphy", "csiphy_clk_mux";
 		interrupts = <0 79 0>;
 		interrupt-names = "csiphy";
-		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
-			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,
-			<&clock_gcc clk_csi1phytimer_clk_src>,
-			<&clock_gcc clk_gcc_camss_csi1phytimer_clk>,
-			<&clock_gcc clk_camss_ahb_clk_src>,
-			<&clock_gcc clk_gcc_camss_csi1phy_clk>,
-			<&clock_gcc clk_gcc_camss_ahb_clk>;
-		clock-names = "camss_top_ahb_clk", "ispif_ahb_clk",
-			"csiphy_timer_src_clk", "csiphy_timer_clk",
-			"camss_ahb_src", "csi_phy_clk",
-			"camss_ahb_clk";
+//		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
+//			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,
+//			<&clock_gcc clk_csi1phytimer_clk_src>,
+//			<&clock_gcc clk_gcc_camss_csi1phytimer_clk>,
+//			<&clock_gcc clk_camss_ahb_clk_src>,
+//			<&clock_gcc clk_gcc_camss_csi1phy_clk>,
+//			<&clock_gcc clk_gcc_camss_ahb_clk>;
+//		clock-names = "camss_top_ahb_clk", "ispif_ahb_clk",
+//			"csiphy_timer_src_clk", "csiphy_timer_clk",
+//			"camss_ahb_src", "csi_phy_clk",
+//			"camss_ahb_clk";
 		qcom,clock-rates = <0 0 200000000 0 0 0 0>;
 	};
 
@@ -69,18 +69,18 @@
 		interrupt-names = "csid";
 		qcom,csi-vdd-voltage = <1200000>;
 		qcom,mipi-csi-vdd-supply = <&pm8916_l2>;
-		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
-			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,
-			<&clock_gcc clk_gcc_camss_csi0_ahb_clk>,
-			<&clock_gcc clk_csi0_clk_src>,
-			<&clock_gcc clk_gcc_camss_csi0_clk>,
-			<&clock_gcc clk_gcc_camss_csi0pix_clk>,
-			<&clock_gcc clk_gcc_camss_csi0rdi_clk>,
-			<&clock_gcc clk_gcc_camss_ahb_clk>;
-		clock-names = "camss_top_ahb_clk",
-			"ispif_ahb_clk", "csi_ahb_clk", "csi_src_clk",
-			"csi_clk",  "csi_pix_clk",
-			"csi_rdi_clk", "camss_ahb_clk";
+//		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
+//			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,
+//			<&clock_gcc clk_gcc_camss_csi0_ahb_clk>,
+//			<&clock_gcc clk_csi0_clk_src>,
+//			<&clock_gcc clk_gcc_camss_csi0_clk>,
+//			<&clock_gcc clk_gcc_camss_csi0pix_clk>,
+//			<&clock_gcc clk_gcc_camss_csi0rdi_clk>,
+//			<&clock_gcc clk_gcc_camss_ahb_clk>;
+//		clock-names = "camss_top_ahb_clk",
+//			"ispif_ahb_clk", "csi_ahb_clk", "csi_src_clk",
+//			"csi_clk",  "csi_pix_clk",
+//			"csi_rdi_clk", "camss_ahb_clk";
 		qcom,clock-rates = <0 0 0 200000000 0 0 0 0>;
      };
 
@@ -93,18 +93,18 @@
 		interrupt-names = "csid";
 		qcom,csi-vdd-voltage = <1200000>;
 		qcom,mipi-csi-vdd-supply = <&pm8916_l2>;
-		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
-			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,
-			<&clock_gcc clk_gcc_camss_csi1_ahb_clk>,
-			<&clock_gcc clk_csi1_clk_src>,
-			<&clock_gcc clk_gcc_camss_csi1_clk>,
-			<&clock_gcc clk_gcc_camss_csi1pix_clk>,
-			<&clock_gcc clk_gcc_camss_csi1rdi_clk>,
-			<&clock_gcc clk_gcc_camss_ahb_clk>;
-		clock-names = "camss_top_ahb_clk",
-			"ispif_ahb_clk", "csi_ahb_clk", "csi_src_clk",
-			"csi_clk", "csi_pix_clk",
-			"csi_rdi_clk", "camss_ahb_clk";
+//		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
+//			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,
+//			<&clock_gcc clk_gcc_camss_csi1_ahb_clk>,
+//			<&clock_gcc clk_csi1_clk_src>,
+//			<&clock_gcc clk_gcc_camss_csi1_clk>,
+//			<&clock_gcc clk_gcc_camss_csi1pix_clk>,
+//			<&clock_gcc clk_gcc_camss_csi1rdi_clk>,
+//			<&clock_gcc clk_gcc_camss_ahb_clk>;
+//		clock-names = "camss_top_ahb_clk",
+//			"ispif_ahb_clk", "csi_ahb_clk", "csi_src_clk",
+//			"csi_clk", "csi_pix_clk",
+//			"csi_rdi_clk", "camss_ahb_clk";
 		qcom,clock-rates = <0 0 0 200000000 0 0 0 0>;
 	};
 
@@ -116,39 +116,39 @@
 		reg-names = "ispif", "csi_clk_mux";
 		interrupts = <0 55 0>;
 		interrupt-names = "ispif";
-		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,
-		<&clock_gcc clk_gcc_camss_ahb_clk>,
-		<&clock_gcc clk_csi0_clk_src>,
-		<&clock_gcc clk_gcc_camss_csi0_clk>,
-		<&clock_gcc clk_gcc_camss_csi0pix_clk>,
-		<&clock_gcc clk_gcc_camss_csi0rdi_clk>,
-		<&clock_gcc clk_csi1_clk_src>,
-		<&clock_gcc clk_gcc_camss_csi1_clk>,
-		<&clock_gcc clk_gcc_camss_csi1pix_clk>,
-		<&clock_gcc clk_gcc_camss_csi1rdi_clk>,
-		<&clock_gcc clk_csi1_clk_src>,
-		<&clock_gcc clk_gcc_camss_csi1_clk>,
-		<&clock_gcc clk_gcc_camss_csi1pix_clk>,
-		<&clock_gcc clk_gcc_camss_csi1rdi_clk>,
-		<&clock_gcc clk_csi1_clk_src>,
-		<&clock_gcc clk_gcc_camss_csi1_clk>,
-		<&clock_gcc clk_gcc_camss_csi1pix_clk>,
-		<&clock_gcc clk_gcc_camss_csi1rdi_clk>,
-		<&clock_gcc clk_vfe0_clk_src>,
-		<&clock_gcc clk_gcc_camss_vfe0_clk>,
-		<&clock_gcc clk_gcc_camss_csi_vfe0_clk>,
-		<&clock_gcc clk_vfe0_clk_src>,
-		<&clock_gcc clk_gcc_camss_vfe0_clk>,
-		<&clock_gcc clk_gcc_camss_csi_vfe0_clk>;
-        clock-names = "ispif_ahb_clk","camss_ahb_clk",
-            "csi0_src_clk", "csi0_clk",
-            "csi0_pix_clk","csi0_rdi_clk", "csi1_src_clk",
-            "csi1_clk", "csi1_pix_clk", "csi1_rdi_clk",
-            "csi2_src_clk","csi2_clk", "csi2_pix_clk","csi2_rdi_clk",
-            "csi3_src_clk","csi3_clk", "csi3_pix_clk",
-            "csi3_rdi_clk", "vfe0_clk_src", "camss_vfe_vfe0_clk",
-            "camss_csi_vfe0_clk","vfe1_clk_src","camss_vfe_vfe1_clk",
-            "camss_csi_vfe1_clk";
+//		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,
+//		<&clock_gcc clk_gcc_camss_ahb_clk>,
+//		<&clock_gcc clk_csi0_clk_src>,
+//		<&clock_gcc clk_gcc_camss_csi0_clk>,
+//		<&clock_gcc clk_gcc_camss_csi0pix_clk>,
+//		<&clock_gcc clk_gcc_camss_csi0rdi_clk>,
+//		<&clock_gcc clk_csi1_clk_src>,
+//		<&clock_gcc clk_gcc_camss_csi1_clk>,
+//		<&clock_gcc clk_gcc_camss_csi1pix_clk>,
+//		<&clock_gcc clk_gcc_camss_csi1rdi_clk>,
+//		<&clock_gcc clk_csi1_clk_src>,
+//		<&clock_gcc clk_gcc_camss_csi1_clk>,
+//		<&clock_gcc clk_gcc_camss_csi1pix_clk>,
+//		<&clock_gcc clk_gcc_camss_csi1rdi_clk>,
+//		<&clock_gcc clk_csi1_clk_src>,
+//		<&clock_gcc clk_gcc_camss_csi1_clk>,
+//		<&clock_gcc clk_gcc_camss_csi1pix_clk>,
+//		<&clock_gcc clk_gcc_camss_csi1rdi_clk>,
+//		<&clock_gcc clk_vfe0_clk_src>,
+//		<&clock_gcc clk_gcc_camss_vfe0_clk>,
+//		<&clock_gcc clk_gcc_camss_csi_vfe0_clk>,
+//		<&clock_gcc clk_vfe0_clk_src>,
+//		<&clock_gcc clk_gcc_camss_vfe0_clk>,
+//		<&clock_gcc clk_gcc_camss_csi_vfe0_clk>;
+//      clock-names = "ispif_ahb_clk","camss_ahb_clk",
+//            "csi0_src_clk", "csi0_clk",
+//            "csi0_pix_clk","csi0_rdi_clk", "csi1_src_clk",
+//            "csi1_clk", "csi1_pix_clk", "csi1_rdi_clk",
+//            "csi2_src_clk","csi2_clk", "csi2_pix_clk","csi2_rdi_clk",
+//            "csi3_src_clk","csi3_clk", "csi3_pix_clk",
+//            "csi3_rdi_clk", "vfe0_clk_src", "camss_vfe_vfe0_clk",
+//            "camss_csi_vfe0_clk","vfe1_clk_src","camss_vfe_vfe1_clk",
+//            "camss_csi_vfe1_clk";
 	qcom,clock-rates = <0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0>;
 	};
 
@@ -161,16 +161,16 @@
 		interrupts = <0 57 0>;
 		interrupt-names = "vfe";
 		vdd-supply = <&gdsc_vfe>;
-		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
-			 <&clock_gcc clk_vfe0_clk_src>,
-			 <&clock_gcc clk_gcc_camss_vfe0_clk>,
-			 <&clock_gcc clk_gcc_camss_csi_vfe0_clk>,
-			 <&clock_gcc clk_gcc_camss_vfe_ahb_clk>,
-			 <&clock_gcc clk_gcc_camss_vfe_axi_clk>,
-			 <&clock_gcc clk_gcc_camss_ahb_clk>;
-		clock-names = "camss_top_ahb_clk", "vfe_clk_src",
-			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",
-			"bus_clk", "camss_ahb_clk";
+//		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
+//			 <&clock_gcc clk_vfe0_clk_src>,
+//			 <&clock_gcc clk_gcc_camss_vfe0_clk>,
+//			 <&clock_gcc clk_gcc_camss_csi_vfe0_clk>,
+//			 <&clock_gcc clk_gcc_camss_vfe_ahb_clk>,
+//			 <&clock_gcc clk_gcc_camss_vfe_axi_clk>,
+//			 <&clock_gcc clk_gcc_camss_ahb_clk>;
+//		clock-names = "camss_top_ahb_clk", "vfe_clk_src",
+//			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",
+//			"bus_clk", "camss_ahb_clk";
 		qcom,clock-rates = <0 266670000 0 0 0 0 0>;
 		qos-entries = <8>;
 		qos-regs = <0x2C4 0x2C8 0x2CC 0x2D0 0x2D4 0x2D8
@@ -189,14 +189,14 @@
 		interrupts = <0 59 0>;
 		interrupt-names = "jpeg";
 		vdd-supply = <&gdsc_jpeg>;
-		clocks = <&clock_gcc clk_gcc_camss_jpeg0_clk>,
-			 <&clock_gcc clk_gcc_camss_jpeg_ahb_clk>,
-			 <&clock_gcc clk_gcc_camss_jpeg_axi_clk>,
-			 <&clock_gcc clk_gcc_camss_top_ahb_clk>,
-			 <&clock_gcc clk_gcc_camss_ahb_clk>;
-		clock-names = "core_clk", "iface_clk",
-			"bus_clk0", "camss_top_ahb_clk",
-			"camss_ahb_clk";
+//		clocks = <&clock_gcc clk_gcc_camss_jpeg0_clk>,
+//			 <&clock_gcc clk_gcc_camss_jpeg_ahb_clk>,
+//			 <&clock_gcc clk_gcc_camss_jpeg_axi_clk>,
+//			 <&clock_gcc clk_gcc_camss_top_ahb_clk>,
+//			 <&clock_gcc clk_gcc_camss_ahb_clk>;
+//		clock-names = "core_clk", "iface_clk",
+//			"bus_clk0", "camss_top_ahb_clk",
+//			"camss_ahb_clk";
 		qcom,clock-rates = <266670000 0 0 0 0>;
 	};
 
@@ -217,19 +217,19 @@
 		interrupts = <0 49 0>;
 		interrupt-names = "cpp";
 		vdd-supply = <&gdsc_vfe>;
-		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
-			<&clock_gcc clk_vfe0_clk_src>,
-			<&clock_gcc clk_gcc_camss_vfe0_clk>,
-			<&clock_gcc clk_gcc_camss_vfe_ahb_clk>,
-			<&clock_gcc clk_gcc_camss_cpp_clk>,
-			<&clock_gcc clk_gcc_camss_cpp_ahb_clk>,
-			<&clock_gcc clk_gcc_camss_vfe_axi_clk>,
-			<&clock_gcc clk_gcc_camss_micro_ahb_clk>,
-			<&clock_gcc clk_gcc_camss_ahb_clk>;
-		clock-names = "camss_top_ahb_clk", "vfe_clk_src",
-			"camss_vfe_vfe_clk", "iface_clk", "cpp_core_clk",
-			"cpp_iface_clk", "cpp_bus_clk", "micro_iface_clk",
-			"camss_ahb_clk";
+//		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
+//			<&clock_gcc clk_vfe0_clk_src>,
+//			<&clock_gcc clk_gcc_camss_vfe0_clk>,
+//			<&clock_gcc clk_gcc_camss_vfe_ahb_clk>,
+//			<&clock_gcc clk_gcc_camss_cpp_clk>,
+//			<&clock_gcc clk_gcc_camss_cpp_ahb_clk>,
+//			<&clock_gcc clk_gcc_camss_vfe_axi_clk>,
+//			<&clock_gcc clk_gcc_camss_micro_ahb_clk>,
+//			<&clock_gcc clk_gcc_camss_ahb_clk>;
+//		clock-names = "camss_top_ahb_clk", "vfe_clk_src",
+//			"camss_vfe_vfe_clk", "iface_clk", "cpp_core_clk",
+//			"cpp_iface_clk", "cpp_bus_clk", "micro_iface_clk",
+//			"camss_ahb_clk";
 		qcom,clock-rates = <0 320000000 0 80000000 320000000 0 0 0 0>;
 	};
 
@@ -242,13 +242,13 @@
 		reg-names = "cci";
 		interrupts = <0 50 0>;
 		interrupt-names = "cci";
-		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
-			 <&clock_gcc clk_cci_clk_src>,
-			 <&clock_gcc clk_gcc_camss_cci_ahb_clk>,
-			 <&clock_gcc clk_gcc_camss_cci_clk>,
-			 <&clock_gcc clk_gcc_camss_ahb_clk>;
-		clock-names = "camss_top_ahb_clk", "cci_src_clk",
-			"cci_ahb_clk", "cci_clk", "camss_ahb_clk";
+//		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,
+//			 <&clock_gcc clk_cci_clk_src>,
+//			 <&clock_gcc clk_gcc_camss_cci_ahb_clk>,
+//			 <&clock_gcc clk_gcc_camss_cci_clk>,
+//			 <&clock_gcc clk_gcc_camss_ahb_clk>;
+//		clock-names = "camss_top_ahb_clk", "cci_src_clk",
+//			"cci_ahb_clk", "cci_clk", "camss_ahb_clk";
 		qcom,clock-rates = <0 19200000 80000000 0 0>,
 				<0 37500000 80000000 0 0>;
 		pinctrl-names = "cci_default", "cci_suspend";
diff --git a/arch/arm64/boot/dts/qcom/msm8916-cdp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-cdp.dtsi
index afa3684e9da..340f1c222ed 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-cdp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-cdp.dtsi
@@ -76,8 +76,8 @@
 			pinctrl-0 = <&nfc_int_active &nfc_disable_active>;
 			pinctrl-1 = <&nfc_int_suspend &nfc_disable_suspend>;
 			qcom,clk-gpio = <&pm8916_gpios 2 0>;
-			clocks = <&clock_rpm clk_bb_clk2_pin>;
-			clock-names = "ref_clk";
+//			clocks = <&clock_rpm clk_bb_clk2_pin>;
+//			clock-names = "ref_clk";
 		};
 	};
 
@@ -494,31 +494,31 @@
 };
 
 /* CoreSight */
-&tpiu {
-	pinctrl-names = "seta-pctrl", "setb-pctrl", "sdcard", "trace",
-			"swduart", "swdtrc", "jtag", "spmi";
-	/* Mictor */
-	pinctrl-0 = <&tpiu_seta>;
-	pinctrl-1 = <&tpiu_setb>;
-	/* NIDnT */
-	pinctrl-2 = <&qdsd_clk_sdcard &qdsd_cmd_sdcard
-		    &qdsd_data0_sdcard &qdsd_data1_sdcard
-		    &qdsd_data2_sdcard &qdsd_data3_sdcard>;
-	pinctrl-3 = <&qdsd_clk_trace &qdsd_cmd_trace
-		    &qdsd_data0_trace &qdsd_data1_trace
-		    &qdsd_data2_trace &qdsd_data3_trace>;
-	pinctrl-4 = <&qdsd_cmd_swduart &qdsd_data0_swduart
-		    &qdsd_data1_swduart &qdsd_data2_swduart
-		    &qdsd_data3_swduart>;
-	pinctrl-5 = <&qdsd_clk_swdtrc &qdsd_cmd_swdtrc
-		    &qdsd_data0_swdtrc &qdsd_data1_swdtrc
-		    &qdsd_data2_swdtrc &qdsd_data3_swdtrc>;
-	pinctrl-6 = <&qdsd_cmd_jtag &qdsd_data0_jtag
-		    &qdsd_data1_jtag &qdsd_data2_jtag
-		    &qdsd_data3_jtag>;
-	pinctrl-7 = <&qdsd_clk_spmi &qdsd_cmd_spmi
-		    &qdsd_data0_spmi &qdsd_data3_spmi>;
-};
+//&tpiu {
+//	pinctrl-names = "seta-pctrl", "setb-pctrl", "sdcard", "trace",
+//			"swduart", "swdtrc", "jtag", "spmi";
+//	/* Mictor */
+//	pinctrl-0 = <&tpiu_seta>;
+//	pinctrl-1 = <&tpiu_setb>;
+//	/* NIDnT */
+//	pinctrl-2 = <&qdsd_clk_sdcard &qdsd_cmd_sdcard
+//		    &qdsd_data0_sdcard &qdsd_data1_sdcard
+//		    &qdsd_data2_sdcard &qdsd_data3_sdcard>;
+//	pinctrl-3 = <&qdsd_clk_trace &qdsd_cmd_trace
+//		    &qdsd_data0_trace &qdsd_data1_trace
+//		    &qdsd_data2_trace &qdsd_data3_trace>;
+//	pinctrl-4 = <&qdsd_cmd_swduart &qdsd_data0_swduart
+//		    &qdsd_data1_swduart &qdsd_data2_swduart
+//		    &qdsd_data3_swduart>;
+//	pinctrl-5 = <&qdsd_clk_swdtrc &qdsd_cmd_swdtrc
+//		    &qdsd_data0_swdtrc &qdsd_data1_swdtrc
+//		    &qdsd_data2_swdtrc &qdsd_data3_swdtrc>;
+//	pinctrl-6 = <&qdsd_cmd_jtag &qdsd_data0_jtag
+//		    &qdsd_data1_jtag &qdsd_data2_jtag
+//		    &qdsd_data3_jtag>;
+//	pinctrl-7 = <&qdsd_clk_spmi &qdsd_cmd_spmi
+//		    &qdsd_data0_spmi &qdsd_data3_spmi>;
+//};
 
 &pm8916_chg {
 	status = "ok";
diff --git a/arch/arm64/boot/dts/qcom/msm8916-gpu.dtsi b/arch/arm64/boot/dts/qcom/msm8916-gpu.dtsi
index e4690c606ed..026638a6528 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-gpu.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-gpu.dtsi
@@ -34,15 +34,15 @@
 		 * KGSL_CLK_MEM_IFACE | KGSL_CLK_ALT_MEM_IFACE
 		 */
 		qcom,clk-map = <0x0000005E>;
-		clocks = <&clock_gcc clk_gcc_oxili_gfx3d_clk>,
-			<&clock_gcc clk_gcc_oxili_ahb_clk>,
-			<&clock_gcc clk_gcc_oxili_gmem_clk>,
-			<&clock_gcc clk_gcc_bimc_gfx_clk>,
-			<&clock_gcc clk_gcc_bimc_gpu_clk>,
-			<&clock_gcc clk_gcc_gtcu_ahb_clk>;
-		clock-names = "core_clk", "iface_clk", "mem_clk",
-				"mem_iface_clk", "alt_mem_iface_clk",
-				"gtcu_iface_clk";
+//		clocks = <&clock_gcc clk_gcc_oxili_gfx3d_clk>,
+//			<&clock_gcc clk_gcc_oxili_ahb_clk>,
+//			<&clock_gcc clk_gcc_oxili_gmem_clk>,
+//			<&clock_gcc clk_gcc_bimc_gfx_clk>,
+//			<&clock_gcc clk_gcc_bimc_gpu_clk>,
+//			<&clock_gcc clk_gcc_gtcu_ahb_clk>;
+//		clock-names = "core_clk", "iface_clk", "mem_clk",
+//				"mem_iface_clk", "alt_mem_iface_clk",
+//				"gtcu_iface_clk";
 
 		/* Bus Scale Settings */
 		qcom,msm-bus,name = "grp3d";
diff --git a/arch/arm64/boot/dts/qcom/msm8916-mdss-pll.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mdss-pll.dtsi
index 51e8cd9a9ad..79abbe4f98a 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-mdss-pll.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-mdss-pll.dtsi
@@ -23,8 +23,8 @@
 		gdsc-supply = <&gdsc_mdss>;
 		vddio-supply = <&pm8916_l6>;
 
-		clocks = <&clock_gcc clk_gcc_mdss_ahb_clk>;
-		clock-names = "iface_clk";
+//		clocks = <&clock_gcc clk_gcc_mdss_ahb_clk>;
+//		clock-names = "iface_clk";
 		clock-rate = <0>;
 
 		qcom,platform-supply-entries {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-mdss.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mdss.dtsi
index 02d82bb6456..553b8b01792 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-mdss.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-mdss.dtsi
@@ -73,13 +73,13 @@
 		qcom,mdss-no-hist-vote;
 
 		vdd-cx-supply = <&pm8916_s1_corner>;
-		clocks = <&clock_gcc clk_gcc_mdss_ahb_clk>,
-			 <&clock_gcc clk_gcc_mdss_axi_clk>,
-			 <&clock_gcc clk_mdp_clk_src>,
-			 <&clock_gcc clk_gcc_mdss_mdp_clk>,
-			 <&clock_gcc clk_gcc_mdss_vsync_clk>;
-		clock-names = "iface_clk", "bus_clk", "core_clk_src",
-				"core_clk", "vsync_clk";
+//		clocks = <&clock_gcc clk_gcc_mdss_ahb_clk>,
+//			 <&clock_gcc clk_gcc_mdss_axi_clk>,
+//			 <&clock_gcc clk_mdp_clk_src>,
+//			 <&clock_gcc clk_gcc_mdss_mdp_clk>,
+//			 <&clock_gcc clk_gcc_mdss_vsync_clk>;
+//		clock-names = "iface_clk", "bus_clk", "core_clk_src",
+//				"core_clk", "vsync_clk";
 		qcom,mdp-settings = <0x000011e4 0x00000000>,
 				    <0x00065048 0x00000008>,
 				    <0x00065848 0x00000008>,
@@ -123,14 +123,14 @@
 		vdda-supply = <&pm8916_l2>;
 		vdd-supply = <&pm8916_l17>;
 		vddio-supply = <&pm8916_l6>;
-		clocks = <&clock_gcc clk_gcc_mdss_mdp_clk>,
-                         <&clock_gcc clk_gcc_mdss_ahb_clk>,
-                         <&clock_gcc clk_gcc_mdss_axi_clk>,
-                         <&clock_gcc_mdss clk_gcc_mdss_byte0_clk>,
-                         <&clock_gcc_mdss clk_gcc_mdss_pclk0_clk>,
-                         <&clock_gcc clk_gcc_mdss_esc0_clk>;
-                clock-names = "mdp_core_clk", "iface_clk", "bus_clk",
-                                "byte_clk", "pixel_clk", "core_clk";
+//		clocks = <&clock_gcc clk_gcc_mdss_mdp_clk>,
+//			<&clock_gcc clk_gcc_mdss_ahb_clk>,
+//			<&clock_gcc clk_gcc_mdss_axi_clk>,
+//			<&clock_gcc_mdss clk_gcc_mdss_byte0_clk>,
+//			<&clock_gcc_mdss clk_gcc_mdss_pclk0_clk>,
+//			<&clock_gcc clk_gcc_mdss_esc0_clk>;
+//                clock-names = "mdp_core_clk", "iface_clk", "bus_clk",
+//			"byte_clk", "pixel_clk", "core_clk";
 		qcom,platform-strength-ctrl = [ff 06];
 		qcom,platform-bist-ctrl = [00 00 b1 ff 00 00];
 		qcom,platform-regulator-settings = [03 08 07 00 20 07 01];
diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
index 0884b8b63e0..f212cd74798 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
@@ -42,9 +42,9 @@
 			synaptics,power-down;
 			synaptics,disable-gpios;
 			/* Underlying clocks used by secure touch */
-			clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
-			 <&clock_gcc clk_gcc_blsp1_qup5_i2c_apps_clk>;
-			clock-names = "iface_clk", "core_clk";
+//			clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
+//			 <&clock_gcc clk_gcc_blsp1_qup5_i2c_apps_clk>;
+//			clock-names = "iface_clk", "core_clk";
 		};
 	};
 
@@ -73,8 +73,8 @@
 			pinctrl-0 = <&nfc_int_active &nfc_disable_active>;
 			pinctrl-1 = <&nfc_int_suspend &nfc_disable_suspend>;
 			qcom,clk-gpio = <&pm8916_gpios 2 0>;
-			clocks = <&clock_rpm clk_bb_clk2_pin>;
-			clock-names = "ref_clk";
+//			clocks = <&clock_rpm clk_bb_clk2_pin>;
+//			clock-names = "ref_clk";
 		};
 	};
 
@@ -430,28 +430,28 @@
 };
 
 /* CoreSight */
-&tpiu {
-      pinctrl-names = "sdcard", "trace", "swduart",
-		      "swdtrc", "jtag", "spmi";
-       /* NIDnT */
-      pinctrl-0 = <&qdsd_clk_sdcard &qdsd_cmd_sdcard
-                  &qdsd_data0_sdcard &qdsd_data1_sdcard
-                  &qdsd_data2_sdcard &qdsd_data3_sdcard>;
-      pinctrl-1 = <&qdsd_clk_trace &qdsd_cmd_trace
-                  &qdsd_data0_trace &qdsd_data1_trace
-                  &qdsd_data2_trace &qdsd_data3_trace>;
-      pinctrl-2 = <&qdsd_cmd_swduart &qdsd_data0_swduart
-                  &qdsd_data1_swduart &qdsd_data2_swduart
-                  &qdsd_data3_swduart>;
-      pinctrl-3 = <&qdsd_clk_swdtrc &qdsd_cmd_swdtrc
-                  &qdsd_data0_swdtrc &qdsd_data1_swdtrc
-                  &qdsd_data2_swdtrc &qdsd_data3_swdtrc>;
-      pinctrl-4 = <&qdsd_cmd_jtag &qdsd_data0_jtag
-                  &qdsd_data1_jtag &qdsd_data2_jtag
-                  &qdsd_data3_jtag>;
-      pinctrl-5 = <&qdsd_clk_spmi &qdsd_cmd_spmi
-                  &qdsd_data0_spmi &qdsd_data3_spmi>;
-};
+//&tpiu {
+//      pinctrl-names = "sdcard", "trace", "swduart",
+//		      "swdtrc", "jtag", "spmi";
+//       /* NIDnT */
+//      pinctrl-0 = <&qdsd_clk_sdcard &qdsd_cmd_sdcard
+//                  &qdsd_data0_sdcard &qdsd_data1_sdcard
+//                  &qdsd_data2_sdcard &qdsd_data3_sdcard>;
+//      pinctrl-1 = <&qdsd_clk_trace &qdsd_cmd_trace
+//                  &qdsd_data0_trace &qdsd_data1_trace
+//                  &qdsd_data2_trace &qdsd_data3_trace>;
+//      pinctrl-2 = <&qdsd_cmd_swduart &qdsd_data0_swduart
+//                  &qdsd_data1_swduart &qdsd_data2_swduart
+//                  &qdsd_data3_swduart>;
+//      pinctrl-3 = <&qdsd_clk_swdtrc &qdsd_cmd_swdtrc
+//                  &qdsd_data0_swdtrc &qdsd_data1_swdtrc
+//                  &qdsd_data2_swdtrc &qdsd_data3_swdtrc>;
+//      pinctrl-4 = <&qdsd_cmd_jtag &qdsd_data0_jtag
+//                  &qdsd_data1_jtag &qdsd_data2_jtag
+//                  &qdsd_data3_jtag>;
+//      pinctrl-5 = <&qdsd_clk_spmi &qdsd_cmd_spmi
+//                  &qdsd_data0_spmi &qdsd_data3_spmi>;
+//};
 
 &spmi_bus {
 	qcom,pm8916@1 {
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 808d020a3cc..3fd40942ba9 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -101,17 +101,17 @@
 	soc: soc { };
 };
 
-#include "msm8916-coresight.dtsi"
+//#include "msm8916-coresight.dtsi"
 #include "msm8916-smp2p.dtsi"
 #include "msm8916-camera.dtsi"
 #include "msm8916-ipcrouter.dtsi"
 #include "msm-gdsc-8916.dtsi"
 #include "msm8916-iommu.dtsi"
-#include "msm8916-gpu.dtsi"
+//#include "msm8916-gpu.dtsi"
 #include "msm8916-mdss.dtsi"
 #include "msm8916-mdss-pll.dtsi"
 #include "msm8916-iommu-domains.dtsi"
-#include "msm8916-bus.dtsi"
+//#include "msm8916-bus.dtsi"
 #include "msm8916-camera.dtsi"
 
 &soc {
@@ -278,9 +278,9 @@
 
 	clock_gcc_mdss: qcom,gcc-mdss@1a98300 {
 		compatible = "qcom,gcc-mdss-8916";
-		clocks = <&mdss_dsi0_pll clk_pixel_clk_src>,
-			 <&mdss_dsi0_pll clk_byte_clk_src>;
-		clock-names = "pixel_src", "byte_src";
+//		clocks = <&mdss_dsi0_pll clk_pixel_clk_src>,
+//			 <&mdss_dsi0_pll clk_byte_clk_src>;
+//		clock-names = "pixel_src", "byte_src";
 		#clock-cells = <1>;
 	};
 
@@ -289,8 +289,8 @@
 		reg = <0x1874000 0x4>,
 		      <0xb01101c 0x8>;
 		reg-names = "cc_base", "meas";
-		clocks = <&clock_rpm clk_rpm_debug_mux>;
-		clock-names = "rpm_debug_mux";
+//		clocks = <&clock_rpm clk_rpm_debug_mux>;
+//		clock-names = "rpm_debug_mux";
 		#clock-cells = <1>;
 	};
 
@@ -313,9 +313,9 @@
 		reg-names = "rcg-base", "efuse1";
 		qcom,safe-freq = < 400000000 >;
 		cpu-vdd-supply = <&apc_vreg_corner>;
-		clocks = <&clock_gcc clk_gpll0_ao_clk_src>,
-			 <&clock_gcc clk_a53sspll>;
-		clock-names = "clk-4", "clk-5";
+//		clocks = <&clock_gcc clk_gpll0_ao_clk_src>,
+//			 <&clock_gcc clk_a53sspll>;
+//		clock-names = "clk-4", "clk-5";
 		qcom,speed0-bin-v0 =
 			<          0 0>,
 			<  200000000 1>,
@@ -407,9 +407,9 @@
 		qcom,bam-rx-ep-pipe-index = <1>;
 		qcom,master-id = <86>;
 
-		clocks = <&clock_gcc clk_gcc_blsp1_uart1_apps_clk>,
-			 <&clock_gcc clk_gcc_blsp1_ahb_clk>;
-		clock-names = "core_clk", "iface_clk";
+//		clocks = <&clock_gcc clk_gcc_blsp1_uart1_apps_clk>,
+//			 <&clock_gcc clk_gcc_blsp1_ahb_clk>;
+//		clock-names = "core_clk", "iface_clk";
 
 		qcom,msm-bus,name = "blsp1_uart1";
 		qcom,msm-bus,num-cases = <2>;
@@ -494,16 +494,16 @@
 				<87 512 0 0>,
 				<87 512 80000 0>,
 				<87 512 6000  6000>;
-		clocks = <&clock_gcc GCC_USB_HS_AHB_CLK>,
-			 <&clock_gcc GCC_USB_HS_SYSTEM_CLK>,
-			 <&clock_gcc GCC_USB2A_PHY_SLEEP_CLK>,
-			 <&clock_rpm clk_bimc_usb_a_clk>,
-			 <&clock_rpm clk_snoc_usb_a_clk>,
-			 <&clock_rpm clk_pcnoc_usb_a_clk>,
-			 <&clock_rpm clk_xo_otg_clk>;
-		clock-names = "iface_clk", "core_clk", "sleep_clk",
-				"bimc_clk", "snoc_clk", "pcnoc_clk",
-				"xo";
+//		clocks = <&clock_gcc GCC_USB_HS_AHB_CLK>,
+//			 <&clock_gcc GCC_USB_HS_SYSTEM_CLK>,
+//			 <&clock_gcc GCC_USB2A_PHY_SLEEP_CLK>,
+//			 <&clock_rpm clk_bimc_usb_a_clk>,
+//			 <&clock_rpm clk_snoc_usb_a_clk>,
+//			 <&clock_rpm clk_pcnoc_usb_a_clk>,
+//			 <&clock_rpm clk_xo_otg_clk>;
+//		clock-names = "iface_clk", "core_clk", "sleep_clk",
+//				"bimc_clk", "snoc_clk", "pcnoc_clk",
+//				"xo";
 		qcom,bus-clk-rate = <400000000 200000000 100000000>;
 	};
 
@@ -548,9 +548,9 @@
 		      <0x850000 0x1000>;
 		reg-names = "etm-base","debug-base";
 
-		clocks = <&clock_rpm clk_qdss_clk>,
-			 <&clock_rpm clk_qdss_a_clk>;
-		clock-names = "core_clk", "core_a_clk";
+//		clocks = <&clock_rpm clk_qdss_clk>,
+//			 <&clock_rpm clk_qdss_a_clk>;
+//		clock-names = "core_clk", "core_a_clk";
 
 		qcom,coresight-jtagmm-cpu = <&CPU0>;
 	};
@@ -561,9 +561,9 @@
 		      <0x852000 0x1000>;
 		reg-names = "etm-base","debug-base";
 
-		clocks = <&clock_rpm clk_qdss_clk>,
-			 <&clock_rpm clk_qdss_a_clk>;
-		clock-names = "core_clk", "core_a_clk";
+//		clocks = <&clock_rpm clk_qdss_clk>,
+//			 <&clock_rpm clk_qdss_a_clk>;
+//		clock-names = "core_clk", "core_a_clk";
 
 		qcom,coresight-jtagmm-cpu = <&CPU1>;
 	};
@@ -574,9 +574,9 @@
 		      <0x854000 0x1000>;
 		reg-names = "etm-base","debug-base";
 
-		clocks = <&clock_rpm clk_qdss_clk>,
-			 <&clock_rpm clk_qdss_a_clk>;
-		clock-names = "core_clk", "core_a_clk";
+//		clocks = <&clock_rpm clk_qdss_clk>,
+//			 <&clock_rpm clk_qdss_a_clk>;
+//		clock-names = "core_clk", "core_a_clk";
 
 		qcom,coresight-jtagmm-cpu = <&CPU2>;
 	};
@@ -587,9 +587,9 @@
 		      <0x856000 0x1000>;
 		reg-names = "etm-base","debug-base";
 
-		clocks = <&clock_rpm clk_qdss_clk>,
-			 <&clock_rpm clk_qdss_a_clk>;
-		clock-names = "core_clk", "core_a_clk";
+//		clocks = <&clock_rpm clk_qdss_clk>,
+//			 <&clock_rpm clk_qdss_a_clk>;
+//		clock-names = "core_clk", "core_a_clk";
 
 		qcom,coresight-jtagmm-cpu = <&CPU3>;
 	};
@@ -1335,11 +1335,11 @@
 		gpios = <&msm_gpio 40 0>, <&msm_gpio 41 0>, <&msm_gpio 42 0>,
 					<&msm_gpio 43 0>, <&msm_gpio 44 0>;
 
-		clocks = <&clock_rpm clk_xo_wlan_clk>,
-			 <&clock_rpm clk_rf_clk2>,
-			 <&clock_debug clk_gcc_debug_mux>,
-			 <&clock_gcc clk_wcnss_m_clk>;
-		clock-names = "xo", "rf_clk", "measure", "wcnss_debug";
+//		clocks = <&clock_rpm clk_xo_wlan_clk>,
+//			 <&clock_rpm clk_rf_clk2>,
+//			 <&clock_debug clk_gcc_debug_mux>,
+//			 <&clock_gcc clk_wcnss_m_clk>;
+//		clock-names = "xo", "rf_clk", "measure", "wcnss_debug";
 
 		qcom,has-autodetect-xo;
 		qcom,wlan-rx-buff-count = <512>;
@@ -1386,8 +1386,8 @@
 			lattice,vcc-en-gpio = <&msm_gpio 114 0>;
 			lattice,clk-en-gpio = <&msm_gpio 0 0>;
 
-			clocks = <&clock_rpm clk_bb_clk2_pin>;
-			clock-names = "xo";
+//			clocks = <&clock_rpm clk_bb_clk2_pin>;
+//			clock-names = "xo";
 			pinctrl-names = "default", "sleep";
 			pinctrl-0 = <&ice40_default>;
 			pinctrl-1 = <&ice40_sleep>;
@@ -1633,11 +1633,11 @@
 		vdd_pll-supply = <&pm8916_l7>;
 		qcom,vdd_pll = <1800000>;
 
-		clocks = <&clock_rpm clk_xo_pil_mss_clk>,
-			 <&clock_gcc GCC_MSS_CFG_AHB_CLK>,
-			 <&clock_gcc GCC_MSS_Q6_BIMC_AXI_CLK>,
-			 <&clock_gcc GCC_BOOT_ROM_AHB_CLK>;
-		clock-names = "xo", "iface_clk", "bus_clk", "mem_clk";
+//		clocks = <&clock_rpm clk_xo_pil_mss_clk>,
+//			 <&clock_gcc GCC_MSS_CFG_AHB_CLK>,
+//			 <&clock_gcc GCC_MSS_Q6_BIMC_AXI_CLK>,
+//			 <&clock_gcc GCC_BOOT_ROM_AHB_CLK>;
+//		clock-names = "xo", "iface_clk", "bus_clk", "mem_clk";
 		qcom,proxy-clock-names = "xo";
 		qcom,active-clock-names = "iface_clk", "bus_clk", "mem_clk";
 
@@ -1746,14 +1746,14 @@
 		vdd_pronto_pll-supply = <&pm8916_l7>;
 		qcom,proxy-reg-names = "vdd_pronto_pll";
 		qcom,vdd_pronto_pll-uV-uA = <1800000 18000>;
-		clocks = <&clock_rpm clk_xo_pil_pronto_clk>,
-			 <&clock_gcc GCC_CRYPTO_CLK>,
-			 <&clock_gcc GCC_CRYPTO_AHB_CLK>,
-			 <&clock_gcc GCC_CRYPTO_AXI_CLK>,
-			 <&clock_gcc CRYPTO_CLK_SRC>;
-
-		clock-names = "xo", "scm_core_clk", "scm_iface_clk",
-				"scm_bus_clk", "scm_core_clk_src";
+//		clocks = <&clock_rpm clk_xo_pil_pronto_clk>,
+//			 <&clock_gcc GCC_CRYPTO_CLK>,
+//			 <&clock_gcc GCC_CRYPTO_AHB_CLK>,
+//			 <&clock_gcc GCC_CRYPTO_AXI_CLK>,
+//			 <&clock_gcc CRYPTO_CLK_SRC>;
+
+//		clock-names = "xo", "scm_core_clk", "scm_iface_clk",
+//				"scm_bus_clk", "scm_core_clk_src";
 		qcom,proxy-clock-names = "xo", "scm_core_clk", "scm_iface_clk",
 					"scm_bus_clk", "scm_core_clk_src";
 		qcom,scm_core_clk_src-freq = <80000000>;
@@ -1824,7 +1824,7 @@
 #include "msm-pm8916-rpm-regulator.dtsi"
 #include "msm-pm8916.dtsi"
 #include "msm8916-regulator.dtsi"
-#include "msm8916-pm.dtsi"
+//#include "msm8916-pm.dtsi"
 
 &pm8916_vadc {
 	chan@0 {