Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

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

diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index 15204e44161da6c98e8528488c8bf2be3a46ca6a..cd6ad072e72c17ebe287b72d3f26657a402a97ba 100644 (file)
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -86,14 +86,14 @@
                        };
 
                        uart_A: serial@84c0 {
-                               compatible = "amlogic,meson-uart";
+                               compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
                                reg = <0x84c0 0x18>;
                                interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
                                status = "disabled";
                        };
 
                        uart_B: serial@84dc {
-                               compatible = "amlogic,meson-uart";
+                               compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
                                reg = <0x84dc 0x18>;
                                interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
                                status = "disabled";
@@ -108,6 +108,20 @@
                                status = "disabled";
                        };
 
+                       pwm_ab: pwm@8550 {
+                               compatible = "amlogic,meson-pwm";
+                               reg = <0x8550 0x10>;
+                               #pwm-cells = <3>;
+                               status = "disabled";
+                       };
+
+                       pwm_cd: pwm@8650 {
+                               compatible = "amlogic,meson-pwm";
+                               reg = <0x8650 0x10>;
+                               #pwm-cells = <3>;
+                               status = "disabled";
+                       };
+
                        saradc: adc@8680 {
                                compatible = "amlogic,meson-saradc";
                                reg = <0x8680 0x34>;
@@ -117,7 +131,7 @@
                        };
 
                        uart_C: serial@8700 {
-                               compatible = "amlogic,meson-uart";
+                               compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
                                reg = <0x8700 0x18>;
                                interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
                                status = "disabled";
@@ -182,7 +196,7 @@
                        };
 
                        uart_AO: serial@4c0 {
-                               compatible = "amlogic,meson-uart";
+                               compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart";
                                reg = <0x4c0 0x18>;
                                interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
                                status = "disabled";
@@ -230,5 +244,13 @@
                        interrupt-names = "macirq";
                        status = "disabled";
                };
+
+               ahb_sram: sram@d9000000 {
+                       compatible = "mmio-sram";
+                       reg = <0xd9000000 0x20000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0xd9000000 0x20000>;
+               };
        };
 }; /* end of / */