Merge branch 'for-linville' of git://github.com/kvalo/ath

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / omap2.dtsi

diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index 5377ddf83bf8f99aebb33d2e5019e870ee5f2e18..22f35ea142c199082afdd8ba626bd7c5e0b6cd54 100644 (file)
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -271,5 +271,36 @@
                        ti,hwmods = "timer12";
                        ti,timer-pwm;
                };
+
+               dss: dss@48050000 {
+                       compatible = "ti,omap2-dss";
+                       reg = <0x48050000 0x400>;
+                       status = "disabled";
+                       ti,hwmods = "dss_core";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       dispc@48050400 {
+                               compatible = "ti,omap2-dispc";
+                               reg = <0x48050400 0x400>;
+                               interrupts = <25>;
+                               ti,hwmods = "dss_dispc";
+                       };
+
+                       rfbi: encoder@48050800 {
+                               compatible = "ti,omap2-rfbi";
+                               reg = <0x48050800 0x400>;
+                               status = "disabled";
+                               ti,hwmods = "dss_rfbi";
+                       };
+
+                       venc: encoder@48050c00 {
+                               compatible = "ti,omap2-venc";
+                               reg = <0x48050c00 0x400>;
+                               status = "disabled";
+                               ti,hwmods = "dss_venc";
+                       };
+               };
        };
 };