a3cde14f5a
Instead of using off-the-tree .dts files for ARC boards we're switching to use in-tree ones. And for that to work properly we apply upstream patch that adds currently missing "model" property. Upstream patch and discussion could be found here: http://lists.infradead.org/pipermail/linux-snps-arc/2016-August/001394.html Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Jonas Gorski <jonas.gorski@gmail.com> Cc: John Crispin <john@phrozen.org>
192 lines
5.8 KiB
Diff
192 lines
5.8 KiB
Diff
From f1e53ac0a99e3754465bd87ae1a6fdbfb8340d15 Mon Sep 17 00:00:00 2001
|
|
From: Alexey Brodkin <abrodkin@synopsys.com>
|
|
Date: Mon, 15 Aug 2016 14:42:44 +0300
|
|
Subject: [PATCH] arc: Add "model" properly in device tree description of all
|
|
boards
|
|
|
|
As it was discussed quite some time ago (see
|
|
https://lkml.org/lkml/2015/11/5/862) it's a good practice to add
|
|
"model" property in .dts. Moreover as per ePAPR "model" property is
|
|
required and should look like "manufacturer,model" so we do here.
|
|
|
|
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
|
Cc: Vineet Gupta <vgupta@synopsys.com>
|
|
Cc: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Cc: Arnd Bergmann <arnd@arndb.de>
|
|
Cc: Rob Herring <robh@kernel.org>
|
|
Cc: Christian Ruppert <christian.ruppert@alitech.com>
|
|
---
|
|
arch/arc/boot/dts/abilis_tb100_dvk.dts | 1 +
|
|
arch/arc/boot/dts/abilis_tb101_dvk.dts | 1 +
|
|
arch/arc/boot/dts/axs101.dts | 1 +
|
|
arch/arc/boot/dts/axs103.dts | 1 +
|
|
arch/arc/boot/dts/axs103_idu.dts | 1 +
|
|
arch/arc/boot/dts/nsim_700.dts | 1 +
|
|
arch/arc/boot/dts/nsim_hs.dts | 1 +
|
|
arch/arc/boot/dts/nsim_hs_idu.dts | 1 +
|
|
arch/arc/boot/dts/nsimosci.dts | 1 +
|
|
arch/arc/boot/dts/nsimosci_hs.dts | 1 +
|
|
arch/arc/boot/dts/nsimosci_hs_idu.dts | 1 +
|
|
arch/arc/boot/dts/vdk_hs38.dts | 1 +
|
|
arch/arc/boot/dts/vdk_hs38_smp.dts | 1 +
|
|
13 files changed, 13 insertions(+)
|
|
|
|
diff --git a/arch/arc/boot/dts/abilis_tb100_dvk.dts b/arch/arc/boot/dts/abilis_tb100_dvk.dts
|
|
index 3dd6ed9..3acf04d 100644
|
|
--- a/arch/arc/boot/dts/abilis_tb100_dvk.dts
|
|
+++ b/arch/arc/boot/dts/abilis_tb100_dvk.dts
|
|
@@ -24,6 +24,7 @@
|
|
/include/ "abilis_tb100.dtsi"
|
|
|
|
/ {
|
|
+ model = "abilis,tb100";
|
|
chosen {
|
|
bootargs = "earlycon=uart8250,mmio32,0xff100000,9600n8 console=ttyS0,9600n8";
|
|
};
|
|
diff --git a/arch/arc/boot/dts/abilis_tb101_dvk.dts b/arch/arc/boot/dts/abilis_tb101_dvk.dts
|
|
index 1cf51c2..37d88c5 100644
|
|
--- a/arch/arc/boot/dts/abilis_tb101_dvk.dts
|
|
+++ b/arch/arc/boot/dts/abilis_tb101_dvk.dts
|
|
@@ -24,6 +24,7 @@
|
|
/include/ "abilis_tb101.dtsi"
|
|
|
|
/ {
|
|
+ model = "abilis,tb101";
|
|
chosen {
|
|
bootargs = "earlycon=uart8250,mmio32,0xff100000,9600n8 console=ttyS0,9600n8";
|
|
};
|
|
diff --git a/arch/arc/boot/dts/axs101.dts b/arch/arc/boot/dts/axs101.dts
|
|
index 3f9b058..d9b9b9d 100644
|
|
--- a/arch/arc/boot/dts/axs101.dts
|
|
+++ b/arch/arc/boot/dts/axs101.dts
|
|
@@ -13,6 +13,7 @@
|
|
/include/ "axs10x_mb.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,axs101";
|
|
compatible = "snps,axs101", "snps,arc-sdp";
|
|
|
|
chosen {
|
|
diff --git a/arch/arc/boot/dts/axs103.dts b/arch/arc/boot/dts/axs103.dts
|
|
index e6d0e31..ec7fb27 100644
|
|
--- a/arch/arc/boot/dts/axs103.dts
|
|
+++ b/arch/arc/boot/dts/axs103.dts
|
|
@@ -16,6 +16,7 @@
|
|
/include/ "axs10x_mb.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,axs103";
|
|
compatible = "snps,axs103", "snps,arc-sdp";
|
|
|
|
chosen {
|
|
diff --git a/arch/arc/boot/dts/axs103_idu.dts b/arch/arc/boot/dts/axs103_idu.dts
|
|
index f999fef..070c297 100644
|
|
--- a/arch/arc/boot/dts/axs103_idu.dts
|
|
+++ b/arch/arc/boot/dts/axs103_idu.dts
|
|
@@ -16,6 +16,7 @@
|
|
/include/ "axs10x_mb.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,axs103-smp";
|
|
compatible = "snps,axs103", "snps,arc-sdp";
|
|
|
|
chosen {
|
|
diff --git a/arch/arc/boot/dts/nsim_700.dts b/arch/arc/boot/dts/nsim_700.dts
|
|
index 105a001..97a9a91 100644
|
|
--- a/arch/arc/boot/dts/nsim_700.dts
|
|
+++ b/arch/arc/boot/dts/nsim_700.dts
|
|
@@ -10,6 +10,7 @@
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,nsim";
|
|
compatible = "snps,nsim";
|
|
clock-frequency = <80000000>; /* 80 MHZ */
|
|
#address-cells = <1>;
|
|
diff --git a/arch/arc/boot/dts/nsim_hs.dts b/arch/arc/boot/dts/nsim_hs.dts
|
|
index fc81879..1d47b14 100644
|
|
--- a/arch/arc/boot/dts/nsim_hs.dts
|
|
+++ b/arch/arc/boot/dts/nsim_hs.dts
|
|
@@ -10,6 +10,7 @@
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,nsim_hs";
|
|
compatible = "snps,nsim_hs";
|
|
#address-cells = <2>;
|
|
#size-cells = <2>;
|
|
diff --git a/arch/arc/boot/dts/nsim_hs_idu.dts b/arch/arc/boot/dts/nsim_hs_idu.dts
|
|
index 46ab319..b3a69a8 100644
|
|
--- a/arch/arc/boot/dts/nsim_hs_idu.dts
|
|
+++ b/arch/arc/boot/dts/nsim_hs_idu.dts
|
|
@@ -10,6 +10,7 @@
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,nsim_hs-smp";
|
|
compatible = "snps,nsim_hs";
|
|
interrupt-parent = <&core_intc>;
|
|
|
|
diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts
|
|
index 1c169dc..80f3c33 100644
|
|
--- a/arch/arc/boot/dts/nsimosci.dts
|
|
+++ b/arch/arc/boot/dts/nsimosci.dts
|
|
@@ -10,6 +10,7 @@
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,nsimosci";
|
|
compatible = "snps,nsimosci";
|
|
clock-frequency = <20000000>; /* 20 MHZ */
|
|
#address-cells = <1>;
|
|
diff --git a/arch/arc/boot/dts/nsimosci_hs.dts b/arch/arc/boot/dts/nsimosci_hs.dts
|
|
index d64a96f..f680f1e 100644
|
|
--- a/arch/arc/boot/dts/nsimosci_hs.dts
|
|
+++ b/arch/arc/boot/dts/nsimosci_hs.dts
|
|
@@ -10,6 +10,7 @@
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,nsimosci_hs";
|
|
compatible = "snps,nsimosci_hs";
|
|
clock-frequency = <20000000>; /* 20 MHZ */
|
|
#address-cells = <1>;
|
|
diff --git a/arch/arc/boot/dts/nsimosci_hs_idu.dts b/arch/arc/boot/dts/nsimosci_hs_idu.dts
|
|
index f6bf0ca..6e46b11 100644
|
|
--- a/arch/arc/boot/dts/nsimosci_hs_idu.dts
|
|
+++ b/arch/arc/boot/dts/nsimosci_hs_idu.dts
|
|
@@ -10,6 +10,7 @@
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,nsimosci_hs-smp";
|
|
compatible = "snps,nsimosci_hs";
|
|
clock-frequency = <5000000>; /* 5 MHZ */
|
|
#address-cells = <1>;
|
|
diff --git a/arch/arc/boot/dts/vdk_hs38.dts b/arch/arc/boot/dts/vdk_hs38.dts
|
|
index 5d803dd..3c51103 100644
|
|
--- a/arch/arc/boot/dts/vdk_hs38.dts
|
|
+++ b/arch/arc/boot/dts/vdk_hs38.dts
|
|
@@ -13,6 +13,7 @@
|
|
/include/ "vdk_axs10x_mb.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,vdk_archs";
|
|
compatible = "snps,axs103";
|
|
|
|
chosen {
|
|
diff --git a/arch/arc/boot/dts/vdk_hs38_smp.dts b/arch/arc/boot/dts/vdk_hs38_smp.dts
|
|
index 031a5bc..0054684 100644
|
|
--- a/arch/arc/boot/dts/vdk_hs38_smp.dts
|
|
+++ b/arch/arc/boot/dts/vdk_hs38_smp.dts
|
|
@@ -13,6 +13,7 @@
|
|
/include/ "vdk_axs10x_mb.dtsi"
|
|
|
|
/ {
|
|
+ model = "snps,vdk_archs-smp";
|
|
compatible = "snps,axs103";
|
|
|
|
chosen {
|
|
--
|
|
2.7.4
|
|
|