Merge branch 'topic/lt-3.2-imx6-display' into lt-3.2-imx6

* topic/lt-3.2-imx6-display: (36 commits)
  input: add device tree support for eGalax touch
  input: add support for egalax touch screen controller
  imx6q-sabrelite: switch framebuffer order of HDMI and LVDS
  mxc: hdmi: fix potention deadlock issue
  ARM: imx6q-sabrelite: set DDC i2c rate to 100k
  ENGR00170800 mxc hdmi add more video mode to default modelist
  ENGR00170534 mxc hdmi: hot-plug detect state notify and recording
  ENGR00169872-2 rework hdmi initialization and hotplug sequence
  ENGR00169872-1 rework hdmi initialization and hotplug sequence
  ENGR00170168-2 mxc_vout: add non FB_VMODE_YWRAP support
  ENGR00170168-1 ipuv3 fb: add non FB_VMODE_YWRAP support
  ENGR00169657 mxc_edid: no aspect vmode setting for detailed timing block
  ENGR00163669-1 mxc fb: remove FB_EVENT_PREMODE_CHANGE for mxc fb drivers
  ENGR00169509-2 ipuv3 fb: change wait for vsync ioctl irq from eof to nfack
  ENGR00169509-1 ipuv3 fb: change wait for vsync ioctl irq from eof to nfack
  ENGR00163616 [mx6q]hdmi will hang in daily build image
  SAUCE: fix hdmi registration failure
  MXC SRC: refine IPU VPU reset function
  mxc hdmi core: add Kconfig dependency of MXC_IPU
  imx6: change ipu_perclk to 8.25M according to fsl branch
  ...

Conflicts:
	arch/arm/boot/dts/imx6q-sabrelite.dts
	arch/arm/boot/dts/imx6q.dtsi
	arch/arm/mach-imx/clock-imx6q.c
	arch/arm/mach-imx/mach-imx6q.c

2 files changed, 123 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index fbe43d6cf37..fe2d320275a 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -23,6 +23,13 @@
 
 	soc {
 		aips-bus@02000000 { /* AIPS1 */
+			ldb@020e0000 {
+				disp-pwr-gpios = <&gpio1 0 0>; /* gpio2 0 */
+				mode = "sin0";
+				ext_ref = "true";
+				lvds0 = <1 0>;
+			};
+
 			wdog@020bc000 { /* WDOG1 */
 				status = "okay";
 			};
@@ -50,6 +57,87 @@
 			uart2: uart@021e8000 {
 				status = "okay";
 			};
+
+			i2c@021a4000 { /* I2C2 */
+				status = "okay";
+				clock-frequency = <100000>;
+
+				ddc: ddc@50 {
+					compatible = "fsl,imx6q-hdmi-ddc";
+					reg = <0x50>;
+				};
+			};
+
+			i2c@021a8000 { /* I2C3 */
+				status = "okay";
+				clock-frequency = <400000>;
+
+				egalax@04 {
+					compatible = "eeti,egalax";
+					reg = <0x04>;
+					interrupt-parent = <&gpio1>;
+					interrupts = <9>;
+					interrupt-gpio = <&gpio1 9 0>;
+				};
+			};
+		};
+
+		hdmi@0x00120000 { /* HDMI */
+			ipu = <0>;
+			di = <0>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		debug-led {
+			label = "Heartbeat";
+			gpios = <&gpio2 25 0>; /* GPIO3_25 */
+			linux,default-trigger = "heartbeat";
+		};
+	};
+
+	backlight {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "simple-bus";
+
+		pwm_bl {
+			compatible = "pwm-bl";
+			pwm-parent = <&pwm4>;
+			max_brightness = <255>;
+			dft_brightness = <128>;
+			pwm_period_ns = <50000>;
+		};
+	};
+
+	displays {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		ranges;
+
+		disp1: fb@0 {
+			compatible = "fsl,mxcfb-ipuv3";
+			disp_dev = "ldb";
+			interface_pix_fmt = "RGB666";
+			mode_str = "LDB-XGA";
+			internal_clk = "false";
+			reg = <0x00000000 0x0>;	/* reserve fb mem */
+		};
+
+		disp2: fb@1 {
+			compatible = "fsl,mxcfb-ipuv3";
+			disp_dev = "hdmi";
+			interface_pix_fmt = "RGB24";
+			mode_str = "1280x720M@60";
+			internal_clk = "false";
+			reg = <0x00000001 0x0>;	/* reserve fb mem */
+		};
+
+		v4l2-out@0 {
+			compatible = "fsl,vout_ipuv3";
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 0f8b104476b..8ba41e06a4e 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -210,30 +210,35 @@
 			};
 
 			vpu@02040000 {
+				compatible = "fsl,vpu";
 				reg = <0x02040000 0x3c000>;
-				interrupts = <0 3 0x04 0 12 0x04>;
+				interrupts = <0 12 0x04 0 3 0x04>;
 			};
 
 			aipstz@0207c000 { /* AIPSTZ1 */
 				reg = <0x0207c000 0x4000>;
 			};
 
-			pwm@02080000 { /* PWM1 */
+			pwm1: pwm@02080000 { /* PWM1 */
+				compatible = "fsl,imx6q-pwm";
 				reg = <0x02080000 0x4000>;
 				interrupts = <0 83 0x04>;
 			};
 
-			pwm@02084000 { /* PWM2 */
+			pwm2: pwm@02084000 { /* PWM2 */
+				compatible = "fsl,imx6q-pwm";
 				reg = <0x02084000 0x4000>;
 				interrupts = <0 84 0x04>;
 			};
 
-			pwm@02088000 { /* PWM3 */
+			pwm3: pwm@02088000 { /* PWM3 */
+				compatible = "fsl,imx6q-pwm";
 				reg = <0x02088000 0x4000>;
 				interrupts = <0 85 0x04>;
 			};
 
-			pwm@0208c000 { /* PWM4 */
+			pwm4: pwm@0208c000 { /* PWM4 */
+				compatible = "fsl,imx6q-pwm";
 				reg = <0x0208c000 0x4000>;
 				interrupts = <0 86 0x04>;
 			};
@@ -398,6 +403,11 @@
 				reg = <0x020e0000 0x4000>;
 			};
 
+			ldb@020e0000 {
+				compatible = "fsl,imx6q-ldb";
+				reg = <0x020e0000 0x4>;
+			};
+
 			dcic@020e4000 { /* DCIC1 */
 				reg = <0x020e4000 0x4000>;
 				interrupts = <0 124 0x04>;
@@ -585,6 +595,26 @@
 			};
 		};
 
+		hdmi@0x00120000 { /* HDMI */
+			compatible = "fsl,imx6q-hdmi-core";
+			reg = <0x00120000 0x9000>;
+			interrupts = <0 115 0x04 0 116 0x04>;
+		};
+
+		ipu@0x02400000 { /* IPU1 */
+			compatible = "fsl,ipuv3";
+			reg = <0x02400000 0x400000>;
+			interrupts = <0 5 0x04 0 6 0x04>;
+			revision = <4>;
+		};
+
+		ipu@0x02800000 { /* IPU2 */
+			compatible = "fsl,ipuv3";
+			reg = <0x02800000 0x400000>;
+			interrupts = <0 7 0x04 0 8 0x04>;
+			revision = <4>;
+		};
+
 		galcore@virtual {
 			compatible = "viv,galcore";
 			reg = <0x00130000 0x4000>, /* gc2000 */