]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <DMurphy@ti.com>
Wed, 4 Mar 2015 14:14:37 +0000 (08:14 -0600)
committerDan Murphy <DMurphy@ti.com>
Wed, 4 Mar 2015 14:14:37 +0000 (08:14 -0600)
TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-3.14.y

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: DRA7-evm: Remove pin mux

Conflicts:
arch/arm/boot/dts/dra7-evm.dts

Signed-off-by: Dan Murphy <DMurphy@ti.com>
1  2 
arch/arm/boot/dts/dra7-evm.dts

index 9f99eab93dec650afeaaf0f6f55939574b9c84af,7d0b8e7447666e301004fb2080165b2dce663b7a..4468bce1891cf7ec67eee8eedb619013fa3cf85e
  };
  
  &dra7_pmx_core {
-       pinctrl-names = "default";
-       pinctrl-0 = <&vtt_pin>;
-               vtt_pin: pinmux_vtt_pin {
-               pinctrl-single,pins = <
-                       0x3b4 (PIN_OUTPUT | MUX_MODE14) /* gpio7_11 */
-               >;
-       };
-       i2c1_pins: pinmux_i2c1_pins {
-               pinctrl-single,pins = <
-                       0x400 (PIN_INPUT | MUX_MODE0) /* i2c1_sda */
-                       0x404 (PIN_INPUT | MUX_MODE0) /* i2c1_scl */
-               >;
-       };
-       i2c2_pins: pinmux_i2c2_pins {
-               pinctrl-single,pins = <
-                       0x408 (PIN_INPUT | MUX_MODE0) /* i2c2_sda */
-                       0x40c (PIN_INPUT | MUX_MODE0) /* i2c2_scl */
-               >;
-       };
-       i2c3_pins: pinmux_i2c3_pins {
-               pinctrl-single,pins = <
-                       0x288 (PIN_INPUT | MUX_MODE9) /* gpio6_14.i2c3_sda */
-                       0x28c (PIN_INPUT | MUX_MODE9) /* gpio6_15.i2c3_scl */
-               >;
-       };
-       mcspi1_pins: pinmux_mcspi1_pins {
-               pinctrl-single,pins = <
-                       0x3a4 (PIN_INPUT | MUX_MODE0) /* spi1_sclk */
-                       0x3a8 (PIN_INPUT | MUX_MODE0) /* spi1_d1 */
-                       0x3ac (PIN_INPUT | MUX_MODE0) /* spi1_d0 */
-                       0x3b0 (PIN_INPUT_SLEW | MUX_MODE0) /* spi1_cs0 */
-                       0x3b4 (PIN_INPUT_SLEW | MUX_MODE0) /* spi1_cs1 */
-                       0x3b8 (PIN_INPUT_SLEW | MUX_MODE6) /* spi1_cs2.hdmi1_hpd */
-                       0x3bc (PIN_INPUT_SLEW | MUX_MODE6) /* spi1_cs3.hdmi1_cec */
-               >;
-       };
-       uart1_pins: pinmux_uart1_pins {
-               pinctrl-single,pins = <
-                       0x3e0 (PIN_INPUT_SLEW | MUX_MODE0) /* uart1_rxd */
-                       0x3e4 (PIN_INPUT_SLEW | MUX_MODE0) /* uart1_txd */
-               >;
-       };
-       bt_uart3_pins: pinmux_uart3_pins {
-               pinctrl-single,pins = <
-                       0x3c0 (PIN_INPUT_PULLUP | MUX_MODE1)    /* spi2_sclk.uart3_rxd */
-                       0x3c4 (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* spi2_d1.uart3_txd */
-                       0x3c8 (PIN_INPUT | MUX_MODE1)           /* spi2.d0.uart3_ctsn */
-                       0x3cc (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* spi2_cs0.uart3_rtsn */
-                       0x2bc (PIN_OUTPUT | MUX_MODE14)         /* mcasp1_axr2.gpio5_4 - BT_EN */
-               >;
-       };
-       qspi1_pins: pinmux_qspi1_pins {
-               pinctrl-single,pins = <
-                       0x4c (PIN_INPUT | MUX_MODE1)  /* gpmc_a3.qspi1_cs2 */
-                       0x50 (PIN_INPUT | MUX_MODE1)  /* gpmc_a4.qspi1_cs3 */
-                       0x74 (PIN_INPUT | MUX_MODE1)  /* gpmc_a13.qspi1_rtclk */
-                       0x78 (PIN_INPUT | MUX_MODE1)  /* gpmc_a14.qspi1_d3 */
-                       0x7c (PIN_INPUT | MUX_MODE1)  /* gpmc_a15.qspi1_d2 */
-                       0x80 (PIN_INPUT | MUX_MODE1) /* gpmc_a16.qspi1_d1 */
-                       0x84 (PIN_INPUT | MUX_MODE1)  /* gpmc_a17.qspi1_d0 */
-                       0x88 (PIN_INPUT | MUX_MODE1)  /* qpmc_a18.qspi1_sclk */
-                       0xb8 (PIN_INPUT_PULLUP | MUX_MODE1)  /* gpmc_cs2.qspi1_cs0 */
-                       0xbc (PIN_INPUT_PULLUP | MUX_MODE1)  /* gpmc_cs3.qspi1_cs1 */
-               >;
-       };
-       usb1_pins: pinmux_usb1_pins {
-                 pinctrl-single,pins = <
-                       0x280 (PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */
-                 >;
-         };
-       usb2_pins: pinmux_usb2_pins {
-                 pinctrl-single,pins = <
-                       0x284 (PIN_INPUT_SLEW | MUX_MODE0) /* usb2_drvvbus */
-                 >;
-         };
 +      wlan_pins: pinmux_wlan_pins {
 +              pinctrl-single,pins = <
 +                      0x3e8 (PIN_INPUT_PULLUP | MUX_MODE3)    /* uart1_ctsn.mmc4_clk */
 +                      0x3ec (PIN_INPUT_PULLUP | MUX_MODE3)    /* uart1_rtsn.mmc4_cmd */
 +                      0x3f0 (PIN_INPUT_PULLUP | MUX_MODE3)    /* uart2_rxd.mmc4_dat0 */
 +                      0x3f4 (PIN_INPUT_PULLUP | MUX_MODE3)    /* uart2_txd.mmc4_dat1 */
 +                      0x3f8 (PIN_INPUT_PULLUP | MUX_MODE3)    /* uart2_ctsn.mmc4_dat2 */
 +                      0x3fc (PIN_INPUT_PULLUP | MUX_MODE3)    /* uart2_rtsn.mmc4_dat3 */
 +                      0x2cc (PIN_OUTPUT | MUX_MODE14)         /* mcasp1_axr6.gpio5_8 - WLAN_EN */
 +              >;
 +      };
 +
 +      wlirq_pins: pinmux_wlirq_pins {
 +              pinctrl-single,pins = <
 +                      0x2c8 (PIN_INPUT_PULLUP | WAKEUP_EN | MUX_MODE14 ) /* mcasp1_axr5.gpio5_7 - WLAN_IRQ */
 +              >;
 +      };
 +
 +      cpsw_default: cpsw_default {
 +              pinctrl-single,pins = <
 +                      /* Slave 1 */
 +                      0x250 (PIN_OUTPUT | MUX_MODE0)  /* rgmii1_tclk */
 +                      0x254 (PIN_OUTPUT | MUX_MODE0)  /* rgmii1_tctl */
 +                      0x258 (PIN_OUTPUT | MUX_MODE0)  /* rgmii1_td3 */
 +                      0x25c (PIN_OUTPUT | MUX_MODE0)  /* rgmii1_td2 */
 +                      0x260 (PIN_OUTPUT | MUX_MODE0)  /* rgmii1_td1 */
 +                      0x264 (PIN_OUTPUT | MUX_MODE0)  /* rgmii1_td0 */
 +                      0x268 (PIN_INPUT | MUX_MODE0)   /* rgmii1_rclk */
 +                      0x26c (PIN_INPUT | MUX_MODE0)   /* rgmii1_rctl */
 +                      0x270 (PIN_INPUT | MUX_MODE0)   /* rgmii1_rd3 */
 +                      0x274 (PIN_INPUT | MUX_MODE0)   /* rgmii1_rd2 */
 +                      0x278 (PIN_INPUT | MUX_MODE0)   /* rgmii1_rd1 */
 +                      0x27c (PIN_INPUT | MUX_MODE0)   /* rgmii1_rd0 */
 +
 +                      /* Slave 2 */
 +                      0x198 (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_tclk */
 +                      0x19c (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_tctl */
 +                      0x1a0 (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_td3 */
 +                      0x1a4 (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_td2 */
 +                      0x1a8 (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_td1 */
 +                      0x1ac (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_td0 */
 +                      0x1b0 (PIN_INPUT | MUX_MODE3)   /* rgmii2_rclk */
 +                      0x1b4 (PIN_INPUT | MUX_MODE3)   /* rgmii2_rctl */
 +                      0x1b8 (PIN_INPUT | MUX_MODE3)   /* rgmii2_rd3 */
 +                      0x1bc (PIN_INPUT | MUX_MODE3)   /* rgmii2_rd2 */
 +                      0x1c0 (PIN_INPUT | MUX_MODE3)   /* rgmii2_rd1 */
 +                      0x1c4 (PIN_INPUT | MUX_MODE3)   /* rgmii2_rd0 */
 +              >;
 +
 +      };
 +
 +      cpsw_sleep: cpsw_sleep {
 +              pinctrl-single,pins = <
 +                      /* Slave 1 */
 +                      0x250 (PIN_OFF_NONE)
 +                      0x254 (PIN_OFF_NONE)
 +                      0x258 (PIN_OFF_NONE)
 +                      0x25c (PIN_OFF_NONE)
 +                      0x260 (PIN_OFF_NONE)
 +                      0x264 (PIN_OFF_NONE)
 +                      0x268 (PIN_OFF_NONE)
 +                      0x26c (PIN_OFF_NONE)
 +                      0x270 (PIN_OFF_NONE)
 +                      0x274 (PIN_OFF_NONE)
 +                      0x278 (PIN_OFF_NONE)
 +                      0x27c (PIN_OFF_NONE)
 +
 +                      /* Slave 1 */
 +                      0x198 (PIN_OFF_NONE)
 +                      0x19c (PIN_OFF_NONE)
 +                      0x1a0 (PIN_OFF_NONE)
 +                      0x1a4 (PIN_OFF_NONE)
 +                      0x1a8 (PIN_OFF_NONE)
 +                      0x1ac (PIN_OFF_NONE)
 +                      0x1b0 (PIN_OFF_NONE)
 +                      0x1b4 (PIN_OFF_NONE)
 +                      0x1b8 (PIN_OFF_NONE)
 +                      0x1bc (PIN_OFF_NONE)
 +                      0x1c0 (PIN_OFF_NONE)
 +                      0x1c4 (PIN_OFF_NONE)
 +              >;
 +      };
 +
 +      davinci_mdio_default: davinci_mdio_default {
 +              pinctrl-single,pins = <
 +                      /* MDIO */
 +                      0x23c (PIN_OUTPUT_PULLUP | MUX_MODE0)   /* mdio_data */
 +                      0x240 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mdio_clk */
 +              >;
 +      };
 +
 +      davinci_mdio_sleep: davinci_mdio_sleep {
 +              pinctrl-single,pins = <
 +                      0x23c (PIN_OFF_NONE)
 +                      0x240 (PIN_OFF_NONE)
 +              >;
 +      };
 +
 +      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 */
 +              pinctrl-single,pins = <
 +                      0x0     (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad0     */
 +                      0x4     (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad1     */
 +                      0x8     (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad2     */
 +                      0xc     (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad3     */
 +                      0x10    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad4     */
 +                      0x14    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad5     */
 +                      0x18    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad6     */
 +                      0x1c    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad7     */
 +                      0x20    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad8     */
 +                      0x24    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad9     */
 +                      0x28    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad10    */
 +                      0x2c    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad11    */
 +                      0x30    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad12    */
 +                      0x34    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad13    */
 +                      0x38    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad14    */
 +                      0x3c    (PIN_INPUT  | MUX_MODE0)        /* gpmc_ad15    */
 +                      0xd8    (PIN_INPUT_PULLUP  | MUX_MODE0) /* gpmc_wait0   */
 +                      0xcc    (PIN_OUTPUT | MUX_MODE0)        /* gpmc_wen     */
 +                      0xb4    (PIN_OUTPUT_PULLUP | MUX_MODE0) /* gpmc_csn0    */
 +                      0xc4    (PIN_OUTPUT | MUX_MODE0)        /* gpmc_advn_ale */
 +                      0xc8    (PIN_OUTPUT | MUX_MODE0)        /* gpmc_oen_ren  */
 +                      0xd0    (PIN_OUTPUT | MUX_MODE0)        /* gpmc_be0n_cle */
 +              >;
 +      };
 +
 +      vout1_pins: pinmux_vout1_pins {
 +              pinctrl-single,pins = <
 +                      0x1C8   (PIN_OUTPUT | MUX_MODE0)        /* vout1_clk */
 +                      0x1CC   (PIN_OUTPUT | MUX_MODE0)        /* vout1_de */
 +                      0x1D0   (PIN_OUTPUT | MUX_MODE0)        /* vout1_fld */
 +                      0x1D4   (PIN_OUTPUT | MUX_MODE0)        /* vout1_hsync */
 +                      0x1D8   (PIN_OUTPUT | MUX_MODE0)        /* vout1_vsync */
 +                      0x1DC   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d0 */
 +                      0x1E0   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d1 */
 +                      0x1E4   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d2 */
 +                      0x1E8   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d3 */
 +                      0x1EC   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d4 */
 +                      0x1F0   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d5 */
 +                      0x1F4   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d6 */
 +                      0x1F8   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d7 */
 +                      0x1FC   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d8 */
 +                      0x200   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d9 */
 +                      0x204   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d10 */
 +                      0x208   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d11 */
 +                      0x20C   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d12 */
 +                      0x210   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d13 */
 +                      0x214   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d14 */
 +                      0x218   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d15 */
 +                      0x21C   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d16 */
 +                      0x220   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d17 */
 +                      0x224   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d18 */
 +                      0x228   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d19 */
 +                      0x22C   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d20 */
 +                      0x230   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d21 */
 +                      0x234   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d22 */
 +                      0x238   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d23 */
 +              >;
 +      };
 +
 +      hpd_pin: pinmux_hpd_pin {
 +              pinctrl-single,pins = <
 +                      0x3b8   (PIN_INPUT_PULLDOWN | MUX_MODE14)       /* gpio7_12 */
 +              >;
 +      };
 +
 +      tsc_pins: pinmux_tsc_pins {
 +              pinctrl-single,pins = <
 +                      0x420 (PIN_INPUT_PULLUP | MUX_MODE1) /* sys_nirq2 */
 +              >;
 +      };
 +
 +      dcan1_pins_default: dcan1_pins_default {
 +              pinctrl-single,pins = <
 +                      0x3d0   (PIN_OUTPUT_PULLUP | MUX_MODE0) /* dcan1_tx */
 +                      0x418   (PULL_UP | MUX_MODE1)           /* wakeup0.dcan1_rx */
 +              >;
 +      };
 +
 +      dcan1_pins_sleep: dcan1_pins_sleep {
 +              pinctrl-single,pins = <
 +                      0x3d0   (MUX_MODE15 | PULL_UP)  /* dcan1_tx.off */
 +                      0x418   (MUX_MODE15 | PULL_UP)  /* wakeup0.off */
 +              >;
 +      };
 +
 +      atl_pins: pinmux_atl_pins {
 +              pinctrl-single,pins = <
 +                      0x298 (PIN_OUTPUT | MUX_MODE5)  /* xref_clk1.atl_clk1 */
 +                      0x29c (PIN_OUTPUT | MUX_MODE5)  /* xref_clk2.atl_clk2 */
 +              >;
 +      };
 +
 +      mcasp3_pins: pinmux_mcasp3_pins {
 +              pinctrl-single,pins = <
 +                      0x324 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp3_aclkx */
 +                      0x328 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp3_fsx */
 +                      0x32c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp3_axr0 */
 +                      0x330 (PIN_INPUT_PULLDOWN | MUX_MODE0)  /* mcasp3_axr1 */
 +              >;
 +      };
 +
 +      mcasp3_sleep_pins: pinmux_mcasp3_sleep_pins {
 +              pinctrl-single,pins = <
 +                      0x324 (PIN_OFF_NONE)
 +                      0x328 (PIN_OFF_NONE)
 +                      0x32c (PIN_OFF_NONE)
 +                      0x330 (PIN_OFF_NONE)
 +              >;
 +      };
 +
 +      mmc1_pins_default: pinmux_mmc1_default_pins {
 +              pinctrl-single,pins = <
 +                      0x354 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mmc1_clk.clk */
 +                      0x358 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mmc1_cmd.cmd */
 +                      0x35c (PIN_INPUT_PULLUP | MUX_MODE0)    /* mmc1_dat0.dat0 */
 +                      0x360 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mmc1_dat1.dat1 */
 +                      0x364 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mmc1_dat2.dat2 */
 +                      0x368 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mmc1_dat3.dat3 */
 +                      0x36c (PIN_INPUT | MUX_MODE14)          /* mmc1sdcd.gpio187 */
 +              >;
 +      };
 +
 +      mmc1_pins_hs: pinmux_mmc1_hs_pins {
 +              pinctrl-single,pins = <
 +                      0x354 (PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0)       /* mmc1_clk.clk */
 +                      0x358 (PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0)       /* mmc1_cmd.cmd */
 +                      0x35c (PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0)       /* mmc1_dat0.dat0 */
 +                      0x360 (PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0)       /* mmc1_dat1.dat1 */
 +                      0x364 (PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0)       /* mmc1_dat2.dat2 */
 +                      0x368 (PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0)       /* mmc1_dat3.dat3 */
 +              >;
 +      };
 +
 +      mmc2_pins_default: mmc2_pins_default {
 +              pinctrl-single,pins = <
 +                      0x9c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */
 +                      0xb0 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
 +                      0xa0 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */
 +                      0xa4 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */
 +                      0xa8 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */
 +                      0xac (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */
 +                      0x8c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */
 +                      0x90 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */
 +                      0x94 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */
 +                      0x98 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */
 +              >;
 +      };
 +
 +      mmc2_pins_hs: pinmux_mmc2_hs_pins {
 +              pinctrl-single,pins = <
 +                      0x9c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */
 +                      0xb0 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
 +                      0xa0 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */
 +                      0xa4 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */
 +                      0xa8 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */
 +                      0xac (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */
 +                      0x8c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */
 +                      0x90 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */
 +                      0x94 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */
 +                      0x98 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */
 +              >;
 +      };
  };
  
  &i2c1 {
  
  &i2c2 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c2_pins>;
        clock-frequency = <400000>;
 +
 +      pcf_hdmi: gpio@26 {
 +              compatible = "nxp,pcf8575";
 +              reg = <0x26>;
 +              lines-initial-states = <0xffeb>;
 +              gpio-controller;
 +              #gpio-cells = <2>;
 +      };
  };
  
  &i2c3 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c3_pins>;
-       clock-frequency = <400000>;
+       clock-frequency = <3400000>;
  };
  
- &uart1 {
+ &mcspi1 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart1_pins>;
+ };
+ &mcspi2 {
+       status = "okay";
+ };
  
+ &uart1 {
+       status = "okay";
 +      interrupts-extended = <&gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH
 +                             &dra7_pmx_core 0x3e0>;
  };
  
+ &uart2 {
+       status = "okay";
+ };
  &uart3 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&bt_uart3_pins>;
 +      gpios = <&pcf_gpio_21 14 GPIO_ACTIVE_LOW>;
  };
  
  &mmc1 {
        };
  };
  
 +&omap_dwc3_1 {
 +      extcon = <&extcon1>;
 +};
 +
 +&omap_dwc3_2 {
 +      extcon = <&extcon2>;
 +};
 +
  &usb1 {
-       dr_mode = "otg";
-       pinctrl-names = "default";
-       pinctrl-0 = <&usb1_pins>;
+       dr_mode = "peripheral";
  };
  
  &usb2 {
        dr_mode = "host";
-       pinctrl-names = "default";
-       pinctrl-0 = <&usb2_pins>;
  };
  
 +&mac {
 +      status = "okay";
 +      pinctrl-names = "default", "sleep";
 +      pinctrl-0 = <&cpsw_default>;
 +      pinctrl-1 = <&cpsw_sleep>;
 +      dual_emac;
 +};
 +
 +&cpsw_emac0 {
 +      phy_id = <&davinci_mdio>, <2>;
 +      phy-mode = "rgmii";
 +      dual_emac_res_vlan = <1>;
 +};
 +
 +&cpsw_emac1 {
 +      phy_id = <&davinci_mdio>, <3>;
 +      phy-mode = "rgmii";
 +      dual_emac_res_vlan = <2>;
 +};
 +
 +&davinci_mdio {
 +      pinctrl-names = "default", "sleep";
 +      pinctrl-0 = <&davinci_mdio_default>;
 +      pinctrl-1 = <&davinci_mdio_sleep>;
 +};
 +
 +&elm {
 +      status = "okay";
 +};
 +
 +&gpmc {
 +      status = "disabled";
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&nand_flash_x16>;
 +      ranges = <0 0 0 0x01000000>;    /* minimum GPMC partition = 16MB */
 +      nand@0,0 {
 +              reg = <0 0 4>;          /* device IO registers */
 +              ti,nand-ecc-opt = "bch8";
 +              ti,elm-id = <&elm>;
 +              nand-bus-width = <16>;
 +              gpmc,device-width = <2>;
 +              gpmc,sync-clk-ps = <0>;
 +              gpmc,cs-on-ns = <0>;
 +              gpmc,cs-rd-off-ns = <80>;
 +              gpmc,cs-wr-off-ns = <80>;
 +              gpmc,adv-on-ns = <0>;
 +              gpmc,adv-rd-off-ns = <60>;
 +              gpmc,adv-wr-off-ns = <60>;
 +              gpmc,we-on-ns = <10>;
 +              gpmc,we-off-ns = <50>;
 +              gpmc,oe-on-ns = <4>;
 +              gpmc,oe-off-ns = <40>;
 +              gpmc,access-ns = <40>;
 +              gpmc,wr-access-ns = <80>;
 +              gpmc,rd-cycle-ns = <80>;
 +              gpmc,wr-cycle-ns = <80>;
 +              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
 +               * 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 0x000020000>;
 +              };
 +              partition@1 {
 +                      label = "NAND.SPL.backup1";
 +                      reg = <0x00020000 0x00020000>;
 +              };
 +              partition@2 {
 +                      label = "NAND.SPL.backup2";
 +                      reg = <0x00040000 0x00020000>;
 +              };
 +              partition@3 {
 +                      label = "NAND.SPL.backup3";
 +                      reg = <0x00060000 0x00020000>;
 +              };
 +              partition@4 {
 +                      label = "NAND.u-boot-spl-os";
 +                      reg = <0x00080000 0x00040000>;
 +              };
 +              partition@5 {
 +                      label = "NAND.u-boot";
 +                      reg = <0x000c0000 0x00100000>;
 +              };
 +              partition@6 {
 +                      label = "NAND.u-boot-env";
 +                      reg = <0x001c0000 0x00020000>;
 +              };
 +              partition@7 {
 +                      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>;
 +              };
 +      };
 +};
 +
  &gpio7 {
        ti,no-reset-on-init;
        ti,no-idle-on-init;