Merge "dts: ipq6018: remove model and compatible strings"
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 937c825..9358328 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -67,7 +67,6 @@
dtb-$(CONFIG_ARCH_IPQ6018) += ipq6018-cp01-c1.dtb \
ipq6018-cp02-c1.dtb \
ipq6018-cp03-c1.dtb \
- ipq6018-emulation.dtb \
ipq6018-db-cp01.dtb \
ipq6018-db-cp02.dtb
diff --git a/arch/arm/dts/ipq6018-cp01-c1.dts b/arch/arm/dts/ipq6018-cp01-c1.dts
index c2e1e7e..d88d22d 100644
--- a/arch/arm/dts/ipq6018-cp01-c1.dts
+++ b/arch/arm/dts/ipq6018-cp01-c1.dts
@@ -14,8 +14,6 @@
/dts-v1/;
#include "ipq6018-soc.dtsi"
/ {
- model ="QCA, IPQ6018-CP01-C1";
- compatible = "qca,ipq6018", "qca,ipq6018-cp01-c1";
machid = <0x8030000>;
config_name = "config@cp01-c1";
diff --git a/arch/arm/dts/ipq6018-cp02-c1.dts b/arch/arm/dts/ipq6018-cp02-c1.dts
index b4fba66..4822dea 100644
--- a/arch/arm/dts/ipq6018-cp02-c1.dts
+++ b/arch/arm/dts/ipq6018-cp02-c1.dts
@@ -14,8 +14,6 @@
/dts-v1/;
#include "ipq6018-soc.dtsi"
/ {
- model ="QCA, IPQ6018-CP02-c1";
- compatible = "qca,ipq6018", "qca,ipq6018-cp02-c1";
machid = <0x8030100>;
config_name = "config@cp02-c1";
diff --git a/arch/arm/dts/ipq6018-cp03-c1.dts b/arch/arm/dts/ipq6018-cp03-c1.dts
index 7f3ef3b..fa2cc86 100644
--- a/arch/arm/dts/ipq6018-cp03-c1.dts
+++ b/arch/arm/dts/ipq6018-cp03-c1.dts
@@ -14,8 +14,6 @@
/dts-v1/;
#include "ipq6018-soc.dtsi"
/ {
- model ="QCA, IPQ6018-CP03-C1";
- compatible = "qca,ipq6018", "qca,ipq6018-cp03-c1";
machid = <0x8030200>;
config_name = "config@cp03-c1";
diff --git a/arch/arm/dts/ipq6018-db-cp01.dts b/arch/arm/dts/ipq6018-db-cp01.dts
index 8e82465..5480528 100644
--- a/arch/arm/dts/ipq6018-db-cp01.dts
+++ b/arch/arm/dts/ipq6018-db-cp01.dts
@@ -14,8 +14,6 @@
/dts-v1/;
#include "ipq6018-soc.dtsi"
/ {
- model ="QCA, IPQ6018-DB.CP01";
- compatible = "qca,ipq6018", "qca,ipq6018-db-cp01";
machid = <0x1030000>;
config_name = "config@db-cp01";
diff --git a/arch/arm/dts/ipq6018-db-cp02.dts b/arch/arm/dts/ipq6018-db-cp02.dts
index 11ac915..bf5b68d 100644
--- a/arch/arm/dts/ipq6018-db-cp02.dts
+++ b/arch/arm/dts/ipq6018-db-cp02.dts
@@ -14,8 +14,6 @@
/dts-v1/;
#include "ipq6018-soc.dtsi"
/ {
- model ="QCA, IPQ6018-DB.CP02";
- compatible = "qca,ipq6018", "qca,ipq6018-db-cp02";
machid = <0x1030100>;
config_name = "config@db-cp02";