ARM: tegra: colibri_t20: simplify model and compatible properties

Simplify model and compatible by dropping the 256/512 MB from the model
and -512 from the compatible properties to be more in-line with all our
other device trees.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Rob Herring <robh@kernel.org>
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 1c90cb32da1920504b017f9f94e7f02ab0c67959..5e1b0b30ece2f112ccd8423c43a642de5361f568 100644 (file)
--- a/Documentation/devicetree/bindings/arm/tegra.txt
+++ b/Documentation/devicetree/bindings/arm/tegra.txt
@@ -53,7 +53,7 @@ board-specific compatible values:
   toradex,apalis-tk1-eval
   toradex,apalis-tk1-v1.2
   toradex,apalis-tk1-v1.2-eval
-  toradex,colibri_t20-512
+  toradex,colibri_t20
   toradex,colibri_t30
   toradex,colibri_t30-eval-v3
   toradex,iris

diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts
index 1583d5118302509d95fcc8fcd992a85c0ed49152..cd47ac5b528ff81916b8a3518872c2333c81328c 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri-iris.dts
+++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts
@@ -5,8 +5,8 @@
 #include "tegra20-colibri.dtsi"
 
 / {
-       model = "Toradex Colibri T20 256/512 MB on Iris";
-       compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20";
+       model = "Toradex Colibri T20 on Iris";
+       compatible = "toradex,iris", "toradex,colibri_t20", "nvidia,tegra20";
 
        aliases {
                rtc0 = "/i2c@7000c000/rtc@68";

diff --git a/arch/arm/boot/dts/tegra20-colibri.dtsi b/arch/arm/boot/dts/tegra20-colibri.dtsi
index ea785f65c89fc0fa1d927678a58347e84e10caab..53e06f31dbead376925d467eaef1dc60fad3c70b 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri.dtsi
@@ -8,8 +8,8 @@
  * Colibri T20 512MB IT V1.2A
  */
 / {
-       model = "Toradex Colibri T20 256/512 MB";
-       compatible = "toradex,colibri_t20-512", "nvidia,tegra20";
+       model = "Toradex Colibri T20";
+       compatible = "toradex,colibri_t20", "nvidia,tegra20";
 
        memory@0 {
                /*