Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git...

Add craneboard devices
Add more N900 devices
Add am43x-epos-evm and am437x-gp-evm devices
Add OMAP4 DMM devices

Conflicts:
	arch/arm/boot/dts/am43x-epos-evm.dts
	arch/arm/boot/dts/dra7.dtsi

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am43x-epos-evm.dts
index 15aa70822bdf8af3fe5f403584ec8322d2b992ff,a7d0db10a4f4ee02f7f9d77994e966ccba76cff9..a3a53ce84f1619dfca675c43ea9d699aa44e949f
--- 1/arch/arm/boot/dts/am43x-epos-evm.dts
--- 2/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@@ -80,26 -81,36 +81,57 @@@
                        >;
                };
  
 +              nand_flash_x8: nand_flash_x8 {
 +                      pinctrl-single,pins = <
 +                              0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_a0.SELQSPIorNAND/GPIO */
 +                              0x0  (PIN_INPUT_PULLDOWN | MUX_MODE0)   /* gpmc_ad0.gpmc_ad0 */
 +                              0x4  (PIN_INPUT_PULLDOWN | MUX_MODE0)   /* gpmc_ad1.gpmc_ad1 */
 +                              0x8  (PIN_INPUT_PULLDOWN | MUX_MODE0)   /* gpmc_ad2.gpmc_ad2 */
 +                              0xc  (PIN_INPUT_PULLDOWN | MUX_MODE0)   /* gpmc_ad3.gpmc_ad3 */
 +                              0x10 (PIN_INPUT_PULLDOWN | MUX_MODE0)   /* gpmc_ad4.gpmc_ad4 */
 +                              0x14 (PIN_INPUT_PULLDOWN | MUX_MODE0)   /* gpmc_ad5.gpmc_ad5 */
 +                              0x18 (PIN_INPUT_PULLDOWN | MUX_MODE0)   /* gpmc_ad6.gpmc_ad6 */
 +                              0x1c (PIN_INPUT_PULLDOWN | MUX_MODE0)   /* gpmc_ad7.gpmc_ad7 */
 +                              0x70 (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_wait0.gpmc_wait0 */
 +                              0x74 (PIN_OUTPUT_PULLUP | MUX_MODE7)    /* gpmc_wpn.gpmc_wpn */
 +                              0x7c (PIN_OUTPUT | MUX_MODE0)           /* gpmc_csn0.gpmc_csn0  */
 +                              0x90 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_advn_ale.gpmc_advn_ale */
 +                              0x94 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_oen_ren.gpmc_oen_ren */
 +                              0x98 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_wen.gpmc_wen */
 +                              0x9c (PIN_OUTPUT | MUX_MODE0)           /* gpmc_be0n_cle.gpmc_be0n_cle */
 +                      >;
 +              };
++
+               ecap0_pins: backlight_pins {
+                       pinctrl-single,pins = <
+                               0x164 MUX_MODE0         /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
+                       >;
+               };
+ 
+               i2c2_pins: pinmux_i2c2_pins {
+                       pinctrl-single,pins = <
+                               0x1c0 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE8)    /* i2c2_sda.i2c2_sda */
+                               0x1c4 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE8)    /* i2c2_scl.i2c2_scl */
+                       >;
+               };
+ 
+               spi0_pins: pinmux_spi0_pins {
+                       pinctrl-single,pins = <
+                               0x150 (PIN_INPUT | MUX_MODE0)           /* spi0_clk.spi0_clk */
+                               0x154 (PIN_OUTPUT | MUX_MODE0)           /* spi0_d0.spi0_d0 */
+                               0x158 (PIN_INPUT | MUX_MODE0)           /* spi0_d1.spi0_d1 */
+                               0x15c (PIN_OUTPUT | MUX_MODE0)          /* spi0_cs0.spi0_cs0 */
+                       >;
+               };
+ 
+               spi1_pins: pinmux_spi1_pins {
+                       pinctrl-single,pins = <
+                               0x190 (PIN_INPUT | MUX_MODE3)           /* mcasp0_aclkx.spi1_clk */
+                               0x194 (PIN_OUTPUT | MUX_MODE3)           /* mcasp0_fsx.spi1_d0 */
+                               0x198 (PIN_INPUT | MUX_MODE3)           /* mcasp0_axr0.spi1_d1 */
+                               0x19c (PIN_OUTPUT | MUX_MODE3)          /* mcasp0_ahclkr.spi1_cs0 */
+                       >;
+               };
        };
  
        matrix_keypad: matrix_keypad@0 {
@@@ -206,88 -230,24 +251,110 @@@
        status = "okay";
  };
  
 +&elm {
 +      status = "okay";
 +};
 +
 +&gpmc {
 +      status = "okay";
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&nand_flash_x8>;
 +      ranges = <0 0 0x08000000 0x10000000>;   /* CS0: NAND */
 +      nand@0,0 {
 +              reg = <0 0 0>; /* CS0, offset 0 */
 +              ti,nand-ecc-opt = "bch8";
 +              ti,elm-id = <&elm>;
 +              nand-bus-width = <8>;
 +              gpmc,device-width = <1>;
 +              gpmc,sync-clk-ps = <0>;
 +              gpmc,cs-on-ns = <0>;
 +              gpmc,cs-rd-off-ns = <40>; /* tCEA + tCHZ + 1 */
 +              gpmc,cs-wr-off-ns = <40>;
 +              gpmc,adv-on-ns = <0>;  /* cs-on-ns */
 +              gpmc,adv-rd-off-ns = <25>; /* min( tALH + tALS + 1) */
 +              gpmc,adv-wr-off-ns = <25>; /* min( tALH + tALS + 1) */
 +              gpmc,we-on-ns = <0>;   /* cs-on-ns */
 +              gpmc,we-off-ns = <20>; /* we-on-time + tWP + 2 */
 +              gpmc,oe-on-ns = <3>;  /* cs-on-ns + tRR + 2 */
 +              gpmc,oe-off-ns = <30>; /* oe-on-ns + tRP + 2 */
 +              gpmc,access-ns = <30>; /* tCEA + 4*/
 +              gpmc,rd-cycle-ns = <40>;
 +              gpmc,wr-cycle-ns = <40>;
 +              gpmc,wait-on-read = "true";
 +              gpmc,wait-on-write = "true";
 +              gpmc,bus-turnaround-ns = <0>;
 +              gpmc,cycle2cycle-delay-ns = <0>;
 +              gpmc,clk-activation-ns = <0>;
 +              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>;
 +              partition@0 {
 +                      label = "NAND.SPL";
 +                      reg = <0x00000000 0x00040000>;
 +              };
 +              partition@1 {
 +                      label = "NAND.SPL.backup1";
 +                      reg = <0x00040000 0x00040000>;
 +              };
 +              partition@2 {
 +                      label = "NAND.SPL.backup2";
 +                      reg = <0x00080000 0x00040000>;
 +              };
 +              partition@3 {
 +                      label = "NAND.SPL.backup3";
 +                      reg = <0x000C0000 0x00040000>;
 +              };
 +              partition@4 {
 +                      label = "NAND.u-boot-spl-os";
 +                      reg = <0x00100000 0x00080000>;
 +              };
 +              partition@5 {
 +                      label = "NAND.u-boot";
 +                      reg = <0x00180000 0x00100000>;
 +              };
 +              partition@6 {
 +                      label = "NAND.u-boot-env";
 +                      reg = <0x00280000 0x00040000>;
 +              };
 +              partition@7 {
 +                      label = "NAND.u-boot-env.backup1";
 +                      reg = <0x002C0000 0x00040000>;
 +              };
 +              partition@8 {
 +                      label = "NAND.kernel";
 +                      reg = <0x00300000 0x00700000>;
 +              };
 +              partition@9 {
 +                      label = "NAND.file-system";
 +                      reg = <0x00800000 0x1F600000>;
 +              };
 +      };
 +};
