Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / am335x-evm.dts

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 7e6c64ed966d66b4bfe365db5f85186a88b49a24..28ae040e7c3d90b9094afc8c6543cf4749ffe5b0 100644 (file)
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -260,6 +260,12 @@
                >;
        };
 
+       mmc1_pins: pinmux_mmc1_pins {
+               pinctrl-single,pins = <
+                       0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
+               >;
+       };
+
        lcd_pins_s0: lcd_pins_s0 {
                pinctrl-single,pins = <
                        0x20 0x01       /* gpmc_ad8.lcd_data16, OUTPUT | MODE1 */
@@ -434,9 +440,9 @@
        ranges = <0 0 0x08000000 0x10000000>;   /* CS0: NAND */
        nand@0,0 {
                reg = <0 0 0>; /* CS0, offset 0 */
-               nand-bus-width = <8>;
                ti,nand-ecc-opt = "bch8";
-               gpmc,device-nand = "true";
+               ti,elm-id = <&elm>;
+               nand-bus-width = <8>;
                gpmc,device-width = <1>;
                gpmc,sync-clk-ps = <0>;
                gpmc,cs-on-ns = <0>;
@@ -460,50 +466,51 @@
                gpmc,wait-monitoring-ns = <0>;
                gpmc,wr-access-ns = <40>;
                gpmc,wr-data-mux-bus-ns = <0>;
-
+               /* MTD partition table */
+               /* All SPL-* partitions are sized to minimal length
+                * which can be independently programmable. For
+                * NAND flash this is equal to size of erase-block */
                #address-cells = <1>;
                #size-cells = <1>;
-               elm_id = <&elm>;
-
-               /* MTD partition table */
                partition@0 {
-                       label = "SPL1";
+                       label = "NAND.SPL";
                        reg = <0x00000000 0x000020000>;
                };
-
                partition@1 {
-                       label = "SPL2";
+                       label = "NAND.SPL.backup1";
                        reg = <0x00020000 0x00020000>;
                };
-
                partition@2 {
-                       label = "SPL3";
+                       label = "NAND.SPL.backup2";
                        reg = <0x00040000 0x00020000>;
                };
-
                partition@3 {
-                       label = "SPL4";
+                       label = "NAND.SPL.backup3";
                        reg = <0x00060000 0x00020000>;
                };
-
                partition@4 {
-                       label = "U-boot";
-                       reg = <0x00080000 0x001e0000>;
+                       label = "NAND.u-boot-spl";
+                       reg = <0x00080000 0x00040000>;
                };
-
                partition@5 {
-                       label = "environment";
-                       reg = <0x00260000 0x00020000>;
+                       label = "NAND.u-boot";
+                       reg = <0x000C0000 0x00100000>;
                };
-
                partition@6 {
-                       label = "Kernel";
-                       reg = <0x00280000 0x00500000>;
+                       label = "NAND.u-boot-env";
+                       reg = <0x001C0000 0x00020000>;
                };
-
                partition@7 {
-                       label = "File-System";
-                       reg = <0x00780000 0x0F880000>;
+                       label = "NAND.u-boot-env.backup1";
+                       reg = <0x001E0000 0x00020000>;
+               };
+               partition@8 {
+                       label = "NAND.kernel";
+                       reg = <0x00200000 0x00800000>;
+               };
+               partition@9 {
+                       label = "NAND.file-system";
+                       reg = <0x00A00000 0x0F600000>;
                };
        };
 };
@@ -643,6 +650,9 @@
        status = "okay";
        vmmc-supply = <&vmmc_reg>;
        bus-width = <4>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&mmc1_pins>;
+       cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
 };
 
 &sham {