Merge tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...

Merge "qcom DT changes for v3.18-3" from Kumar Gala:

Qualcomm ARM Based Device Tree Updates for v3.18-3

* Added Board support for CM-QS600 and Sony Xperia Z1 phone
* Added SATA support on IPQ8064/AP148

* tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: dts: qcom: add CM-QS600 board
  ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone
  ARM: dts: qcom: Add SATA support on IPQ8064/AP148

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index c7bb11be15a38ce36482bd68e93427293b064d18,d3a45796d249467e723a2d5abb15af406810f5a2..723999d737445274728bedde163d3534ca62339c
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -14,7 -14,6 +14,7 @@@ allwinner     Allwinner Technology Co., Ltd
  altr  Altera Corp.
  amcc  Applied Micro Circuits Corporation (APM, formally AMCC)
  amd   Advanced Micro Devices (AMD), Inc.
 +amlogic       Amlogic, Inc.
  ams   AMS AG
  amstaos       AMS-Taos Inc.
  apm   Applied Micro Circuits Corporation (APM)
@@@ -30,7 -29,6 +30,7 @@@ calxeda       Calxed
  capella       Capella Microsystems, Inc
  cavium        Cavium, Inc.
  cdns  Cadence Design Systems Inc.
 +chipidea      Chipidea, Inc
  chrp  Common Hardware Reference Platform
  chunghwa      Chunghwa Picture Tubes Ltd.
  cirrus        Cirrus Logic, Inc.
@@@ -40,30 -38,24 +40,30 @@@ dallas     Maxim Integrated Products (forme
  davicom       DAVICOM Semiconductor, Inc.
  denx  Denx Software Engineering
  digi  Digi International Inc.
 +dlg   Dialog Semiconductor
  dlink D-Link Corporation
  dmo   Data Modul AG
  ebv   EBV Elektronik
  edt   Emerging Display Technologies
  emmicro       EM Microelectronic
 +energymicro   Silicon Laboratories (formerly Energy Micro AS)
  epcos EPCOS AG
  epfl  Ecole Polytechnique Fédérale de Lausanne
  epson Seiko Epson Corp.
  est   ESTeem Wireless Modems
  eukrea  Eukréa Electromatique
 +everest       Everest Semiconductor Co. Ltd.
  excito        Excito
 +fcs   Fairchild Semiconductor
  fsl   Freescale Semiconductor
  GEFanuc       GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  gef   GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 +geniatech     Geniatech, Inc.
  globalscale   Globalscale Technologies, Inc.
  gmt   Global Mixed-mode Technology, Inc.
  google        Google, Inc.
  gumstix       Gumstix, Inc.
 +gw    Gateworks Corporation
  haoyu Haoyu Microelectronic Co. Ltd.
  hisilicon     Hisilicon Limited.
  honeywell     Honeywell
@@@ -73,7 -65,6 +73,7 @@@ ibm   International Business Machines (IB
  idt   Integrated Device Technologies, Inc.
  iom   Iomega Corporation
  img   Imagination Technologies Ltd.
 +innolux       Innolux Corporation
  intel Intel Corporation
  intercontrol  Inter Control Group
  isee  ISEE 2007 S.L.
@@@ -92,7 -83,6 +92,7 @@@ maxim Maxim Integrated Product
  mediatek      MediaTek Inc.
  micrel        Micrel Inc.
  microchip     Microchip Technology Inc.
 +mitsubishi    Mitsubishi Electric Corporation
  mosaixtech    Mosaix Technologies, Inc.
  moxa  Moxa
  mpl   MPL AG
@@@ -134,24 -124,22 +134,25 @@@ sil     Silicon Imag
  silabs        Silicon Laboratories
  simtek
  sii   Seiko Instruments, Inc.
 +silergy       Silergy Corp.
  sirf  SiRF Technology, Inc.
 +sitronix      Sitronix Technology Corporation
  smsc  Standard Microsystems Corporation
  snps  Synopsys, Inc.
  solidrun      SolidRun
+ sony  Sony Corporation
  spansion      Spansion Inc.
  st    STMicroelectronics
  ste   ST-Ericsson
  stericsson    ST-Ericsson
  synology      Synology, Inc.
 +thine THine Electronics, Inc.
  ti    Texas Instruments
  tlm   Trusted Logic Mobility
  toradex       Toradex AG
  toshiba       Toshiba Corporation
  toumaz        Toumaz
 -usi   Universal Scientifc Industrial Co., Ltd.
 +usi   Universal Scientific Industrial Co., Ltd.
  v3    V3 Semiconductor
  variscite     Variscite Ltd.
  via   VIA Technologies, Inc.
@@@ -160,7 -148,6 +161,7 @@@ winbond Winbond Electronics corp
  wlf   Wolfson Microelectronics
  wm    Wondermedia Technologies, Inc.
  xes   Extreme Engineering Solutions (X-ES)
 +xillybus      Xillybus Ltd.
  xlnx  Xilinx
  zyxel ZyXEL Communications Corp.
  zarlink       Zarlink Semiconductor

diff --combined arch/arm/boot/dts/Makefile
index 7c80af9068976b11ceb0fcef749adf2738d80273,91aa4766e3ce8aa83f05856aea9f5e64f523fe84..38c89cafa1ab8ea3ee682b8ccb0c02af8739f785
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -48,14 -48,11 +48,14 @@@ dtb-$(CONFIG_ARCH_AT91)    += sama5d33ek.d
  dtb-$(CONFIG_ARCH_AT91)       += sama5d34ek.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d35ek.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d36ek.dtb
 +# sama5d4
 +dtb-$(CONFIG_ARCH_AT91)       += at91-sama5d4ek.dtb
  
  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
  dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
 +dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
        bcm21664-garnet.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
@@@ -93,7 -90,6 +93,7 @@@ dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4
  dtb-$(CONFIG_ARCH_HIX5HD2) += hisi-x5hd2-dkb.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
        ecx-2000.dtb
 +dtb-$(CONFIG_ARCH_HIP04) += hip04-d01.dtb
  dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
        integratorcp.dtb
  dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
@@@ -148,8 -144,8 +148,8 @@@ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood
        kirkwood-openrd-client.dtb \
        kirkwood-openrd-ultimate.dtb \
        kirkwood-rd88f6192.dtb \
 -      kirkwood-rd88f6281-a0.dtb \
 -      kirkwood-rd88f6281-a1.dtb \
 +      kirkwood-rd88f6281-z0.dtb \
 +      kirkwood-rd88f6281-a.dtb \
        kirkwood-rs212.dtb \
        kirkwood-rs409.dtb \
        kirkwood-rs411.dtb \
@@@ -163,11 -159,8 +163,11 @@@
        kirkwood-ts419-6282.dtb
  dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 +dtb-$(CONFIG_MACH_MESON6) += meson6-atv1200.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
  dtb-$(CONFIG_ARCH_MXC) += \
 +      imx1-ads.dtb \
 +      imx1-apf9328.dtb \
        imx25-eukrea-mbimxsd25-baseboard.dtb \
        imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dtb \
        imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dtb \
@@@ -206,7 -199,6 +206,7 @@@
        imx6dl-gw52xx.dtb \
        imx6dl-gw53xx.dtb \
        imx6dl-gw54xx.dtb \
 +      imx6dl-gw552x.dtb \
        imx6dl-hummingboard.dtb \
        imx6dl-nitrogen6x.dtb \
        imx6dl-phytec-pbab01.dtb \
@@@ -231,8 -223,6 +231,8 @@@
        imx6q-gw53xx.dtb \
        imx6q-gw5400-a.dtb \
        imx6q-gw54xx.dtb \
 +      imx6q-gw552x.dtb \
 +      imx6q-hummingboard.dtb \
        imx6q-nitrogen6x.dtb \
        imx6q-phytec-pbab01.dtb \
        imx6q-rex-pro.dtb \
@@@ -250,7 -240,7 +250,7 @@@
        imx6q-tx6q-1110.dtb \
        imx6sl-evk.dtb \
        imx6sx-sdb.dtb \
 -      vf610-colibri.dtb \
 +      vf610-colibri-eval-v3.dtb \
        vf610-cosmic.dtb \
        vf610-twr.dtb
  dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
@@@ -296,11 -286,7 +296,11 @@@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-cran
        omap3-devkit8000.dtb \
        omap3-evm.dtb \
        omap3-evm-37xx.dtb \
 -      omap3-gta04.dtb \
 +      omap3-gta04a3.dtb \
 +      omap3-gta04a4.dtb \
 +      omap3-gta04a5.dtb \
 +      omap3-ha.dtb \
 +      omap3-ha-lcd.dtb \
        omap3-igep0020.dtb \
        omap3-igep0030.dtb \
        omap3-ldp.dtb \
@@@ -323,7 -309,6 +323,7 @@@
        omap3-sbc-t3517.dtb \
        omap3-sbc-t3530.dtb \
        omap3-sbc-t3730.dtb \
 +      omap3-thunder.dtb \
        omap3-zoom3.dtb
  dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
        am335x-bone.dtb \
@@@ -354,13 -339,15 +354,15 @@@ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-l
        orion5x-rd88f5182-nas.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_QCOM) += \
+       qcom-apq8064-cm-qs600.dtb \
        qcom-apq8064-ifc6410.dtb \
        qcom-apq8074-dragonboard.dtb \
        qcom-apq8084-ifc6540.dtb \
        qcom-apq8084-mtp.dtb \
        qcom-ipq8064-ap148.dtb \
        qcom-msm8660-surf.dtb \
-       qcom-msm8960-cdp.dtb
+       qcom-msm8960-cdp.dtb \
+       qcom-msm8974-sony-xperia-honami.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3066a-bqcurie2.dtb \
        rk3188-radxarock.dtb \
@@@ -378,6 -365,7 +380,6 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
        r8a7778-bockw-reference.dtb \
 -      r8a7740-armadillo800eva-reference.dtb \
        r8a7779-marzen.dtb \
        r8a7791-koelsch.dtb \
        r8a7790-lager.dtb \
@@@ -388,12 -376,10 +390,12 @@@
        sh7372-mackerel.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
 +      r8a7740-armadillo800eva.dtb \
        r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
        r8a7790-lager.dtb \
 -      r8a7779-marzen.dtb
 +      r8a7779-marzen.dtb \
 +      r8a7794-alt.dtb
  dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_sockit.dtb \
@@@ -424,7 -410,6 +426,7 @@@ dtb-$(CONFIG_MACH_SUN4I) += 
  dtb-$(CONFIG_MACH_SUN5I) += \
        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
  dtb-$(CONFIG_MACH_SUN6I) += \
@@@ -435,9 -420,7 +437,9 @@@
  dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-cubieboard2.dtb \
        sun7i-a20-cubietruck.dtb \
 +      sun7i-a20-hummingbird.dtb \
        sun7i-a20-i12-tvbox.dtb \
 +      sun7i-a20-olinuxino-lime.dtb \
        sun7i-a20-olinuxino-micro.dtb \
        sun7i-a20-pcduino3.dtb
  dtb-$(CONFIG_MACH_SUN8I) += \
@@@ -461,7 -444,6 +463,7 @@@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-har
        tegra114-roth.dtb \
        tegra114-tn7.dtb \
        tegra124-jetson-tk1.dtb \
 +      tegra124-nyan-big.dtb \
        tegra124-venice2.dtb
  dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
  dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
@@@ -513,7 -495,6 +515,7 @@@ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510
        dove-d2plug.dtb \
        dove-d3plug.dtb \
        dove-dove-db.dtb
 +dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb
  
  targets += dtbs dtbs_install
  targets += $(dtb-y)