++
+ &epwmss0 {
+       status = "okay";
+ };
+ 
+ &ecap0 {
+               status = "okay";
+               pinctrl-names = "default";
+               pinctrl-0 = <&ecap0_pins>;
+ };
+ 
+ &spi0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi0_pins>;
+       status = "okay";
+ };
+ 
+ &spi1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi1_pins>;
+       status = "okay";
+ };

diff --cc arch/arm/boot/dts/dra7.dtsi
index 17f3b5adb7c20b6dd1344840122202b312c80f9c,6e89630f80227e70d02be0359222f09deca9e39d..499974a50e27cbd70ddf25ffbcdc90bf033f11ab
--- 1/arch/arm/boot/dts/dra7.dtsi
--- 2/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@@ -469,13 -464,13 +469,20 @@@
                        ti,hwmods = "wd_timer2";
                };
  
 +              hwspinlock: spinlock@4a0f6000 {
 +                      compatible = "ti,omap4-hwspinlock";
 +                      reg = <0x4a0f6000 0x1000>;
 +                      ti,hwmods = "spinlock";
 +                      #hwlock-cells = <1>;
 +              };
 +
+               dmm@4e000000 {
+                       compatible = "ti,omap5-dmm";
+                       reg = <0x4e000000 0x800>;
+                       interrupts = <0 113 0x4>;
+                       ti,hwmods = "dmm";
+               };
+ 
                i2c1: i2c@48070000 {
                        compatible = "ti,omap4-i2c";
                        reg = <0x48070000 0x100>;

diff --cc arch/arm/boot/dts/omap3430-sdp.dts
Simple merge

diff --cc arch/arm/boot/dts/omap4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge