2 files changed, 65 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/k2hk-evm.dts b/arch/arm/boot/dts/k2hk-evm.dts
index d8cc99af51e8..1a1335b4a0b1 100644
--- a/arch/arm/boot/dts/k2hk-evm.dts
+++ b/arch/arm/boot/dts/k2hk-evm.dts
@@ -86,3 +86,55 @@
 &usb {
         status = "okay";
 };
+
+&aemif {
+        cs0 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                clock-ranges;
+                ranges;
+
+                ti,cs-chipselect = <0>;
+                /* all timings in nanoseconds */
+                ti,cs-min-turnaround-ns = <12>;
+                ti,cs-read-hold-ns = <6>;
+                ti,cs-read-strobe-ns = <23>;
+                ti,cs-read-setup-ns = <9>;
+                ti,cs-write-hold-ns = <8>;
+                ti,cs-write-strobe-ns = <23>;
+                ti,cs-write-setup-ns = <8>;
+
+                nand@0,0 {
+                        compatible = "ti,keystone-nand","ti,davinci-nand";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0 0 0x4000000
+                               1 0 0x0000100>;
+
+                        ti,davinci-chipselect = <0>;
+                        ti,davinci-mask-ale = <0x2000>;
+                        ti,davinci-mask-cle = <0x4000>;
+                        ti,davinci-mask-chipsel = <0>;
+                        nand-ecc-mode = "hw";
+                        ti,davinci-ecc-bits = <4>;
+                        nand-on-flash-bbt;
+
+                        partition@0 {
+                                label = "u-boot";
+                                reg = <0x0 0x100000>;
+                                read-only;
+                        };
+
+                        partition@100000 {
+                                label = "params";
+                                reg = <0x100000 0x80000>;
+                                read-only;
+                        };
+
+                        partition@180000 {
+                                label = "ubifs";
+                                reg = <0x180000 0x7E80000>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 1992351e09fa..90823eb90c1b 100644
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -235,5 +235,18 @@
                         ti,ngpio = <32>;
                         ti,davinci-gpio-unbanked = <32>;
                 };
+
+                aemif: aemif@21000A00 {
+                        compatible = "ti,keystone-aemif", "ti,davinci-aemif";
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+                        clocks = <&clkaemif>;
+                        clock-names = "aemif";
+                        clock-ranges;
+
+                        reg = <0x21000A00 0x00000100>;
+                        ranges = <0 0 0x30000000 0x10000000
+                                  1 0 0x21000A00 0x00000100>;
+                };
         };
 };