Commit 11dd5438 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

 - New SoC device tree support for imx35 and imx50
 - A good number of new board support: imx25-eukrea, imx28-duckbill,
   imx28-eukrea, Eukrea cpuimx35, imx50-evk, imx51-eukrea, imx53-voipac,
   MCIMX53-START-R and Ka-Ro TX53.
 - Quite some updates and tweaking on imx27 phycore and apf27dev boards
 - Add pinfunc headers for imx25, imx27 and imx50
 - 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
 - Use clock defines in imx5 DTS files
 - Use macros for interrupt and gpio flags
 - A plenty of random updates on various SoC and board device tree
   sources, adding pinctrl settings, device nodes, properties, aliases.

* tag 'imx-dt-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6: (89 commits)
  ARM: dts: imx28-m28cu3: Remove 'reset-active-high'
  ARM: dts: imx5: use imx51-ssi
  ARM: dts: imx51: Add mmc aliases
  ARM: dts: imx53: Add mmc aliases
  ARM: dts: imx53: add support for Ka-Ro TX53 modules
  ARM: dts: Add support for the cpuimx35 board from Eukrea and its baseboard.
  ARM: dts: imx28-apf28dev: add user button
  ARM: dts: i.MX51: Switch to use standard definitions for input subsystem
  ARM: dts: i.MX53: add support for MCIMX53-START-R
  ARM: dts: i.MX53: move common QSB nodes to new file
  ARM: dts: imx53-evk: Remove board support
  ARM: dts: vf610: use the interrupt macros
  ARM: dts: imx53: Add gpio and input dt includes.
  ARM: dts: i.MX27: Add SSI nodes
  ARM: dts: mxs: add mxs phy controller id
  ARM: dts: imx27-phytec-phycore-rdk: Add pinctrl definitions for WEIM
  ARM: dts: imx27-phytec-phycore-rdk: Add pingrp for SDHC
  ARM: dts: imx27-phytec-phycore-som: Add spi-cs-high property to PMIC
  ARM: dts: imx27-phytec-phycore-rdk: Enable 1-Wire module
  ARM: dts: imx27-phytec-phycore-som: Add NFC pin group
  ...
parents ca7964a2 ee97d154

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ emmicro EM Microelectronic 
epfl	Ecole Polytechnique Fédérale de Lausanne

epson	Seiko Epson Corp.

est	ESTeem Wireless Modems

eukrea  Eukréa Electromatique

fsl	Freescale Semiconductor

GEFanuc	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.
@@ -92,6 +93,7 @@ toshiba Toshiba Corporation 
toumaz	Toumaz

v3	V3 Semiconductor

via	VIA Technologies, Inc.

voipac	Voipac Technologies s.r.o.

winbond Winbond Electronics corp.

wlf	Wolfson Microelectronics

wm	Wondermedia Technologies, Inc.

arch/arm/boot/dts/Makefile

+11 −2
Original line number Diff line number Diff line
@@ -134,25 +134,31 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.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 \
@@ -200,6 +206,9 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ 
	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 \

arch/arm/boot/dts/imx23-evk.dts

+6 −2
Original line number Diff line number Diff line
@@ -127,17 +127,21 @@ 


	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_vddio_sd0: vddio-sd0 {

		reg_vddio_sd0: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "vddio-sd0";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio1 29 0>;

		};



		reg_lcd_3v3: lcd-3v3 {

		reg_lcd_3v3: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "lcd-3v3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

arch/arm/boot/dts/imx23-olinuxino.dts

+4 −1
Original line number Diff line number Diff line
@@ -100,9 +100,12 @@ 


	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_usb0_vbus: usb0_vbus {

		reg_usb0_vbus: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "usb0_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

arch/arm/boot/dts/imx23-stmp378x_devb.dts

+4 −1
Original line number Diff line number Diff line
@@ -66,9 +66,12 @@ 


	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_vddio_sd0: vddio-sd0 {

		reg_vddio_sd0: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "vddio-sd0";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE