Commit ca7964a2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx6-dt-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt 

Merge "i.MX6 device tree changes for 3.15" from Shawn Guo:

 - A good number of new i.MX6 boards support: cm-fx6, dmo-edmqmx6,
   nitrogen6x, Gateworks Ventana gw5xxx family, DFI FS700-M60 and
   Zealz GK802
 - Update imx6q-sabrelite device tree and add Dual Lite/Solo support
 - Move pins that are used by particular client device out of hog group
 - Use GPIO_6 for FEC interrupt to workaround a hardware bug (ERR006687
   ENET: Only the ENET wake-up interrupt request can wake the system
   from Wait mode.)
 - Make pinctrl nodes board specific to avoid floating board specific
   device tree blob with so many unused pinctrl data
 - Use generic node name for fixed regulator
 - Update OPP table for cpufreq support
 - Random updates on various board device tree sources, adding pinctrl
   settings, device nodes, properties, etc.

* tag 'imx6-dt-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6: (62 commits)
  ARM: dts: imx6q: Add support for Zealz GK802
  ARM: dts: imx6: Add DFI FS700-M60 board support
  ARM: dts: imx6: use imx51-ssi
  ARM: dts: imx6qdl: Add mmc aliases
  ARM: dts: imx6q: Add spi4 alias
  ARM: dts: imx6qdl-sabreauto: Add LVDS support
  ARM: dts: imx6sl: add keypad support for i.mx6sl-evk board.
  ARM: dts: imx6sl: add ocram device support
  ARM: dts: imx6qdl: enable dma for spi
  ARM: dts: imx6qdl-sabresd: Add PFUZE100 support
  ARM: dts: imx6: add mxs phy controller id
  ARM: dts: imx6: add anatop phandle for usbphy
  ARM: dts: imx6q-arm2: use GPIO_6 for FEC interrupt.
  ARM: dts: imx6qdl-sabreauto: use GPIO_6 for FEC interrupt.
  ARM: dts: imx6qdl-sabrelite: use GPIO_6 for FEC interrupt.
  ARM: dts: imx6qdl: use interrupts-extended for fec
  ARM: dts: imx: pinfunc: add MX6QDL_PAD_GPIO_6__ENET_IRQ
  ARM: dts: imx6q-sabrelite: PHY reset is active-low
  ARM: dts: imx6: Use 'vddarm' as the regulator name
  ARM: dts: imx6qdl-sabresd: Add power key support
  ...
parents 6b43a284 69144bd7

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ cortina Cortina Systems, Inc. 
dallas	Maxim Integrated Products (formerly Dallas Semiconductor)

davicom	DAVICOM Semiconductor, Inc.

denx	Denx Software Engineering

dmo	Data Modul AG

edt	Emerging Display Technologies

emmicro	EM Microelectronic

epfl	Ecole Polytechnique Fédérale de Lausanne

arch/arm/boot/dts/Makefile

+17 −0
Original line number Diff line number Diff line
@@ -154,12 +154,29 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx53-qsb.dtb \

	imx53-smd.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 \

arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



#ifndef __DTS_V1__

#define __DTS_V1__

/dts-v1/;

#endif



#include "imx6dl.dtsi"

#include "imx6qdl-dfi-fs700-m60.dtsi"



/ {

	model = "DFI FS700-M60-6DL i.MX6dl Q7 Board";

	compatible = "dfi,fs700-m60-6dl", "dfi,fs700e-m60", "fsl,imx6dl";

};

arch/arm/boot/dts/imx6dl-gw51xx.dts

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2013 Gateworks Corporation

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/dts-v1/;

#include "imx6dl.dtsi"

#include "imx6qdl-gw51xx.dtsi"



/ {

	model = "Gateworks Ventana i.MX6 DualLite GW51XX";

	compatible = "gw,imx6dl-gw51xx", "gw,ventana", "fsl,imx6dl";

};

arch/arm/boot/dts/imx6dl-gw52xx.dts

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2013 Gateworks Corporation

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/dts-v1/;

#include "imx6dl.dtsi"

#include "imx6qdl-gw52xx.dtsi"



/ {

	model = "Gateworks Ventana i.MX6 DualLite GW52XX";

	compatible = "gw,imx6dl-gw52xx", "gw,ventana", "fsl,imx6dl";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE