ARM: tegra: colibri_t30: annotate uarts and move compatible to board

Annotate UARTs and move the serial UART "nvidia,tegra30-hsuart"
compatible definitions from the carrier board to the module level device
trees. One could still override this in a custom carrier board device
tree if required.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
index 1c057b2..682ea4f 100644 (file)
--- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
@@ -33,17 +33,18 @@
                };
        };
 
+       /* Colibri UART-A */
        serial@70006000 {
                status = "okay";
        };
 
+       /* Colibri UART-C */
        serial@70006040 {
-               compatible = "nvidia,tegra30-hsuart";
                status = "okay";
        };
 
+       /* Colibri UART-B */
        serial@70006300 {
-               compatible = "nvidia,tegra30-hsuart";
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index dc54eb7..a9b9db0 100644 (file)
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -213,6 +213,14 @@
                };
        };
 
+       serial@70006040 {
+               compatible = "nvidia,tegra30-hsuart";
+       };
+
+       serial@70006300 {
+               compatible = "nvidia,tegra30-hsuart";
+       };
+
        hdmiddc: i2c@7000c700 {
                clock-frequency = <10000>;
        };