Merge cpufreq fixes going into v4.6.

[karo-tx-linux.git] / arch / arm / boot / dts / dm814x.dtsi

diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi
index a25cd51e39ab0d8d43f845617b2e2ef69786610e..4a6ce8c8bf8f857ca09feba084439602bc44b8ff 100644 (file)
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -305,6 +305,13 @@
                                reg = <0x60000 0x1000>;
                        };
 
+                       rtc: rtc@c0000 {
+                               compatible = "ti,am3352-rtc", "ti,da830-rtc";
+                               reg = <0xc0000 0x1000>;
+                               interrupts = <75 76>;
+                               ti,hwmods = "rtc";
+                       };
+
                        mmc2: mmc@1d8000 {
                                compatible = "ti,omap4-hsmmc";
                                ti,hwmods = "mmc2";
@@ -548,6 +555,20 @@
                                reg-names = "gmii-sel";
                        };
                };
+
+               gpmc: gpmc@50000000 {
+                       compatible = "ti,am3352-gpmc";
+                       ti,hwmods = "gpmc";
+                       ti,no-idle-on-init;
+                       reg = <0x50000000 0x2000>;
+                       interrupts = <100>;
+                       gpmc,num-cs = <7>;
+                       gpmc,num-waitpins = <2>;
+                       #address-cells = <2>;
+                       #size-cells = <1>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
        };
 };