summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-09-02 13:08:58 +0300
committerThierry Reding <treding@nvidia.com>2018-09-26 17:55:16 +0300
commita7867ac8a11465be32324d896d81426f534b9a61 (patch)
tree3ac37e84e4967ea5cc802b76799b9f32c759a80d
parent4f135281b32362a672fee7ddb5a356e600fb9ce4 (diff)
downloadlinux-a7867ac8a11465be32324d896d81426f534b9a61.tar.xz
ARM: tegra: colibri_t20: iris: simplify model and compatible properties
Simplify model and compatible by dropping the 256/512 MB from the model, -512 from the compatible and rename that property from toradex,iris to toradex,colibri_t20-iris to be more in-line with all our other device trees. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--Documentation/devicetree/bindings/arm/tegra.txt2
-rw-r--r--arch/arm/boot/dts/tegra20-colibri-iris.dts3
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/tegra.txt b/Documentation/devicetree/bindings/arm/tegra.txt
index 5e1b0b30ece2..0909122a2bee 100644
--- a/Documentation/devicetree/bindings/arm/tegra.txt
+++ b/Documentation/devicetree/bindings/arm/tegra.txt
@@ -54,9 +54,9 @@ board-specific compatible values:
toradex,apalis-tk1-v1.2
toradex,apalis-tk1-v1.2-eval
toradex,colibri_t20
+ toradex,colibri_t20-iris
toradex,colibri_t30
toradex,colibri_t30-eval-v3
- toradex,iris
Trusted Foundations
-------------------------------------------
diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts
index cd47ac5b528f..dbdf596dd151 100644
--- a/arch/arm/boot/dts/tegra20-colibri-iris.dts
+++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts
@@ -6,7 +6,8 @@
/ {
model = "Toradex Colibri T20 on Iris";
- compatible = "toradex,iris", "toradex,colibri_t20", "nvidia,tegra20";
+ compatible = "toradex,colibri_t20-iris", "toradex,colibri_t20",
+ "nvidia,tegra20";
aliases {
rtc0 = "/i2c@7000c000/rtc@68";