linux-toradex.git/include/linux/mxcfb.h, branch kk4.4.2_1.0.0-beta

Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.1.0' into imx_3.0.35_android

2013-07-15T07:01:21+00:00

Conflicts:
	arch/arm/mach-mx6/Kconfig
	arch/arm/mach-mx6/board-mx6q_arm2.c
	arch/arm/mach-mx6/board-mx6q_arm2.h
	arch/arm/mach-mx6/board-mx6q_hdmidongle.c
	arch/arm/mach-mx6/board-mx6q_sabreauto.c
	arch/arm/mach-mx6/board-mx6q_sabreauto.h
	arch/arm/mach-mx6/board-mx6q_sabrelite.c
	arch/arm/mach-mx6/board-mx6q_sabresd.c
	arch/arm/mach-mx6/board-mx6q_sabresd.h
	arch/arm/mach-mx6/clock.c
	arch/arm/mach-mx6/pcie.c
	arch/arm/plat-mxc/include/mach/iomux-mx6q.h
	arch/arm/plat-mxc/include/mach/pcie.h
	drivers/dma/imx-sdma.c
	drivers/input/touchscreen/egalax_ts.c
	drivers/media/video/mxc/capture/csi_v4l2_capture.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
	drivers/mxc/mlb/mxc_mlb150.c
	drivers/mxc/thermal/thermal.c
	drivers/net/fec.c
	drivers/usb/host/ehci-arc.c
	drivers/video/mxc/mxc_ipuv3_fb.c
	include/linux/fec.h
	sound/soc/imx/imx-wm8962.c

ENGR00263553 fb: Change type uint to unsigned int in struct mxcfb_update_data

2013-07-11T03:01:29+00:00

This file could be included in user-space application while uint is not quite
standard type. This patch changed to unsigned int to avoid to include specific
header file. This is requested from mm team.

Signed-off-by: Robby Cai 
(cherry picked from commit 318a325b8c19d1ba7c1451797da5a161e787c64d)

Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android

2013-02-27T05:32:17+00:00

Conflicts:
	arch/arm/mach-mx6/Makefile
	arch/arm/mach-mx6/board-mx6dl_hdmidongle.h
	arch/arm/mach-mx6/board-mx6q_hdmidongle.c
	arch/arm/mach-mx6/board-mx6q_hdmidongle.h
	arch/arm/mach-mx6/board-mx6q_sabreauto.c
	arch/arm/mach-mx6/board-mx6q_sabrelite.c
	drivers/media/video/mxc/capture/csi_v4l2_capture.c
	drivers/media/video/mxc/capture/ipu_csi_enc.c
	drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
	drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
	drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
	drivers/mxc/vpu/mxc_vpu.c
	drivers/usb/gadget/arcotg_udc.c
	drivers/video/mxc/mxc_ipuv3_fb.c
	drivers/video/mxc_hdmi.c
	include/linux/mxcfb.h
	sound/soc/imx/imx-wm8962.c

ENGR00251015-1 FB/IPU: Add mxcfb ioctrl to update IPU DP CSC matrix

2013-02-20T05:52:55+00:00

Add mxcfb ioctrl MXCFB_CSC_UPDATE to update IPU DP CSC matrix
for display adjustment.
This patch defines the ioctrl interface in header file.

Signed-off-by: Wayne Zou

ENGR00229430 - Return New Frame IRQ timestamp from MXCFB_WAIT_FOR_VSYNC

2012-10-19T00:35:36+00:00

The Vsync IRQ timestamp is needed to synchronize applications with
the actual Vsync event time.
Change the IOCTL from write to read.

Signed-off-by: Oliver Brown

Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android

2012-10-09T08:47:47+00:00

Conflicts:
	arch/arm/configs/imx6s_updater_defconfig
	arch/arm/include/asm/hardware/coresight.h
	arch/arm/kernel/etm.c
	arch/arm/mach-mx6/board-mx6q_sabresd.c
	arch/arm/mach-mx6/cpu_op-mx6.c
	arch/arm/mach-mx6/mx6_suspend.S
	arch/arm/mach-mx6/pm.c
	arch/arm/mach-mx6/system.c
	arch/arm/plat-mxc/cpufreq.c
	drivers/mfd/mxc-hdmi-core.c
	drivers/power/sabresd_battery.c
	drivers/video/mxc/mxc_ipuv3_fb.c
	drivers/video/mxc_hdmi.c
	include/linux/mfd/mxc-hdmi-core.h

ENGR00225960-02 FB: Support sii902x HDMI driver in ELCDIF FB

2012-09-29T06:49:59+00:00

- Added mxcfb_elcdif_register_mode function.
- Create video mode list, and check default video mode
with video mode list before setting.
- Adjust elcdif pixel clock setting, reconfig elcdif pixel
parent clock video pll, get more accurate pixel clock
according video mode.
- Added video mode dump function for debug

Signed-off-by: Sandor Yu

ENGR00221594 Add Dithering algorism support into EPDC driver

2012-09-19T16:17:48+00:00

Adding Atkinson's dithering alorism implementation into our EPDC
Driver with Y8->Y1 and Y8->Y4 supported. Two EPDC flags have been
added to support the features. EPDC_FLAG_USE_DITHERING_Y1 and
EPDC_FLAG_USE_DITHERING_Y4.

Signed-off-by: Daiyu Ko

ENGR00219910 IPUv3 fb: add vsync event report to user space.

2012-08-17T11:16:34+00:00

add vsync uevent report for user space.
add a IOCTL to enable/disable vsync uevent report to user space.

VSYNC uevent can let user space start draw just receive VSYNC irq,
and keep the draw within 16.7 ms that make the draw will show in
this frame, enhance the draw speed after receive input event.

Signed-off-by: Zhang Jiejing

ENGR00210075-3 - SPDC: Add Sipix driver

2012-07-20T05:37:55+00:00

Add Sipix driver for electronic paper dispaly
- Support RGB565 & Y4 formats with 800x600 resolution
- Support synchronization update by waiting the last
  request update completed.
- Support automated update using Linux deferred io mechanism
- Support for panning(y-direction)
- Support rotation with 90,180,and 270 degree.
- Initial integration with ePXP, output Y4 format
- Support specific waveform modes update.
- Support Snapshot, Queue and Queue Merge update sheeme.
- Support full and partial EPD screen updates.
  mode_1 & mode_2: partial update
  mode_0 & mode_3: full update
- Align waveform mode with EPDC as below:
  mode_init = mode_0;
  mode_gc4  = mode_2;
  mode_A2   = mode_4, mode_du =mode_4;
  mode_gc8  = mode_1, mode_gc16 = mode_1, mode_gc32 = mode_1;

Signed-off-by: Fugang Duan