Commit aae31813 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-dt-4.6' of... 

Merge tag 'imx-dt-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt2

Merge "i.MX device tree updates for 4.6" from Shawn Guo:

- New i.MX6 board support: NXP/Freescale imx6qp boards, Advantech/GE,
  Uniwest evi, Engicam IMX6 Q7, Toradex Apalis SoM and Ixora carrier
  boards
- Relicense vf610 dts files under GPLv2/X11
- A patch series from Stefan updating Vybrid Colibri board support with
  PMU, regulators and other devices enabled
- Correct PWM pinmux for Ventana boards and add more pinmux for GW54xx
- Clean up imx6q-tbs2910 dts file and add SATA PHY configuration
- A series from Russell cleaning up hummingboard dts files
- A series from Lothar updating Ka-Ro i.MX28, i.MX53 and i.MX6 boards
  to use better audio codec frequency and display configurations
- Clean up whitespaces in i.MX6UL pinctrl header and add more devices
  support for the SoC
- Other random dts updates to enable various devices

* tag 'imx-dt-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (75 commits)
  ARM: dts: imx53-qsb: Fix gpio button polarity
  ARM: dts: vfxxx: Add DAC node for Vybrid SoC
  ARM: dts: imx6q: add missing links between ipu2 and mipi dsi
  ARM: dts: imx: Add support for Advantech/GE B850v3
  ARM: dts: imx: Add support for Advantech/GE B650v3
  ARM: dts: imx: Add support for Advantech/GE B450v3
  ARM: dts: imx: Add support for Advantech/GE Bx50v3
  ARM: dts: imx: Add Advantech BA-16 Qseven module
  of: Add vendor prefix for General Electric Company
  of: Add vendor prefix for Advantech Corporation
  ARM: dts: imx35.dtsi: change the clock information for usb
  ARM: dts: imx25.dtsi: change the clock information for usb
  ARM: dts: imx6ul: add kpp support
  ARM: dts: imx6ul: add gpmi support
  ARM: dts: imx6ul: add lcdif support
  ARM: dts: imx6ul: add sai support
  ARM: dts: imx6ul: add flexcan support
  ARM: dts: imx6ul: add sdma support
  ARM: dts: imx6ul: add pwm[1-4] nodes
  ARM: dts: imx6ul: disable PWMs by default
  ...
parents 388f7b1d 3631c597

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ ad Avionic Design GmbH 
adapteva	Adapteva, Inc.

adh	AD Holdings Plc.

adi	Analog Devices, Inc.

advantech	Advantech Corporation

aeroflexgaisler	Aeroflex Gaisler AB

al	Annapurna Labs

allwinner	Allwinner Technology Co., Ltd.
@@ -87,6 +88,7 @@ fcs Fairchild Semiconductor 
firefly	Firefly

focaltech	FocalTech Systems Co.,Ltd

fsl	Freescale Semiconductor

ge	General Electric Company

GEFanuc	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

geniatech	Geniatech, Inc.

arch/arm/boot/dts/Makefile

+9 −1
Original line number Diff line number Diff line
@@ -317,12 +317,17 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-udoo.dtb \

	imx6dl-wandboard.dtb \

	imx6dl-wandboard-revb1.dtb \

	imx6q-apalis-ixora.dtb \

	imx6q-apf6dev.dtb \

	imx6q-arm2.dtb \

	imx6q-b450v3.dtb \

	imx6q-b650v3.dtb \

	imx6q-b850v3.dtb \

	imx6q-cm-fx6.dtb \

	imx6q-cubox-i.dtb \

	imx6q-dfi-fs700-m60.dtb \

	imx6q-dmo-edmqmx6.dtb \

	imx6q-evi.dtb \

	imx6q-gk802.dtb \

	imx6q-gw51xx.dtb \

	imx6q-gw52xx.dtb \
@@ -332,6 +337,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-gw551x.dtb \

	imx6q-gw552x.dtb \

	imx6q-hummingboard.dtb \

	imx6q-icore-rqs.dtb \

	imx6q-nitrogen6x.dtb \

	imx6q-nitrogen6_max.dtb \

	imx6q-novena.dtb \
@@ -349,7 +355,9 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-tx6q-1110.dtb \

	imx6q-udoo.dtb \

	imx6q-wandboard.dtb \

	imx6q-wandboard-revb1.dtb

	imx6q-wandboard-revb1.dtb \

	imx6qp-sabreauto.dtb \

	imx6qp-sabresd.dtb

dtb-$(CONFIG_SOC_IMX6SL) += \

	imx6sl-evk.dtb \

	imx6sl-warp.dtb

arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
			label = "BP1";

			gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;

			linux,code = <BTN_MISC>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};

arch/arm/boot/dts/imx25.dtsi

+30 −7
Original line number Diff line number Diff line
@@ -269,14 +269,37 @@ 
				status = "disabled";

			};



			tsc: tsc@50030000 {

				compatible = "fsl,imx25-adc", "fsl,imx21-tsc";

				reg = <0x50030000 0x4000>;

			tscadc: tscadc@50030000 {

				compatible = "fsl,imx25-tsadc";

				reg = <0x50030000 0xc>;

				interrupts = <46>;

				clocks = <&clks 119>;

				clock-names = "ipg";

				interrupt-controller;

				#interrupt-cells = <1>;

				#address-cells = <1>;

				#size-cells = <1>;

				status = "disabled";



				adc: adc@50030800 {

					compatible = "fsl,imx25-gcq";

					reg = <0x50030800 0x60>;

					interrupt-parent = <&tscadc>;

					interrupts = <1>;

					#address-cells = <1>;

					#size-cells = <0>;

					status = "disabled";

				};



				tsc: tcq@50030400 {

					compatible = "fsl,imx25-tcq";

					reg = <0x50030400 0x60>;

					interrupt-parent = <&tscadc>;

					interrupts = <0>;

					fsl,wires = <4>;

					status = "disabled";

				};

			};



			ssi1: ssi@50034000 {

				#sound-dai-cells = <0>;
@@ -497,7 +520,8 @@ 
				compatible = "fsl,imx25-usb", "fsl,imx27-usb";

				reg = <0x53ff4000 0x0200>;

				interrupts = <37>;

				clocks = <&clks 70>;

				clocks = <&clks 9>, <&clks 70>, <&clks 8>;

				clock-names = "ipg", "ahb", "per";

				fsl,usbmisc = <&usbmisc 0>;

				fsl,usbphy = <&usbphy0>;

				status = "disabled";
@@ -507,7 +531,8 @@ 
				compatible = "fsl,imx25-usb", "fsl,imx27-usb";

				reg = <0x53ff4400 0x0200>;

				interrupts = <35>;

				clocks = <&clks 70>;

				clocks = <&clks 9>, <&clks 70>, <&clks 8>;

				clock-names = "ipg", "ahb", "per";

				fsl,usbmisc = <&usbmisc 1>;

				fsl,usbphy = <&usbphy1>;

				status = "disabled";
@@ -516,8 +541,6 @@ 
			usbmisc: usbmisc@53ff4600 {

				#index-cells = <1>;

				compatible = "fsl,imx25-usbmisc";

				clocks = <&clks 9>, <&clks 70>, <&clks 8>;

				clock-names = "ipg", "ahb", "per";

				reg = <0x53ff4600 0x00f>;

			};

arch/arm/boot/dts/imx28-apf28dev.dts

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ 
			label = "User button";

			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;

			linux,code = <0x100>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE