Merge tag 'omap-for-v4.2/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 23:30:19 +0000 (16:30 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 23:30:19 +0000 (16:30 -0700)
Few more omap device tree changes for v4.2 merge window:

- Add dm9000 Ethernet support to omap3-devkit8000

- Add Toby-Churchill SL50 board support

- Add vendor prefix for Toby Churchill Ltd

* tag 'omap-for-v4.2/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-sl50: Add Toby-Churchill SL50 board support.
  of: Add vendor prefix for Toby Churchill Ltd.
  ARM: dts: omap3-devkit8000: Add dm9000 support

1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/omap3-devkit8000.dts

index 11e4bdb07b6d5fb48455adbbc4829976ad4c60a8,86e842a582578973b695497327698f890b686e33..6964913d4755f3b806390b23b2b22a819127dd85
@@@ -40,7 -40,6 +40,7 @@@ calxeda       Calxed
  capella       Capella Microsystems, Inc
  cavium        Cavium, Inc.
  cdns  Cadence Design Systems Inc.
 +ceva  Ceva, Inc.
  chipidea      Chipidea, Inc
  chipone               ChipOne
  chipspark     ChipSPARK
@@@ -53,7 -52,6 +53,7 @@@ cnxt  Conexant Systems, Inc
  cortina       Cortina Systems, Inc.
  cosmic        Cosmic Circuits
  crystalfontz  Crystalfontz America, Inc.
 +cubietech     Cubietech, Ltd.
  dallas        Maxim Integrated Products (formerly Dallas Semiconductor)
  davicom       DAVICOM Semiconductor, Inc.
  denx  Denx Software Engineering
@@@ -62,7 -60,6 +62,7 @@@ digilent      Diglent, Inc
  dlg   Dialog Semiconductor
  dlink D-Link Corporation
  dmo   Data Modul AG
 +ea    Embedded Artists AB
  ebv   EBV Elektronik
  edt   Emerging Display Technologies
  elan  Elan Microelectronic Corp.
@@@ -93,11 -90,9 +93,11 @@@ gumstix     Gumstix, Inc
  gw    Gateworks Corporation
  hannstar      HannStar Display Corporation
  haoyu Haoyu Microelectronic Co. Ltd.
 +hardkernel    Hardkernel Co., Ltd
  himax Himax Technologies, Inc.
  hisilicon     Hisilicon Limited.
  hit   Hitachi Ltd.
 +hitex Hitex Development Tools
  honeywell     Honeywell
  hp    Hewlett Packard
  i2se  I2SE GmbH
@@@ -164,7 -159,6 +164,7 @@@ radxa      Radx
  raidsonic     RaidSonic Technology GmbH
  ralink        Mediatek/Ralink Technology Corp.
  ramtron       Ramtron International
 +raspberrypi   Raspberry Pi Foundation
  realtek Realtek Semiconductor Corp.
  renesas       Renesas Electronics Corporation
  ricoh Ricoh Co. Ltd.
@@@ -195,6 -189,7 +195,7 @@@ ste        ST-Ericsso
  stericsson    ST-Ericsson
  synology      Synology, Inc.
  tbs   TBS Technologies
+ tcl   Toby Churchill Ltd.
  thine THine Electronics, Inc.
  ti    Texas Instruments
  tlm   Trusted Logic Mobility
@@@ -208,7 -203,6 +209,7 @@@ variscite  Variscite Ltd
  via   VIA Technologies, Inc.
  virtio        Virtual I/O Device Specification, developed by the OASIS consortium
  voipac        Voipac Technologies s.r.o.
 +wexler        Wexler
  winbond Winbond Electronics corp.
  wlf   Wolfson Microelectronics
  wm    Wondermedia Technologies, Inc.
index 8a775843799cb58fe22addf96ec1b25384f88e02,2f0bf1d0f4f9e2323b4543553c275d9eace14e81..a8bf702adbab06018e3174f246ca8e5f8be61dbf
@@@ -20,9 -20,9 +20,9 @@@ dtb-$(CONFIG_SOC_SAM_V4_V5) += 
        tny_a9263.dtb \
        usb_a9263.dtb \
        at91-foxg20.dtb \
 +      at91-kizbox.dtb \
        at91sam9g20ek.dtb \
        at91sam9g20ek_2mmc.dtb \
 -      kizbox.dtb \
        tny_a9g20.dtb \
        usb_a9g20.dtb \
        usb_a9g20_lpw.dtb \
        at91sam9n12ek.dtb \
        at91sam9rlek.dtb \
        at91-ariag25.dtb \
 +      at91-ariettag25.dtb \
        at91-cosino_mega2560.dtb \
 +      at91-kizboxmini.dtb \
        at91sam9g15ek.dtb \
        at91sam9g25ek.dtb \
        at91sam9g35ek.dtb \
        at91sam9x25ek.dtb \
        at91sam9x35ek.dtb
  dtb-$(CONFIG_SOC_SAM_V7) += \
 +      at91-kizbox2.dtb \
        at91-sama5d3_xplained.dtb \
        sama5d31ek.dtb \
        sama5d33ek.dtb \
@@@ -59,18 -56,13 +59,18 @@@ dtb-$(CONFIG_ARCH_BCM2835) += 
        bcm2835-rpi-b.dtb \
        bcm2835-rpi-b-plus.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
 +      bcm4708-asus-rt-ac56u.dtb \
 +      bcm4708-asus-rt-ac68u.dtb \
        bcm4708-buffalo-wzr-1750dhp.dtb \
        bcm4708-luxul-xwc-1000.dtb \
        bcm4708-netgear-r6250.dtb \
        bcm4708-netgear-r6300-v2.dtb \
 +      bcm4708-smartrg-sr400ac.dtb \
        bcm47081-asus-rt-n18u.dtb \
        bcm47081-buffalo-wzr-600dhp2.dtb \
        bcm47081-buffalo-wzr-900dhp.dtb \
 +      bcm4709-asus-rt-ac87u.dtb \
 +      bcm4709-buffalo-wxr-1900dhp.dtb \
        bcm4709-netgear-r8000.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += \
        bcm963138dvt.dtb
@@@ -121,7 -113,6 +121,7 @@@ dtb-$(CONFIG_ARCH_EXYNOS5) += 
        exynos5420-peach-pit.dtb \
        exynos5420-smdk5420.dtb \
        exynos5422-odroidxu3.dtb \
 +      exynos5422-odroidxu3-lite.dtb \
        exynos5440-sd5v1.dtb \
        exynos5440-ssdk5440.dtb \
        exynos5800-peach-pi.dtb
@@@ -210,9 -201,6 +210,9 @@@ dtb-$(CONFIG_MACH_KIRKWOOD) += 
        kirkwood-ts219-6282.dtb \
        kirkwood-ts419-6281.dtb \
        kirkwood-ts419-6282.dtb
 +dtb-$(CONFIG_ARCH_LPC18XX) += \
 +      lpc4350-hitex-eval.dtb \
 +      lpc4357-ea4357-devkit.dtb
  dtb-$(CONFIG_ARCH_LPC32XX) += \
        ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_MACH_MESON6) += \
@@@ -235,7 -223,7 +235,7 @@@ dtb-$(CONFIG_SOC_IMX25) += 
        imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \
        imx25-karo-tx25.dtb \
        imx25-pdk.dtb
 -dtb-$(CONFIG_SOC_IMX31) += \
 +dtb-$(CONFIG_SOC_IMX27) += \
        imx27-apf27.dtb \
        imx27-apf27dev.dtb \
        imx27-eukrea-mbimxsd27-baseboard.dtb \
@@@ -266,18 -254,14 +266,18 @@@ dtb-$(CONFIG_SOC_IMX53) += 
        imx53-tx53-x13x.dtb \
        imx53-voipac-bsb.dtb
  dtb-$(CONFIG_SOC_IMX6Q) += \
 +      imx6dl-apf6dev.dtb \
        imx6dl-aristainetos_4.dtb \
        imx6dl-aristainetos_7.dtb \
 +      imx6dl-aristainetos2_4.dtb \
 +      imx6dl-aristainetos2_7.dtb \
        imx6dl-cubox-i.dtb \
        imx6dl-dfi-fs700-m60.dtb \
        imx6dl-gw51xx.dtb \
        imx6dl-gw52xx.dtb \
        imx6dl-gw53xx.dtb \
        imx6dl-gw54xx.dtb \
 +      imx6dl-gw551x.dtb \
        imx6dl-gw552x.dtb \
        imx6dl-hummingboard.dtb \
        imx6dl-nitrogen6x.dtb \
        imx6dl-udoo.dtb \
        imx6dl-wandboard.dtb \
        imx6dl-wandboard-revb1.dtb \
 +      imx6q-apf6dev.dtb \
        imx6q-arm2.dtb \
        imx6q-cm-fx6.dtb \
        imx6q-cubox-i.dtb \
        imx6q-gw53xx.dtb \
        imx6q-gw5400-a.dtb \
        imx6q-gw54xx.dtb \
 +      imx6q-gw551x.dtb \
        imx6q-gw552x.dtb \
        imx6q-hummingboard.dtb \
        imx6q-nitrogen6x.dtb \
@@@ -331,15 -313,12 +331,15 @@@ dtb-$(CONFIG_SOC_IMX6SX) += 
        imx6sx-sabreauto.dtb \
        imx6sx-sdb-reva.dtb \
        imx6sx-sdb.dtb
 +dtb-$(CONFIG_SOC_IMX7D) += \
 +      imx7d-sdb.dtb
  dtb-$(CONFIG_SOC_LS1021A) += \
        ls1021a-qds.dtb \
        ls1021a-twr.dtb
  dtb-$(CONFIG_SOC_VF610) += \
        vf500-colibri-eval-v3.dtb \
        vf610-colibri-eval-v3.dtb \
 +      vf610m4-colibri.dtb \
        vf610-cosmic.dtb \
        vf610-twr.dtb
  dtb-$(CONFIG_ARCH_MXS) += \
@@@ -432,6 -411,7 +432,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-base0033.dtb \
        am335x-bone.dtb \
        am335x-boneblack.dtb \
+       am335x-sl50.dtb \
        am335x-evm.dtb \
        am335x-evmsk.dtb \
        am335x-nano.dtb \
@@@ -519,7 -499,7 +520,7 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += 
        sh73a0-kzm9g.dtb
  dtb-$(CONFIG_ARCH_SOCFPGA) += \
        socfpga_arria5_socdk.dtb \
 -      socfpga_arria10_socdk.dtb \
 +      socfpga_arria10_socdk_sdmmc.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_sockit.dtb \
        socfpga_cyclone5_socrates.dtb \
@@@ -543,39 -523,32 +544,39 @@@ dtb-$(CONFIG_ARCH_STI) += 
        stih416-b2020.dtb \
        stih416-b2020e.dtb \
        stih418-b2199.dtb
 +dtb-$(CONFIG_ARCH_STM32)+= stm32f429-disco.dtb
  dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
        sun4i-a10-ba10-tvbox.dtb \
        sun4i-a10-chuwi-v7-cw0825.dtb \
        sun4i-a10-cubieboard.dtb \
 +      sun4i-a10-gemei-g9.dtb \
 +      sun4i-a10-hackberry.dtb \
 +      sun4i-a10-hyundai-a7hd.dtb \
 +      sun4i-a10-inet97fv2.dtb \
 +      sun4i-a10-jesurun-q5.dtb \
        sun4i-a10-marsboard.dtb \
        sun4i-a10-mini-xplus.dtb \
        sun4i-a10-mk802.dtb \
        sun4i-a10-mk802ii.dtb \
 -      sun4i-a10-hackberry.dtb \
 -      sun4i-a10-hyundai-a7hd.dtb \
 -      sun4i-a10-inet97fv2.dtb \
        sun4i-a10-olinuxino-lime.dtb \
        sun4i-a10-pcduino.dtb
  dtb-$(CONFIG_MACH_SUN5I) += \
 +      sun5i-a10s-auxtek-t004.dtb \
        sun5i-a10s-mk802.dtb \
        sun5i-a10s-olinuxino-micro.dtb \
        sun5i-a10s-r7-tv-dongle.dtb \
        sun5i-a13-hsg-h702.dtb \
        sun5i-a13-olinuxino.dtb \
 -      sun5i-a13-olinuxino-micro.dtb
 +      sun5i-a13-olinuxino-micro.dtb \
 +      sun5i-a13-utoo-p66.dtb
  dtb-$(CONFIG_MACH_SUN6I) += \
        sun6i-a31-app4-evb1.dtb \
        sun6i-a31-colombus.dtb \
        sun6i-a31-hummingbird.dtb \
 +      sun6i-a31-i7.dtb \
        sun6i-a31-m9.dtb \
 +      sun6i-a31-mele-a1000g-quad.dtb \
        sun6i-a31s-cs908.dtb
  dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-bananapi.dtb \
        sun7i-a20-hummingbird.dtb \
        sun7i-a20-i12-tvbox.dtb \
        sun7i-a20-m3.dtb \
 +      sun7i-a20-mk808c.dtb \
        sun7i-a20-olinuxino-lime.dtb \
        sun7i-a20-olinuxino-lime2.dtb \
        sun7i-a20-olinuxino-micro.dtb \
 -      sun7i-a20-pcduino3.dtb
 +      sun7i-a20-orangepi.dtb \
 +      sun7i-a20-orangepi-mini.dtb \
 +      sun7i-a20-pcduino3.dtb \
 +      sun7i-a20-pcduino3-nano.dtb \
 +      sun7i-a20-wexler-tab7200.dtb
  dtb-$(CONFIG_MACH_SUN8I) += \
 +      sun8i-a23-evb.dtb \
        sun8i-a23-ippo-q8h-v5.dtb \
 -      sun8i-a23-ippo-q8h-v1.2.dtb
 +      sun8i-a23-ippo-q8h-v1.2.dtb \
 +      sun8i-a33-et-q8-v1.6.dtb \
 +      sun8i-a33-ga10h-v1.1.dtb \
 +      sun8i-a33-sinlinx-sina33.dtb
  dtb-$(CONFIG_MACH_SUN9I) += \
 -      sun9i-a80-optimus.dtb
 +      sun9i-a80-optimus.dtb \
 +      sun9i-a80-cubieboard4.dtb
  dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
        tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
@@@ -640,11 -603,6 +641,11 @@@ dtb-$(CONFIG_ARCH_U8500) += 
        ste-hrefv60plus-tvk.dtb \
        ste-ccu8540.dtb \
        ste-ccu9540.dtb
 +dtb-$(CONFIG_ARCH_UNIPHIER) += \
 +      uniphier-ph1-sld3-ref.dtb \
 +      uniphier-ph1-ld4-ref.dtb \
 +      uniphier-ph1-pro4-ref.dtb \
 +      uniphier-ph1-sld8-ref.dtb
  dtb-$(CONFIG_ARCH_VERSATILE) += \
        versatile-ab.dtb \
        versatile-pb.dtb
@@@ -669,7 -627,6 +670,7 @@@ dtb-$(CONFIG_ARCH_ZYNQ) += 
        zynq-zybo.dtb
  dtb-$(CONFIG_MACH_ARMADA_370) += \
        armada-370-db.dtb \
 +      armada-370-dlink-dns327l.dtb \
        armada-370-mirabox.dtb \
        armada-370-netgear-rn102.dtb \
        armada-370-netgear-rn104.dtb \
@@@ -679,8 -636,6 +680,8 @@@ dtb-$(CONFIG_MACH_ARMADA_375) += 
        armada-375-db.dtb
  dtb-$(CONFIG_MACH_ARMADA_38X) += \
        armada-385-db-ap.dtb \
 +      armada-385-linksys-caiman.dtb \
 +      armada-385-linksys-cobra.dtb \
        armada-388-db.dtb \
        armada-388-gp.dtb \
        armada-388-rd.dtb
@@@ -697,12 -652,12 +698,12 @@@ dtb-$(CONFIG_MACH_ARMADA_XP) += 
        armada-xp-openblocks-ax3-4.dtb \
        armada-xp-synology-ds414.dtb
  dtb-$(CONFIG_MACH_DOVE) += \
 -      dove-cm-a510.dtb \
        dove-cubox.dtb \
        dove-cubox-es.dtb \
        dove-d2plug.dtb \
        dove-d3plug.dtb \
 -      dove-dove-db.dtb
 +      dove-dove-db.dtb \
 +      dove-sbc-a510.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += \
        mt6589-aquaris5.dtb \
        mt6592-evb.dtb \
index 921de6605f075d878f407d925a5652195bd2b41d,044912558f4d96f8f7a127e2746d807cf4a99818..be2297116a1439bcdc8da56cde8b2c3e5c168092
        nand@0,0 {
                reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
                nand-bus-width = <16>;
 +              gpmc,device-width = <2>;
 +              ti,nand-ecc-opt = "sw";
  
                gpmc,sync-clk-ps = <0>;
                gpmc,cs-on-ns = <0>;
                };
        };
  };
+ &gpmc {
+       ranges = <6 0 0x2c000000 0x1000000>;       /* CS6: 16MB for DM9000 */
+       ethernet@0,0 {
+               compatible = "davicom,dm9000";
+               reg =  <6 0x000 2
+                       6 0x400 2>; /* CS6, offset 0 and 0x400, IO size 2 */
+               bank-width = <2>;
+               interrupt-parent = <&gpio1>;
+               interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
+               davicom,no-eeprom;
+               gpmc,mux-add-data = <0>;
+               gpmc,device-width = <1>;
+               gpmc,wait-pin = <0>;
+               gpmc,cycle2cycle-samecsen = <1>;
+               gpmc,cycle2cycle-diffcsen = <1>;
+               gpmc,cs-on-ns = <6>;
+               gpmc,cs-rd-off-ns = <180>;
+               gpmc,cs-wr-off-ns = <180>;
+               gpmc,adv-on-ns = <0>;
+               gpmc,adv-rd-off-ns = <18>;
+               gpmc,adv-wr-off-ns = <48>;
+               gpmc,oe-on-ns = <54>;
+               gpmc,oe-off-ns = <168>;
+               gpmc,we-on-ns = <54>;
+               gpmc,we-off-ns = <168>;
+               gpmc,rd-cycle-ns = <186>;
+               gpmc,wr-cycle-ns = <186>;
+               gpmc,access-ns = <144>;
+               gpmc,page-burst-access-ns = <24>;
+               gpmc,bus-turnaround-ns = <90>;
+               gpmc,cycle2cycle-delay-ns = <90>;
+               gpmc,wait-monitoring-ns = <0>;
+               gpmc,clk-activation-ns = <0>;
+               gpmc,wr-data-mux-bus-ns = <0>;
+               gpmc,wr-access-ns = <0>;
+       };
+ };