diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 889b882d6c..b6d3748a97 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -61,7 +61,7 @@ dtb-$(CONFIG_ARCH_IPQ40xx) += ipq40xx-dk01-c1.dtb \
 		ipq40xx-dk01-s1.dtb \
 		ipq40xx-dk06-c1.dtb
 
-dtb-$(CONFIG_ARCH_IPQ6018) += ipq6018-cp01.dtb \
+dtb-$(CONFIG_ARCH_IPQ6018) += ipq6018-cp01-c1.dtb \
 		ipq6018-emulation.dtb
 
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
diff --git a/arch/arm/dts/ipq6018-cp01.dts b/arch/arm/dts/ipq6018-cp01-c1.dts
similarity index 63%
rename from arch/arm/dts/ipq6018-cp01.dts
rename to arch/arm/dts/ipq6018-cp01-c1.dts
index 9e9828bbee..4628b24feb 100644
--- a/arch/arm/dts/ipq6018-cp01.dts
+++ b/arch/arm/dts/ipq6018-cp01-c1.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -14,12 +14,15 @@
 /dts-v1/;
 #include "ipq6018-soc.dtsi"
 / {
-	model ="QCA, IPQ6018-CP01";
-	compatible = "qca,ipq6018", "qca,ipq6018-cp01";
-	machid = <0x08010001>;
+	model ="QCA, IPQ6018-CP01-C1";
+	compatible = "qca,ipq6018", "qca,ipq6018-cp01-c1";
+	machid = <0x8030000>;
+	config_name = "config@cp01-c1";
 
 	aliases {
-		console = "/serial@78B3000";
+		console = "/serial@78B1000";
+		pci0 = "/pci@20000000";
+		usb0 = "/xhci@8a00000";
+		usb1 = "/xhci@7000000";
 	};
 };
-
diff --git a/arch/arm/dts/ipq6018-soc.dtsi b/arch/arm/dts/ipq6018-soc.dtsi
index 3ce72ee99d..bc49f861a7 100644
--- a/arch/arm/dts/ipq6018-soc.dtsi
+++ b/arch/arm/dts/ipq6018-soc.dtsi
@@ -16,22 +16,22 @@
 
 / {
 
-	serial@78B3000 {
+	serial@78B1000 {
 		compatible = "qca,ipq-uartdm";
-		reg = <0x78B3000 0x200>;
+		reg = <0x78B1000 0x200>;
 		id = <4>;
 		bit_rate = <0xee>;
 		serial_gpio {
 			gpio1 {
-				gpio = <23>;
-				func = <2>;
+				gpio = <44>;
+				func = <1>;
 				pull = <GPIO_NO_PULL>;
 				oe = <GPIO_OE_ENABLE>;
 			};
 
 			gpio2 {
-				gpio = <24>;
-				func = <2>;
+				gpio = <45>;
+				func = <1>;
 				pull = <GPIO_NO_PULL>;
 				oe = <GPIO_OE_ENABLE>;
 			};