Merge tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 14:17:07 +0000 (15:17 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 14:17:07 +0000 (15:17 +0100)
Updates to the .dts files to support more Gumstix boards.

These are sent separately from the rest of the .dts changes
as these depend on the fixes merged into v3.14-rc4, and
needed a bit more time to get updated on the fixes.

* tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Add support for the Overo Summit
  ARM: dts: Add support for the Overo Chestnut43
  ARM: dts: Add support for the Overo Alto35
  ARM: dts: Add support for the Overo Gallop43
  ARM: dts: Add support for the Overo Palo43
  ARM: dts: overo: Add LIS33DE accelerometer
  ARM: dts: overo: Create a file for common Gumstix peripherals
  ARM: dts: overo: Push uart3 pinmux down to expansion board
  ARM: dts: omap3-tobi: Add AT24C01 EEPROM
  ARM: dts: omap3-tobi: Use include file omap-gpmc-smsc9221
  ARM: dts: omap: Add common file for SMSC9221
  ARM: dts: omap3-overo: Add HSUSB PHY
  ARM: dts: omap3-overo: Enable WiFi/BT combo
  ARM: dts: omap3-overo: Add missing pinctrl
  ARM: dts: omap3-tobi: Add missing pinctrl
  ARM: dts: overo: reorganize include files

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
arch/arm/boot/dts/omap3-overo.dtsi

1  2 
Documentation/devicetree/bindings/arm/omap/omap.txt
MAINTAINERS
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/omap3-gta04.dts
arch/arm/boot/dts/omap3-n900.dts
arch/arm/boot/dts/omap3-overo.dtsi

@@@ -91,7 -91,7 +91,7 @@@ Boards
    compatible = "ti,omap3-beagle", "ti,omap3"
  
  - OMAP3 Tobi with Overo : Commercial expansion board with daughter board
-   compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"
+   compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"
  
  - OMAP4 SDP : Software Development Board
    compatible = "ti,omap4-sdp", "ti,omap4430"
@@@ -99,9 -99,6 +99,9 @@@
  - OMAP4 PandaBoard : Low cost community board
    compatible = "ti,omap4-panda", "ti,omap4430"
  
 +- OMAP4 DuoVero with Parlor : Commercial expansion board with daughter board
 +  compatible = "gumstix,omap4-duovero-parlor", "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
 +
  - OMAP3 EVM : Software Development Board for OMAP35x, AM/DM37x
    compatible = "ti,omap3-evm", "ti,omap3"
  
  - AM43x EPOS EVM
    compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"
  
 +- AM437x GP EVM
 +  compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"
 +
  - DRA7 EVM:  Software Developement Board for DRA7XX
    compatible = "ti,dra7-evm", "ti,dra7"
diff --combined MAINTAINERS
@@@ -1167,14 -1167,6 +1167,14 @@@ L:    linux-arm-kernel@lists.infradead.or
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  
 +ARM/QUALCOMM SUPPORT
 +M:    Kumar Gala <galak@codeaurora.org>
 +M:    David Brown <davidb@codeaurora.org>
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/mach-qcom/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
 +
  ARM/RADISYS ENP2611 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1868,6 -1860,7 +1868,7 @@@ F:      drivers/net/ethernet/broadcom/bnx2x
  
  BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
  M:    Christian Daudt <bcm@fixthebug.org>
+ M:    Matt Porter <mporter@linaro.org>
  L:    bcm-kernel-feedback-list@broadcom.com
  T:    git git://git.github.com/broadcom/bcm11351
  S:    Maintained
@@@ -2416,8 -2409,10 +2417,10 @@@ F:    tools/power/cpupower
  
  CPUSETS
  M:    Li Zefan <lizefan@huawei.com>
+ L:    cgroups@vger.kernel.org
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
  F:    Documentation/cgroups/cpusets.txt
  F:    include/linux/cpuset.h
@@@ -3332,6 -3327,17 +3335,17 @@@ S:    Maintaine
  F:    include/linux/netfilter_bridge/
  F:    net/bridge/
  
+ ETHERNET PHY LIBRARY
+ M:    Florian Fainelli <f.fainelli@gmail.com>
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    include/linux/phy.h
+ F:    include/linux/phy_fixed.h
+ F:    drivers/net/phy/
+ F:    Documentation/networking/phy.txt
+ F:    drivers/of/of_mdio.c
+ F:    drivers/of/of_net.c
  EXT2 FILE SYSTEM
  M:    Jan Kara <jack@suse.cz>
  L:    linux-ext4@vger.kernel.org
@@@ -9723,7 -9729,6 +9737,6 @@@ F:      drivers/xen/*swiotlb
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
  M:    Dave Chinner <david@fromorbit.com>
- M:    Ben Myers <bpm@sgi.com>
  M:    xfs@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs
@@@ -47,14 -47,19 +47,14 @@@ dtb-$(CONFIG_ARCH_AT91)    += sama5d36ek.d
  
  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 -dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
 -      bcm28155-ap.dtb
 +dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 +dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
        berlin2-sony-nsz-gs7.dtb        \
        berlin2cd-google-chromecast.dtb
  dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
        da850-evm.dtb
 -dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
 -      dove-cubox.dtb \
 -      dove-d2plug.dtb \
 -      dove-d3plug.dtb \
 -      dove-dove-db.dtb
  dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
  dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
@@@ -77,27 -82,14 +77,27 @@@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank
        ecx-2000.dtb
  dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
        integratorcp.dtb
 -dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
 -dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 +kirkwood := \
 +      kirkwood-b3.dtb \
 +      kirkwood-cloudbox.dtb \
        kirkwood-db-88f6281.dtb \
        kirkwood-db-88f6282.dtb \
        kirkwood-dns320.dtb \
        kirkwood-dns325.dtb \
        kirkwood-dockstar.dtb \
        kirkwood-dreamplug.dtb \
 +      kirkwood-ds109.dtb \
 +      kirkwood-ds110jv10.dtb \
 +      kirkwood-ds111.dtb \
 +      kirkwood-ds209.dtb \
 +      kirkwood-ds210.dtb \
 +      kirkwood-ds212.dtb \
 +      kirkwood-ds212j.dtb \
 +      kirkwood-ds409.dtb \
 +      kirkwood-ds409slim.dtb \
 +      kirkwood-ds411.dtb \
 +      kirkwood-ds411j.dtb \
 +      kirkwood-ds411slim.dtb \
        kirkwood-goflexnet.dtb \
        kirkwood-guruplug-server-plus.dtb \
        kirkwood-ib62x0.dtb \
        kirkwood-nsa310a.dtb \
        kirkwood-openblocks_a6.dtb \
        kirkwood-openblocks_a7.dtb \
 +      kirkwood-rd88f6192.dtb \
 +      kirkwood-rd88f6281-a0.dtb \
 +      kirkwood-rd88f6281-a1.dtb \
 +      kirkwood-rs212.dtb \
 +      kirkwood-rs409.dtb \
 +      kirkwood-rs411.dtb \
        kirkwood-sheevaplug.dtb \
        kirkwood-sheevaplug-esata.dtb \
 +      kirkwood-t5325.dtb \
        kirkwood-topkick.dtb \
        kirkwood-ts219-6281.dtb \
 -      kirkwood-ts219-6282.dtb
 +      kirkwood-ts219-6282.dtb \
 +      kirkwood-ts419-6281.dtb \
 +      kirkwood-ts419-6282.dtb
 +dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood)
 +dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood)
 +dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
 -dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
 -      qcom-msm8960-cdp.dtb \
 -      qcom-apq8074-dragonboard.dtb
 -dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 -      armada-370-mirabox.dtb \
 -      armada-370-netgear-rn102.dtb \
 -      armada-370-netgear-rn104.dtb \
 -      armada-370-rd.dtb \
 -      armada-xp-axpwifiap.dtb \
 -      armada-xp-db.dtb \
 -      armada-xp-gp.dtb \
 -      armada-xp-netgear-rn2120.dtb \
 -      armada-xp-matrix.dtb \
 -      armada-xp-openblocks-ax3-4.dtb
  dtb-$(CONFIG_ARCH_MXC) += \
 +      imx25-eukrea-mbimxsd25-baseboard.dtb \
        imx25-karo-tx25.dtb \
        imx25-pdk.dtb \
        imx27-apf27.dtb \
        imx27-apf27dev.dtb \
        imx27-pdk.dtb \
 -      imx27-phytec-phycore-som.dtb \
        imx27-phytec-phycore-rdk.dtb \
 -      imx27-phytec-phycard-s-som.dtb \
        imx27-phytec-phycard-s-rdk.dtb \
        imx31-bug.dtb \
 +      imx35-eukrea-mbimxsd35-baseboard.dtb \
 +      imx50-evk.dtb \
        imx51-apf51.dtb \
        imx51-apf51dev.dtb \
        imx51-babbage.dtb \
 +      imx51-eukrea-mbimxsd51-baseboard.dtb \
        imx53-ard.dtb \
 -      imx53-evk.dtb \
        imx53-m53evk.dtb \
        imx53-mba53.dtb \
        imx53-qsb.dtb \
 +      imx53-qsrb.dtb \
        imx53-smd.dtb \
 +      imx53-tx53-x03x.dtb \
 +      imx53-tx53-x13x.dtb \
 +      imx53-voipac-bsb.dtb \
        imx6dl-cubox-i.dtb \
 +      imx6dl-dfi-fs700-m60.dtb \
 +      imx6dl-gw51xx.dtb \
 +      imx6dl-gw52xx.dtb \
 +      imx6dl-gw53xx.dtb \
 +      imx6dl-gw54xx.dtb \
        imx6dl-hummingboard.dtb \
 +      imx6dl-nitrogen6x.dtb \
        imx6dl-sabreauto.dtb \
 +      imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
        imx6dl-wandboard.dtb \
        imx6q-arm2.dtb \
 +      imx6q-cm-fx6.dtb \
        imx6q-cubox-i.dtb \
 +      imx6q-dfi-fs700-m60.dtb \
 +      imx6q-dmo-edmqmx6.dtb \
 +      imx6q-gk802.dtb \
 +      imx6q-gw51xx.dtb \
 +      imx6q-gw52xx.dtb \
 +      imx6q-gw53xx.dtb \
 +      imx6q-gw5400-a.dtb \
 +      imx6q-gw54xx.dtb \
 +      imx6q-nitrogen6x.dtb \
        imx6q-phytec-pbab01.dtb \
        imx6q-sabreauto.dtb \
        imx6q-sabrelite.dtb \
@@@ -211,9 -183,6 +211,9 @@@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dt
        imx28-cfa10056.dtb \
        imx28-cfa10057.dtb \
        imx28-cfa10058.dtb \
 +      imx28-duckbill.dtb \
 +      imx28-eukrea-mbmx283lc.dtb \
 +      imx28-eukrea-mbmx287lc.dtb \
        imx28-evk.dtb \
        imx28-m28cu3.dtb \
        imx28-m28evk.dtb \
@@@ -230,10 -199,6 +230,10 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        omap2420-n810-wimax.dtb \
        omap3430-sdp.dtb \
        omap3-beagle.dtb \
 +      omap3-cm-t3517.dtb \
 +      omap3-sbc-t3517.dtb \
 +      omap3-cm-t3530.dtb \
 +      omap3-sbc-t3530.dtb \
        omap3-cm-t3730.dtb \
        omap3-sbc-t3730.dtb \
        omap3-devkit8000.dtb \
        omap3-n900.dtb \
        omap3-n9.dtb \
        omap3-n950.dtb \
-       omap3-tobi.dtb \
+       omap3-overo-alto35.dtb \
+       omap3-overo-storm-alto35.dtb \
+       omap3-overo-chestnut43.dtb \
+       omap3-overo-storm-chestnut43.dtb \
+       omap3-overo-gallop43.dtb \
+       omap3-overo-storm-gallop43.dtb \
+       omap3-overo-palo43.dtb \
+       omap3-overo-storm-palo43.dtb \
+       omap3-overo-summit.dtb \
+       omap3-overo-storm-summit.dtb \
+       omap3-overo-tobi.dtb \
+       omap3-overo-storm-tobi.dtb \
        omap3-gta04.dtb \
        omap3-igep0020.dtb \
        omap3-igep0030.dtb \
 +      omap3-lilly-dbb056.dtb \
        omap3-zoom3.dtb \
 +      omap4-duovero-parlor.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
        omap4-panda-es.dtb \
        am335x-boneblack.dtb \
        am335x-nano.dtb \
        am335x-base0033.dtb \
 +      am3517-craneboard.dtb \
        am3517-evm.dtb \
        am3517_mt_ventoux.dtb \
        am43x-epos-evm.dtb \
 +      am437x-gp-evm.dtb \
        dra7-evm.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 +dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \
 +      qcom-msm8960-cdp.dtb \
 +      qcom-apq8074-dragonboard.dtb
  dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
        ste-hrefprev60-stuib.dtb \
        ste-hrefprev60-tvk.dtb \
@@@ -325,9 -294,6 +336,9 @@@ dtb-$(CONFIG_ARCH_SUNXI) += 
        sun4i-a10-cubieboard.dtb \
        sun4i-a10-mini-xplus.dtb \
        sun4i-a10-hackberry.dtb \
 +      sun4i-a10-inet97fv2.dtb \
 +      sun4i-a10-olinuxino-lime.dtb \
 +      sun4i-a10-pcduino.dtb \
        sun5i-a10s-olinuxino-micro.dtb \
        sun5i-a13-olinuxino.dtb \
        sun5i-a13-olinuxino-micro.dtb \
@@@ -366,29 -332,6 +377,29 @@@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv0
  dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
        zynq-zc706.dtb \
        zynq-zed.dtb
 +dtb-$(CONFIG_MACH_ARMADA_370) += \
 +      armada-370-db.dtb \
 +      armada-370-mirabox.dtb \
 +      armada-370-netgear-rn102.dtb \
 +      armada-370-netgear-rn104.dtb \
 +      armada-370-rd.dtb
 +dtb-$(CONFIG_MACH_ARMADA_375) += \
 +      armada-375-db.dtb
 +dtb-$(CONFIG_MACH_ARMADA_38X) += \
 +      armada-385-db.dtb \
 +      armada-385-rd.dtb
 +dtb-$(CONFIG_MACH_ARMADA_XP) += \
 +      armada-xp-axpwifiap.dtb \
 +      armada-xp-db.dtb \
 +      armada-xp-gp.dtb \
 +      armada-xp-netgear-rn2120.dtb \
 +      armada-xp-matrix.dtb \
 +      armada-xp-openblocks-ax3-4.dtb
 +dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
 +      dove-cubox.dtb \
 +      dove-d2plug.dtb \
 +      dove-d3plug.dtb \
 +      dove-dove-db.dtb
  
  targets += dtbs
  targets += $(dtb-y)
                regulator-boot-on;
        };
  
 +      wl12xx_vmmc: fixedregulator@2 {
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&wl12xx_gpio>;
 +              compatible = "regulator-fixed";
 +              regulator-name = "vwl1271";
 +              regulator-min-microvolt = <1800000>;
 +              regulator-max-microvolt = <1800000>;
 +              gpio = <&gpio1 29 0>;
 +              startup-delay-us = <70000>;
 +              enable-active-high;
 +      };
 +
        leds {
                pinctrl-names = "default";
                pinctrl-0 = <&user_leds_s0>;
                >;
        };
  
+       mmc1_pins: pinmux_mmc1_pins {
+               pinctrl-single,pins = <
+                       0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
+               >;
+       };
        mcasp1_pins: mcasp1_pins {
                pinctrl-single,pins = <
                        0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
                        0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */
                >;
        };
 +
 +      mmc2_pins: pinmux_mmc2_pins {
 +              pinctrl-single,pins = <
 +                      0x74 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpio0_31 */
 +                      0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */
 +                      0x84 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
 +                      0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */
 +                      0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */
 +                      0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */
 +                      0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */
 +              >;
 +      };
 +
 +      wl12xx_gpio: pinmux_wl12xx_gpio {
 +              pinctrl-single,pins = <
 +                      0x7c (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_csn0.gpio1_29 */
 +              >;
 +      };
  };
  
  &uart0 {
                status = "okay";
        };
  
 +      usb-phy@47401b00 {
 +              status = "okay";
 +      };
 +
        usb@47401000 {
                status = "okay";
        };
 +
 +      usb@47401800 {
 +              status = "okay";
 +              dr_mode = "host";
 +      };
 +
 +      dma-controller@07402000  {
 +              status = "okay";
 +      };
  };
  
  &epwmss2 {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
 +      dual_emac = <1>;
  };
  
  &davinci_mdio {
  &cpsw_emac0 {
        phy_id = <&davinci_mdio>, <0>;
        phy-mode = "rgmii-txid";
 +      dual_emac_res_vlan = <1>;
  };
  
  &cpsw_emac1 {
        phy_id = <&davinci_mdio>, <1>;
        phy-mode = "rgmii-txid";
 +      dual_emac_res_vlan = <2>;
  };
  
  &mmc1 {
        status = "okay";
        vmmc-supply = <&vmmc_reg>;
        bus-width = <4>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&mmc1_pins>;
+       cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
  };
  
  &sham {
        ti,no-reset-on-init;
  };
  
 +&mmc2 {
 +      status = "okay";
 +      vmmc-supply = <&wl12xx_vmmc>;
 +      ti,non-removable;
 +      bus-width = <4>;
 +      cap-power-off-card;
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&mmc2_pins>;
 +};
 +
  &mcasp1 {
                pinctrl-names = "default";
                pinctrl-0 = <&mcasp1_pins>;
                aux-button {
                        label = "aux";
                        linux,code = <169>;
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
                        gpio-key,wakeup;
                };
        };
 +
 +      sound {
 +              compatible = "ti,omap-twl4030";
 +              ti,model = "gta04";
 +
 +              ti,mcbsp = <&mcbsp2>;
 +              ti,codec = <&twl_audio>;
 +      };
  };
  
  &omap3_pmx_core {
                interrupts = <7>; /* SYS_NIRQ cascaded to intc */
                interrupt-parent = <&intc>;
        };
 +
 +      twl_audio: audio {
 +              compatible = "ti,twl4030-audio";
 +              codec {
 +              };
 +      };
  };
  
  #include "twl4030.dtsi"
        bmp085@77 {
                compatible = "bosch,bmp085";
                reg = <0x77>;
+               interrupt-parent = <&gpio4>;
+               interrupts = <17 IRQ_TYPE_EDGE_RISING>;
        };
  
 +      /* accelerometer */
 +      bma180@41 {
 +              compatible = "bosch,bma180";
 +              reg = <0x41>;
 +              interrupt-parent = <&gpio3>;
 +              interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
 +      };
 +
        /* leds */
        tca6507@45 {
                compatible = "ti,tca6507";
                        reg = <0x4>;
                };
        };
 +
 +      /* compass aka magnetometer */
 +      hmc5843@1e {
 +              compatible = "honeywell,hmc5843";
 +              reg = <0x1e>;
 +      };
 +
 +      /* touchscreen */
 +      tsc2007@48 {
 +              compatible = "ti,tsc2007";
 +              reg = <0x48>;
 +              interrupt-parent = <&gpio6>;
 +              interrupts = <0 IRQ_TYPE_EDGE_FALLING>;
 +              gpios = <&gpio6 0 GPIO_ACTIVE_LOW>;
 +              ti,x-plate-ohms = <600>;
 +      };
  };
  
  &i2c3 {
        pinctrl-names = "default";
        pinctrl-0 = <&mmc1_pins>;
        vmmc-supply = <&vmmc1>;
-       vmmc_aux-supply = <&vsim>;
        bus-width = <4>;
+       ti,non-removable;
  };
  
  &mmc2 {
 -      status = "disabled";
 +      vmmc-supply = <&vaux4>;
 +      bus-width = <4>;
 +      ti,non-removable;
  };
  
  &mmc3 {
        pinctrl-0 = <&uart3_pins>;
  };
  
 +&charger {
 +      bb_uvolt = <3200000>;
 +      bb_uamp = <150>;
 +};
 +
 +&vaux4 {
 +      regulator-min-microvolt = <2800000>;
 +      regulator-max-microvolt = <3150000>;
 +};
