ARM: tegra: apalis_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-apalis-eval.dts b/arch/arm/boot/dts/tegra30-apalis-eval.dts
index 14a62b5111ec6d14546f19df646494ad683d6478..cd4e45759ac859b509fc29073fc9f58bfdd1aa38 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra30-apalis-eval.dts
@@ -45,22 +45,23 @@
                };
        };
 
+       /* Apalis UART1 */
        serial@70006000 {
                status = "okay";
        };
 
+       /* Apalis UART2 */
        serial@70006040 {
-               compatible = "nvidia,tegra30-hsuart";
                status = "okay";
        };
 
+       /* Apalis UART3 */
        serial@70006200 {
-               compatible = "nvidia,tegra30-hsuart";
                status = "okay";
        };
 
+       /* Apalis UART4 */
        serial@70006300 {
-               compatible = "nvidia,tegra30-hsuart";
                status = "okay";
        };
 

diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index 3b2e15519e4bf8542af3ce3f749624c9219ebcf9..7e9d1b022982382f1676fb455781bf36c9352875 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -449,6 +449,18 @@
                };
        };
 
+       serial@70006040 {
+               compatible = "nvidia,tegra30-hsuart";
+       };
+
+       serial@70006200 {
+               compatible = "nvidia,tegra30-hsuart";
+       };
+
+       serial@70006300 {
+               compatible = "nvidia,tegra30-hsuart";
+       };
+
        hdmiddc: i2c@7000c700 {
                clock-frequency = <10000>;
        };