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>

diff --git a/Documentation/devicetree/bindings/arm/tegra.txt b/Documentation/devicetree/bindings/arm/tegra.txt
index 5e1b0b3..0909122 100644 (file)
--- 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 cd47ac5..dbdf596 100644 (file)
--- 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";