@@@ -1,6 -1,6 +1,6 @@@
  /*
   * Copyright (C) 2013 Pavel Machek <pavel@ucw.cz>
-  * Copyright 2013 Aaro Koskinen <aaro.koskinen@iki.fi>
+  * Copyright (C) 2013-2014 Aaro Koskinen <aaro.koskinen@iki.fi>
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License version 2 (or later) as
@@@ -13,7 -13,7 +13,7 @@@
  
  / {
        model = "Nokia N900";
-       compatible = "nokia,omap3-n900", "ti,omap3";
+       compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
  
        cpus {
                cpu@0 {
                };
        };
  
 +      isp1704: isp1704 {
 +              compatible = "nxp,isp1704";
 +              nxp,enable-gpio = <&gpio3 3 GPIO_ACTIVE_HIGH>;
 +              usb-phy = <&usb2_phy>;
 +      };
  };
  
  &omap3_pmx_core {
        };
  };
  
 +&twl_keypad {
 +      linux,keymap = < 0x00000010 /* KEY_Q */
 +                       0x00010018 /* KEY_O */
 +                       0x00020019 /* KEY_P */
 +                       0x00030033 /* KEY_COMMA */
 +                       0x0004000e /* KEY_BACKSPACE */
 +                       0x0006001e /* KEY_A */
 +                       0x0007001f /* KEY_S */
 +
 +                       0x01000011 /* KEY_W */
 +                       0x01010020 /* KEY_D */
 +                       0x01020021 /* KEY_F */
 +                       0x01030022 /* KEY_G */
 +                       0x01040023 /* KEY_H */
 +                       0x01050024 /* KEY_J */
 +                       0x01060025 /* KEY_K */
 +                       0x01070026 /* KEY_L */
 +
 +                       0x02000012 /* KEY_E */
 +                       0x02010034 /* KEY_DOT */
 +                       0x02020067 /* KEY_UP */
 +                       0x0203001c /* KEY_ENTER */
 +                       0x0205002c /* KEY_Z */
 +                       0x0206002d /* KEY_X */
 +                       0x0207002e /* KEY_C */
 +                       0x02080043 /* KEY_F9 */
 +
 +                       0x03000013 /* KEY_R */
 +                       0x0301002f /* KEY_V */
 +                       0x03020030 /* KEY_B */
 +                       0x03030031 /* KEY_N */
 +                       0x03040032 /* KEY_M */
 +                       0x03050039 /* KEY_SPACE */
 +                       0x03060039 /* KEY_SPACE */
 +                       0x03070069 /* KEY_LEFT */
 +
 +                       0x04000014 /* KEY_T */
 +                       0x0401006c /* KEY_DOWN */
 +                       0x0402006a /* KEY_RIGHT */
 +                       0x0404001d /* KEY_LEFTCTRL */
 +                       0x04050064 /* KEY_RIGHTALT */
 +                       0x0406002a /* KEY_LEFTSHIFT */
 +                       0x04080044 /* KEY_F10 */
 +
 +                       0x05000015 /* KEY_Y */
 +                       0x05080057 /* KEY_F11 */
 +
 +                       0x06000016 /* KEY_U */
 +
 +                       0x07000017 /* KEY_I */
 +                       0x07010041 /* KEY_F7 */
 +                       0x07020042 /* KEY_F8 */
 +                       >;
 +};
 +
  &twl_gpio {
        ti,pullups      = <0x0>;
        ti,pulldowns    = <0x03ff3f>; /* BIT(0..5) | BIT(8..17) */
                DVDD-supply = <&vio>;
        };
  
 +      tsl2563: tsl2563@29 {
 +              compatible = "amstaos,tsl2563";
 +              reg = <0x29>;
 +
 +              amstaos,cover-comp-gain = <16>;
 +      };
 +
        lp5523: lp5523@32 {
                compatible = "national,lp5523";
                reg = <0x32>;
                compatible = "ti,bq27200";
                reg = <0x55>;
        };
 +
 +      tpa6130a2: tpa6130a2@60 {
 +              compatible = "ti,tpa6130a2";
 +              reg = <0x60>;
 +
 +              Vdd-supply = <&vmmc2>;
 +
 +              power-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* 98 */
 +      };
 +
 +      bq24150a: bq24150a@6b {
 +              compatible = "ti,bq24150a";
 +              reg = <0x6b>;
 +
 +              ti,current-limit = <100>;
 +              ti,weak-battery-voltage = <3400>;
 +              ti,battery-regulation-voltage = <4200>;
 +              ti,charge-current = <650>;
 +              ti,termination-current = <100>;
 +              ti,resistor-sense = <68>;
 +
 +              ti,usb-charger-detection = <&isp1704>;
 +      };
  };
  
  &i2c3 {
  /*
-  * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group
+  * Copyright (C) 2014 Florian Vaussard, EPFL Mobots group
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.
   */
  
- /*
-  * The Gumstix Overo must be combined with an expansion board.
-  */
- /dts-v1/;
  #include "omap34xx.dtsi"
+ #include "omap3-overo-base.dtsi"
  
- / {
-       pwmleds {
-               compatible = "pwm-leds";
-               overo {
-                       label = "overo:blue:COM";
-                       pwms = <&twl_pwmled 1 7812500>;
-                       max-brightness = <127>;
-                       linux,default-trigger = "mmc0";
-               };
-       };
-       sound {
-               compatible = "ti,omap-twl4030";
-               ti,model = "overo";
-               ti,mcbsp = <&mcbsp2>;
-               ti,codec = <&twl_audio>;
-       };
- };
- &i2c1 {
-       clock-frequency = <2600000>;
-       twl: twl@48 {
-               reg = <0x48>;
-               interrupts = <7>; /* SYS_NIRQ cascaded to intc */
-               interrupt-parent = <&intc>;
+ &omap3_pmx_core2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <
+                       &hsusb2_2_pins
+       >;
  
-               twl_audio: audio {
-                       compatible = "ti,twl4030-audio";
-                       codec {
-                       };
-               };
+       hsusb2_2_pins: pinmux_hsusb2_2_pins {
+               pinctrl-single,pins = <
+                       OMAP3430_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3)            /* etk_d10.hsusb2_clk */
+                       OMAP3430_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3)            /* etk_d11.hsusb2_stp */
+                       OMAP3430_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3)    /* etk_d12.hsusb2_dir */
+                       OMAP3430_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3)    /* etk_d13.hsusb2_nxt */
+                       OMAP3430_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3)    /* etk_d14.hsusb2_data0 */
+                       OMAP3430_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3)    /* etk_d15.hsusb2_data1 */
+               >;
        };
