diff --git a/bindings/msm-cam-cci.txt b/bindings/msm-cam-cci.txt
index 59651a354157..be7cc712818a 100644
--- a/bindings/msm-cam-cci.txt
+++ b/bindings/msm-cam-cci.txt
@@ -724,7 +724,7 @@ Example:
 };
 
 &cam_cci0 {
-    actuator0: qcom,actuator@0 {
+    actuator0: qcom,actuator0 {
          cell-index = <0>;
          reg = <0x0>;
          compatible = "qcom,actuator";
@@ -738,7 +738,7 @@ Example:
          rgltr-load-current = <100000>;
     };
 
-	ois0: qcom,ois@0 {
+    ois0: qcom,ois0 {
          cell-index = <0>;
          reg = <0x0>;
          compatible = "qcom,ois";
@@ -761,7 +761,7 @@ Example:
          pinctrl-1 = <&cam_shared_clk_suspend &cam_res_mgr_suspend>;
     };
 
-    qcom,cam-sensor@0 {
+    qcom,cam-sensor0 {
          cell-index = <0>;
          compatible = "qcom,camera";
          reg = <0x0>;
diff --git a/bindings/msm-cam-csiphy.txt b/bindings/msm-cam-csiphy.txt
index f67f4ef7986a..4048d66dea02 100644
--- a/bindings/msm-cam-csiphy.txt
+++ b/bindings/msm-cam-csiphy.txt
@@ -15,7 +15,8 @@ First Level Node - CSIPHY device
   Value type: <string>
   Definition: Should be "qcom,csiphy-v1.0",
 	"qcom,csiphy-v1.1", "qcom,csiphy-v1.2", "qcom,csiphy-v1.2.1",
-	"qcom,csiphy-v1.2.2", "qcom,csiphy-v2.0", "qcom,csiphy".
+	"qcom,csiphy-v1.2.2", "qcom,csiphy-v1.2.3",
+	"qcom,csiphy-v2.0", "qcom,csiphy".
 
 - cell-index: csiphy hardware core index
   Usage: required
diff --git a/bindings/msm-cam-eeprom.txt b/bindings/msm-cam-eeprom.txt
index d77f337a9e3c..d692385b4ffc 100644
--- a/bindings/msm-cam-eeprom.txt
+++ b/bindings/msm-cam-eeprom.txt
@@ -434,7 +434,7 @@ First Level Node - CAM EEPROM device
 
 Example:
 
-	eeprom0: qcom,eeprom@0 {
+	eeprom0: qcom,eeprom0 {
 		cell-index = <0>;
 		reg = <0x0>;
 		qcom,eeprom-name = "msm_eeprom";
diff --git a/bindings/msm-cam-ife-csid.txt b/bindings/msm-cam-ife-csid.txt
index ecff78ee1b27..5b31262b3bf5 100644
--- a/bindings/msm-cam-ife-csid.txt
+++ b/bindings/msm-cam-ife-csid.txt
@@ -16,8 +16,9 @@ First Level Node - CAM IFE CSID device
   Usage: required
   Value type: <string>
   Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid175_200",
-              "qcom,csid480", "qcom,csid-lite170", "qcom,csid-lite175",
-              "qcom,csid-lite480" or "qcom,csid-custom480".
+              "qcom,csid480", "qcom,csid580", "qcom,csid-lite170", "qcom,csid-lite175",
+              "qcom,csid-lite480" or "qcom,csid-custom480",
+              "qcom,csid-lite580" or "qcom,csid-custom580".
 
 - cell-index
   Usage: required
@@ -89,7 +90,7 @@ Example:
 
 	qcom,csid0@acb3000 {
 		cell-index = <0>;
-		compatible = "qcom,csid480";
+		compatible = "qcom,csid580";
 		reg = <0xacb3000 0x1000>;
 		reg-names = "csid";
 		interrupts = <0 464 0>;
diff --git a/bindings/msm-cam-smmu.txt b/bindings/msm-cam-smmu.txt
index eca2bd82ec79..326325c225af 100644
--- a/bindings/msm-cam-smmu.txt
+++ b/bindings/msm-cam-smmu.txt
@@ -96,7 +96,7 @@ Third Level Node - CAM SMMU memory map device
   Definition: Should specify IOVA granularity for shared memory region.
 
 Example:
-	qcom,cam_smmu@0 {
+	qcom,cam_smmu {
 		compatible = "qcom,msm-cam-smmu";
 
 		msm_cam_smmu_icp {
diff --git a/bindings/msm-cam-vfe.txt b/bindings/msm-cam-vfe.txt
index 2866d67cf5e2..b6f030c85880 100644
--- a/bindings/msm-cam-vfe.txt
+++ b/bindings/msm-cam-vfe.txt
@@ -17,8 +17,9 @@ Required properties:
   Usage: required
   Value type: <string>
   Definition: Should specify the compatibility string for matching the
-	driver. e.g. "qcom,vfe480", "qcom,vfe175", "qcom,vfe170", "qcom,vfe175_130",
-	"qcom,vfe-lite480", "qcom,vfe-lite175", "qcom,vfe-lite175_130", "qcom,vfe-lite170".
+	driver. e.g. "qcom,vfe580", "qcom,vfe480", "qcom,vfe175", "qcom,vfe170",
+	"qcom,vfe175_130", "qcom,vfe-lite580", "qcom,vfe-lite480",
+	"qcom,vfe-lite175", "qcom,vfe-lite175_130", "qcom,vfe-lite170".
 
 - cell-index
   Usage: required
@@ -116,7 +117,7 @@ Optional properties:
 Example:
 	qcom,vfe0@acaf000 {
 		cell-index = <0>;
-		compatible = "qcom,vfe480";
+		compatible = "qcom,vfe580";
 		reg-names = "ife";
 		reg = <0xacaf000 0x4000>;
 		interrupts = <0 465 0>;
diff --git a/bindings/msm-camera-flash.txt b/bindings/msm-camera-flash.txt
index ab81329df08e..a44753c5e522 100644
--- a/bindings/msm-camera-flash.txt
+++ b/bindings/msm-camera-flash.txt
@@ -107,7 +107,7 @@ First Level Node - CAM FLASH device
 
 Example:
 
-led_flash_rear: qcom,camera-flash@0 {
+led_flash_rear: qcom,camera-flash0 {
 		reg = <0x00 0x00>;
 		cell-index = <0>;
 		compatible = "qcom,camera-flash";