Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / rk3066a.dtsi

diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index e498c362b9e708daa96460bc7b5147bb21808c9c..f50481fd8e5cdc5de9e05a035fb75d2b2bd8bbaf 100644 (file)
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -687,6 +687,7 @@
 };
 
 &uart0 {
+       compatible = "rockchip,rk3066-uart", "snps,dw-apb-uart";
        dmas = <&dmac1_s 0>, <&dmac1_s 1>;
        dma-names = "tx", "rx";
        pinctrl-names = "default";
@@ -694,6 +695,7 @@
 };
 
 &uart1 {
+       compatible = "rockchip,rk3066-uart", "snps,dw-apb-uart";
        dmas = <&dmac1_s 2>, <&dmac1_s 3>;
        dma-names = "tx", "rx";
        pinctrl-names = "default";
@@ -701,6 +703,7 @@
 };
 
 &uart2 {
+       compatible = "rockchip,rk3066-uart", "snps,dw-apb-uart";
        dmas = <&dmac2 6>, <&dmac2 7>;
        dma-names = "tx", "rx";
        pinctrl-names = "default";
@@ -708,6 +711,7 @@
 };
 
 &uart3 {
+       compatible = "rockchip,rk3066-uart", "snps,dw-apb-uart";
        dmas = <&dmac2 8>, <&dmac2 9>;
        dma-names = "tx", "rx";
        pinctrl-names = "default";