- };
  
- #include "twl4030.dtsi"
- #include "twl4030_omap3.dtsi"
- /* i2c2 pins are used for gpio */
- &i2c2 {
-       status = "disabled";
- };
- /* on board microSD slot */
- &mmc1 {
-       vmmc-supply = <&vmmc1>;
-       bus-width = <4>;
- };
- /* optional on board WiFi */
- &mmc2 {
-       bus-width = <4>;
- };
- &twl_gpio {
-       ti,use-leds;
- };
- &usb_otg_hs {
-       interface-type = <0>;
-       usb-phy = <&usb2_phy>;
-       phys = <&usb2_phy>;
-       phy-names = "usb2-phy";
-       mode = <3>;
-       power = <50>;
- };
- &omap3_pmx_core {
-       uart3_pins: pinmux_uart3_pins {
+       w3cbw003c_2_pins: pinmux_w3cbw003c_2_pins {
                pinctrl-single,pins = <
-                       0x16e (PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
-                       0x170 (PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */
+                       OMAP3430_CORE2_IOPAD(0x25e0, PIN_OUTPUT | MUX_MODE4)            /* etk_d2.gpio_16 */
                >;
        };
  };
  
- &uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart3_pins>;
- };
 +&mcbsp2 {
 +      status = "okay";
 +};