PD #98085 H.264 video decoder: Error frame display control moved out of ucode. Avoid entering video PTS discontinious process when error frames last more than discontinue threshold.

Change-Id: Iea1dc903e4480d6957d6dd386f750a62441ffc77

Change-Id: I395fb100747b634626555a962e0a72c7e0ba49f9

Change-Id: I1659af4e08f3a78c087572078399d9ce4f8b9482

PD #94872-2. H264 video decoder: Use kfifo API and code clean up for HLS resolution switching. Fix sync fense frame generation condition.

Change-Id: I72c83dd53924ae4464fda222653c3eeb50d5618a

Change-Id: I3863c01bb337a30f9bdd9db036c2492ba78fcc42

Change-Id: I98ec2367e3092848e2e597f8edff8aac448e444e

Change-Id: Ie4f19fb2fdf436c2f72da23507a4cc817796188d

Change-Id: Ifea8c807cefddc22a30a115c3ae6b20c2d641d11

Video decoder: Code clean up to use platform device with driver data instead of resource data structure.

Change-Id: I468267e943a19454fde2be393b1ac6d584505a14

Change-Id: Ia3f633542df8de6eed3bb8706de801222a85eed4

Conflicts:

	arch/arm/boot/dts/amlogic/meson8_k200b_1G_emmc_sdhc.dtd

Change-Id: Ie2271fc4e253da23022730d9fa57040178f4887f

PD #94888. MPEG video decoder: Change buffer management routines with kfifo API with frame buffer pointer checking. Add video frame provider reset event processing in video driver to handle fatal error reset when video reciver is dirrectly connected to decoder driver in debug mode.

Change-Id: I0030b6e0c328d646cc3248527d0740c40b9f69ef

Conflicts:

	drivers/amlogic/amports/vmpeg12.c

Change-Id: I838bc6938cde439a5410fdc7b38e00d73e6a3d96

These resolutions missed while merging the commit, 553ce69c

.

Change-Id: Ife43ac1e2a75aad41b44d384b00fb55b99afb87e
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Change-Id: I3755e5d9524903840cb029559a94f084f645b724
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Change-Id: If5b9fa15afd829cf17646b0cba2047ac21c032c8
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Squashed commit of the following:

commit 0fa46efbdb1eae9771c3d5cf9b1f558ac725301f
Author: zongdong.jiao <zongdong.jiao@amlogic.com>
Date:   Fri Oct 10 21:37:53 2014 +0800

    PD #96169: hdmitx: update hpll setting

commit 795cefa28525f39e6ba5a8f113caf4f01f6466ba
Author: zongdong.jiao <zongdong.jiao@amlogic.com>
Date:   Fri Oct 10 21:37:10 2014 +0800

    PD #96169: hdmitx: merge 97042 commit to a single commit

Change-Id: Ib5ad1cc6bd390eeba093eb6b34fc256de470b595
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Conflicts:
	arch/arm/boot/dts/meson8b_odroidc.dts

Change-Id: I646ca2c20e25218da630ce965a1c43efcde2fbed

Change-Id: I5bad8abcc2da2a0f8ab543f29c56a484f704e2c0

Change-Id: Ice5379964d049c5d46d4f5ad99cdceea66ee2c6d

Change-Id: Iceadbb39ad6e19686b3ca4945d5970a09e400768

Change-Id: I9d01eda4cba56c49aae2a8a8e5d391a6b00a7423
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

This reverts commit 4033150e.

Change-Id: I4b56d75d450f42515ebbcbcde6cb0ed236ddba29

Change-Id: Iac3ed6c0e9def570b29a42f3103c57724615d2cd
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Change-Id: I5100b573dc536a440fafd4826dc997f16897600b
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Change-Id: Idb017e14fde03407e13d1dbc802b65ee265d77b6
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Change-Id: Ia97cee89ca45afee2848171a2c36256705a1199b
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Change-Id: I2228eca418db732b5e833b23aa9e1b0bf0f09fc5

Merge "Revert "PD#101802:DWC:if read too many naks from hub split transfer,take it error and return"" into odroidc-3.10.y-android

This reverts commit a7c08dc6.

Change-Id: If51980c58f518cc4dc26fcf612300d696f1b77d8

This reverts commit 2e34482c.

Change-Id: Ie993a13c97ef68cbe9046b45cd3fd03e7c00126a

Merge "BACKPORT: [media] media/rc: Send sync space information on the lirc device" into odroidc-3.10.y-android

Merge "BACKPORT: [media] media: rc: add driver for Amlogic Meson IR remote receiver" into odroidc-3.10.y-android

Amlogic Meson SoCs include a infrared remote control receiver that can
operate in two modes: "NEC" mode in which the hardware decodes frames
using the NEC IR protocol, and "general" mode in which the receiver
simply reports the duration of pulses and spaces for software
decoding.

This is a driver for the IR receiver that implements software decoding
of received frames.

Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
Acked-by: Carlo Caione <carlo@caione.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

Conflicts:

	MAINTAINERS

Change-Id: I42ac5837fa3b39939e8abe65a4aba9e748c78ce2
Signed-off-by: Dongjin Kim <tobetter@gmail.com>

Userspace expects to see a long space before the first pulse is sent on
the lirc device.  Currently, if a long time has passed and a new packet
is started, the lirc codec just returns and doesn't send anything.  This
makes lircd ignore many perfectly valid signals unless they are sent in
quick sucession.  When a reset event is delivered, we cannot know
anything about the duration of the space.  But it should be safe to
assume it has been a long time and we just set the duration to maximum.

Change-Id: Ic372e9156f9940534f20d7a8f315699ed769c1be
Signed-off-by: Austin Lund <austin.lund@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

The lirc interface allows 255 u32 spaces and pulses, which are usec. If
the driver can handle this (e.g. winbond-cir) you can produce hours of
meaningless IR data and there is no method of interrupting it.

Change-Id: I8e57017050b367006571fe2c31f58e0d59a828df
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>