ARM: dts: dra7-evm: Fix comment about NAND configuration

[cascardo/linux.git] / arch / arm / boot / dts / dra7-evm.dts

diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index cfc24e5..05c135d 100644 (file)
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -18,7 +18,7 @@
 
        memory {
                device_type = "memory";
-               reg = <0x80000000 0x60000000>; /* 1536 MB */
+               reg = <0x0 0x80000000 0x0 0x60000000>; /* 1536 MB */
        };
 
        evm_3v3_sd: fixedregulator-sd {
@@ -33,6 +33,7 @@
        evm_3v3_sw: fixedregulator-evm_3v3_sw {
                compatible = "regulator-fixed";
                regulator-name = "evm_3v3_sw";
+               vin-supply = <&sysen1>;
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
@@ -64,10 +65,11 @@
                regulator-always-on;
                regulator-boot-on;
                enable-active-high;
+               vin-supply = <&sysen2>;
                gpio = <&gpio7 11 GPIO_ACTIVE_HIGH>;
        };
 
-       sound0: sound@0 {
+       sound0: sound0 {
                compatible = "simple-audio-card";
                simple-audio-card,name = "DRA7xx-EVM";
                simple-audio-card,widgets =
@@ -254,8 +256,9 @@
        nand_flash_x16: nand_flash_x16 {
                /* On DRA7 EVM, GPMC_WPN and NAND_BOOTn comes from DIP switch
                 * So NAND flash requires following switch settings:
-                * SW5.9 (GPMC_WPN) = LOW
-                * SW5.1 (NAND_BOOTn) = HIGH */
+                * SW5.1 (NAND_BOOTn) = ON (LOW)
+                * SW5.9 (GPMC_WPN) = OFF (HIGH)
+                */
                pinctrl-single,pins = <
                        DRA7XX_CORE_IOPAD(0x3400, PIN_INPUT  | MUX_MODE0)       /* gpmc_ad0     */
                        DRA7XX_CORE_IOPAD(0x3404, PIN_INPUT  | MUX_MODE0)       /* gpmc_ad1     */
@@ -523,6 +526,31 @@
                                        regulator-max-microvolt = <3300000>;
                                        regulator-boot-on;
                                };
+
+                               /* REGEN1 is unused */
+
+                               regen2: regen2 {
+                                       /* Needed for PMIC internal resources */
+                                       regulator-name = "regen2";
+                                       regulator-boot-on;
+                                       regulator-always-on;
+                               };
+
+                               /* REGEN3 is unused */
+
+                               sysen1: sysen1 {
+                                       /* PMIC_REGEN_3V3 */
+                                       regulator-name = "sysen1";
+                                       regulator-boot-on;
+                                       regulator-always-on;
+                               };
+
+                               sysen2: sysen2 {
+                                       /* PMIC_REGEN_DDR */
+                                       regulator-name = "sysen2";
+                                       regulator-boot-on;
+                                       regulator-always-on;
+                               };
                        };
                };
        };
@@ -741,9 +769,13 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&nand_flash_x16>;
-       ranges = <0 0 0 0x01000000>;    /* minimum GPMC partition = 16MB */
+       ranges = <0 0 0x08000000 0x01000000>;   /* minimum GPMC partition = 16MB */
        nand@0,0 {
+               compatible = "ti,omap2-nand";
                reg = <0 0 4>;          /* device IO registers */
+               interrupt-parent = <&gpmc>;
+               interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
+                            <1 IRQ_TYPE_NONE>; /* termcount */
                ti,nand-ecc-opt = "bch8";
                ti,elm-id = <&elm>;
                nand-bus-width = <16>;
@@ -766,7 +798,6 @@
                gpmc,bus-turnaround-ns = <0>;
                gpmc,cycle2cycle-delay-ns = <0>;
                gpmc,clk-activation-ns = <0>;
-               gpmc,wait-monitoring-ns = <0>;
                gpmc,wr-data-mux-bus-ns = <0>;
                /* MTD partition table */
                /* All SPL-* partitions are sized to minimal length
@@ -901,6 +932,8 @@
        serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
                1 2 0 0
        >;
+       tx-num-evt = <32>;
+       rx-num-evt = <32>;
 };
 
 &mailbox5 {