HDMI:rk3128/rk3036: fix compile error introduced by pre-commit.

hdcp_power_off_cb() was changed by commit
90e99a4c359e2609512feb7433670b10815593b4.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

HDMI:rk3288/rk3368: support 2nd HDCP authentication.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

HDMI: modify callback and events for HDCP 2nd auth.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

mmc: core: reduce erase event timeout

We set wrong discard timeout limitation for erase event
which exceed that block layer does. And jbd warning
can be observed like blow:

INFO: task update_binary:151 blocked for more than 10 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
update_binary   D ffffffc000085674     0   151    134 0x00400008
Call trace:
[<ffffffc000085674>] __switch_to+0x80/0x8c
[<ffffffc00082cb28>] __schedule+0x4e0/0x6f4
[<ffffffc00082cda0>] schedule+0x64/0x70
[<ffffffc00082aea0>] schedule_timeout+0x28/0x250
[<ffffffc00082d2ac>] io_schedule_timeout+0x6c/0xa8
[<ffffffc00082d37c>] wait_for_common_io.constprop.111+0x94/0x114
[<ffffffc00082d41c>] wait_for_completion_io+0xc/0x18
[<ffffffc0002ffb08>] blkdev_issue_discard+0x1e0/0x214
[<ffffffc000300630>] blkdev_ioctl+0x2d0/0x708
[<ffffffc00030d52c>] compat_blkdev_ioctl+0x464/0x5ec
[<ffffffc0001bdf0c>] compat_sys_ioctl+0x104/0x1e8

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: queue: use swap() in mmc_queue_thread()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

dts: rk312x-pinctrl: disable IO pull-down for SDIO

  Rockchips' platform contain ridiculous and closely
w/o maintained macro in pcl to pave the bumpy way for
other drivers to distinguish VALUE_PULL_UPDOWN_DISABLE
from VALUE_PULL_DISABLE.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com>
Tested-by: Xiao Yao <xiaoyao@rock-chips.com>
Cc: Roger Hu <roger.hu@rock-chips.com>

mmc: core: avoid recovery flow for tuning failure

  Communication scenario definitely should fail during
tuning procedure. Already does it reset controller, so
we don't need executing recovery for that case.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: card: Fixup request missing in mmc_blk_issue_rw_rq

The current handler of MMC_BLK_CMD_ERR in mmc_blk_issue_rw_rq function
may cause new coming request permanent missing when the ongoing
request (previoulsy started) complete end.

The problem scenario is as follows:
(1) Request A is ongoing;
(2) Request B arrived, and finally mmc_blk_issue_rw_rq() is called;
(3) Request A encounters the MMC_BLK_CMD_ERR error;
(4) In the error handling of MMC_BLK_CMD_ERR, suppose mmc_blk_cmd_err()
    end request A completed and return zero. Continue the error handling,
    suppose mmc_blk_reset() reset device success;
(5) Continue the execution, while loop completed because variable ret
    is zero now;
(6) Finally, mmc_blk_issue_rw_rq() return without processing request B.

The process related to the missing request may wait that IO request
complete forever, possibly crashing the application or hanging the system.

Fix this issue by starting new request when reset success.

Signed-off-by: Ding Wang <justin.wang@spreadtrum.com>
Fixes: 67716327eec7 ("mmc: block: add eMMC hardware reset support")
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

mmc: core: add timeout for context_info->is_done_rcv

  After dequeue a rq from blk and a accidental rq missing makes
bq->queue fails to fetch blk_rq again since !rq w/o been done.
Whatsoever was that, MUST ensure a schedule mechanisam to break
the dead loop, and issue the missing one again. We observe this
problem, all processes calling aio page writeback or commiting
journal were confined in io_schedule waiting for previous blk rq
to be completed, and cause os stucked.

page:c1337420 count:3 mapcount:0 mapping:dc8fdc34 index:0x502
page flags: 0x4000286c(referenced|uptodate|lru|active|private|writeback)
sleep_on_page: inode: dc8fdb58, 119091
CPU: 3 PID: 199 Comm: abc Not tainted 3.10.0 #298
[<c0013e44>] (unwind_backtrace+0x0/0xe0) from [<c001175c>] (show_stack+0x10/0x14)
[<c001175c>] (show_stack+0x10/0x14) from [<c00cadb8>] (sleep_on_page+0x6c/0x8c)
[<c00cadb8>] (sleep_on_page+0x6c/0x8c) from [<c0769a80>] (__wait_on_bit+0x54/0xa0)
[<c0769a80>] (__wait_on_bit+0x54/0xa0) from [<c00ca88c>] (wait_on_page_bit+0x8c/0x9c)
[<c00ca88c>] (wait_on_page_bit+0x8c/0x9c) from [<c00ca954>] (filemap_fdatawait_range+0x6c/0x110)
[<c00ca954>] (filemap_fdatawait_range+0x6c/0x110) from [<c00cbd8c>] (filemap_write_and_wait_range+0x54/0x78)
[<c00cbd8c>] (filemap_write_and_wait_range+0x54/0x78) from [<c0182e14>] (ext4_sync_file+0xdc/0x308)
[<c0182e14>] (ext4_sync_file+0xdc/0x308) from [<c01305f8>] (vfs_fsync_range+0x34/0x44)
[<c01305f8>] (vfs_fsync_range+0x34/0x44) from [<c01306b0>] (generic_write_sync+0x80/0x88)
[<c01306b0>] (generic_write_sync+0x80/0x88) from [<c00cc3fc>] (generic_file_aio_write+0xa0/0xb0)
[<c00cc3fc>] (generic_file_aio_write+0xa0/0xb0) from [<c0109198>] (do_sync_write+0x74/0x98)
[<c0109198>] (do_sync_write+0x74/0x98) from [<c0109ab8>] (vfs_write+0xd4/0x16c)
[<c0109ab8>] (vfs_write+0xd4/0x16c) from [<c0109df8>] (SyS_write+0x3c/0x60)
[<c0109df8>] (SyS_write+0x3c/0x60) from [<c000da00>] (ret_fast_syscall+0x0/0x30)

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Tested-by: Meiyou Chen <cmy@rock-chips.com>

mmc: rk_sdmmc: remove edmac init in post tmo and data->stop

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: rk_sdmmc: add new property for mmc_assume_removable

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: core: limit tuning block timeout

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

dts: rockchip: add tune_regsbase for mmc

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

mmc: host: Add facility to support re-tuning

  This commit comes from community but not upstreram.
We cannot wait for picking up such a great movement without
upstream admit it. We just take a light way to merge it and
minimize the change.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>

mmc: rk_sdmmc: new tuning policy

  Totally new tuning policy for rockchip mhsc
merging from upstream and sustainable experiments
conducted by massive test using tier one customers's board.
This fine ajustment might be more durable and readable.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com>
Test-by: Xiao Yao <xiaoyao@rock-chips.com>

mmc: rk_sdmmc: local reversion and code regulation

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

RK3368 GPU version: Rogue L 0.18
If fix freq,then don't force to drop freq to the lowest.

dts: rk3368-p9_818: modify DVFS table for gpu, if not so, reboot test would be failed sometimes.

Signed-off-by: Aiyoujun <ayj@rock-chips.com>

usb: bc: add battery charger detect head file

Signed-off-by: lyz <lyz@rock-chips.com>

usb: dwc_otg: prevent re-submit urb when disconnect detected

Signed-off-by: lyz <lyz@rock-chips.com>

vop: full: update win direct enable function

Signed-off-by: hjc <hjc@rock-chips.com>

rk fb: when switch screen,should not close vop,this will lead to close clk
       just need to close all win

Signed-off-by: hjc <hjc@rock-chips.com>

rtl8188eu: update driver to v4.3.0.8_13968.20150417

defconfig: add dcdc eta3555

regulator: add eta3555 support

tve:rk1000:modify suspend and resume condition

Signed-off-by: ShenZhengyi <szy@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

tve:rk1000: Fix code style

Signed-off-by: ShenZhengyi <szy@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

bcmdhd wifi: add auto recognize different chips

rk3368: TP: Forget to remove source drivers/input/touchscreen/gt9xx/Kconfig.

Signed-off-by: xubilv <xbl@rock-chips.com>

dts: add rk3368-tb_mipi.dts to support new SDK top board

Signed-off-by: hecanyang <hcy@rock-chips.com>

dvfs: rockchip: if can not get regulator, set regulator=NULL

Signed-off-by: Xiao Feng <xf@rock-chips.com>

clocksource: rockchip_timer: set clockevent irq flags include IRQF_PERCPU

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

RK3368: TP: use dts to control the difference between GT9XX.

Signed-off-by: xubilv <xbl@rock-chips.com>

rk3368-tb_8846: dts: modify battery node

1) add dc det pinctrl
2) disable usb adapter
3) set input charge current 3000mA

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

power: rk81x-battery: fix dwc_otg_check_dpdm declare error

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

power: rk81x battery: fix charger online init

if the system boot with charger online, use it
as init state for power_supply_register

Signed-off-by: Andy Yan <yxj@rock-chips.com>
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

power: rk81x battery: fix charge/discharge check in reboot mode

judge charge/discharge mode by current direction

Signed-off-by: Andy Yan <yxj@rock-chips.com>
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

power: rk81x battery: skip invalid voltage

rk81x battery may get invalid value when resume from suspend,
if the voltage get from adc is lower than INVALID_VOL_THRESD,
we consider it as invalid and filter it

Signed-off-by: Andy Yan <yxj@rock-chips.com>
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

power: rk81x-battery: disable charge over time funtion

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

power: rk81x-battery: count all avaraible rsoc into calc

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

power: rk81x-battery: get charge flag by command line

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

power: rk81x battery: add virtual power support

if some board don't use a real fuel gauge, set virtual_power
in dts, the battery driver will report virtural soc to user space

Signed-off-by: Andy Yan <yxj@rock-chips.com>
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

rk3368-p9_818: dts: rename dc det pinctrl name and add virtual_power

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

ext4: check for zero length extent explicitly

The following commit introduced a bug when checking for zero length extent

5946d08 ext4: check for overlapping extents in ext4_valid_extent_entries()

Zero length extent could pass the check if lblock is zero.

Adding the explicit check for zero length back.

Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org

ASoC: rockchip: coding style.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

rk fb: vsync thread distinction two vop

Signed-off-by: hjc <hjc@rock-chips.com>

arm64: rockchip: rk3368-tb: dts: update dvfs table

Signed-off-by: Xiao Feng <xf@rock-chips.com>

tve:rk1000: When set mode , judge whether delay

      If the set mode is the same of current mode , it does not delay.

Signed-off-by: ShenZhengyi <szy@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

rk3368: pinctrl: fix bank:3 gpio irq wakeup not worked

Signed-off-by: David Wu <wdc@rock-chips.com>

dts: rockchip: rename property 'i2s-controller' to 'audio-controller'

because we have i2s controller, spdif controller, so we use audio-controller
to include both.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

ASoC: rockchip: rename property 'i2s-controller' to 'audio-controller'

because we have i2s controller, spdif controller, so we use audio-controller
to include both.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

ASoC: rockchip: spdif: drop owner assignment from platform_drivers

A platform_driver does not need to set an owner, it will be populated by the
driver core.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

bcmdhd wifi: after android stop; start, wpa_supplicant start fail because of Failed to create a P2P Device interface p2p-dev-wlan0

bcmdhd: solve ap6212 sdio transmit abnormal

VPU: enable auto-freq flag.

bug in previous commit, auto-freq flag disable in all the
platform.

raise freq to 600MHz when 4k avc video decode, could not
get the 500 MHz frequency from current clock pll.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

dts: rk3368-p9_818: modify DVFS table for gpu, cpu and logic.

Signed-off-by: Aiyoujun <ayj@rock-chips.com>

dts: rk3368-box: modify DVFS table for little cpu.

Signed-off-by: Aiyoujun <ayj@rock-chips.com>

optee : optee linux build to .ko depend on function(sched_setaffinity)

Signed-off-by: Jony.Qiu <jony.qiu@rock-chips.com>

usb: bc: fix crush caused by usb bc detect

Fix a bug that mutex used before init.

Signed-off-by: lyz <lyz@rock-chips.com>

ASoC: rockchip: spdif: caculate sclk according BMC(bitphase mark coding).

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

ASoC: hdmi_spdif: add 192k samplerate support.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

ASoC: rockchip: spdif: add 192k samplerate support.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

ASoC: rockchip: spdif: refactor driver code.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

pm_tests: rockchip: fix compilation warning

Signed-off-by: Xiao Feng <xf@rock-chips.com>

usb: otg: notify to pmu the otg vbus change

Signed-off-by: lyz <lyz@rock-chips.com>

usb: bc: fix usb charger type detect error in rapidly hotplug
case for inno phy

In device mode, when doing usb plug and unplug rapidly, there
might be some problem with usb battery charger type detect,
caused by line bounces and other connect problems, at this case,
usb battery charger detect module prefer to report a battery
cherger type that draw less current to make it saver for PMIC and
downstream port safer.

Signed-off-by: lyz <lyz@rock-chips.com>

dts: box fixed ddr freq to 800M

RK3368 Mailbox: add mailbox version information

Signed-off-by: Tang Yun ping <typ@rock-chips.com>

rga2 compile error on 64 bit platform

Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>

fix rga2 compile error

Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>

arm64: dts: rk3368-tb_8846.dts: modify rk818 battery node

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

rk3x: rmic: rk818: fix the code build warning in rk3288.

Signed-off-by: chenjianhong <cjh@rock-chips.com>

VPU: fix the code cannot be built in 32bits environment.

compat_uptr_t isn't define under 32bits environment, using
this definition under the CONFIG_COMPAT macro.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

video: rockchip: rk312x lcdc: fix set standby err if not support uboot display

Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>

usb: ehci: rename hsic and HSIC to ehci1 and EHCI1

Signed-off-by: Wu Liang feng <wulf@rock-chips.com>

rk3x: pmic: rk818: support low battery detect,and slove otg error.

Add function:
1)battery voltage low then 3.0V not allow to power on.
2)battery voltage low then 3.4V have irq to wakeup from deep sleep.
3)disable otg_en when rk818 shutdown..

Signed-off-by: zhangqing <zhangqing@rock-chips.com>

hdmi: v2: update phy register value to improve output signal.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

hdmi: edid: distinguish deep color mode between YCbCr444 and YCbCr420.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

rk3368 camera: hold vio0 noc clock during the camera work, fixed isp iommu stall failed

<6>[  142.697985] Enable stall request failed, MMU status is 0x00000011
<6>[  142.698006] rk_iommu ff914000.isp_mmu: (isp_mmu), rockchip_iommu_disable failed

Signed-off-by: CMY <cmy@rock-chips.com>
Tested-by: GY <gy@rock-chips.com>

power: rk81x-battery: check sec base by rsoc trend anyway

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

power: rk81x-battery: update verison to 4.0.0

this verison can support both ARM and SOFIA platform.

Signed-off-by: chenjh <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

arm64: dts: rk3368-p9_818:modify battery node

Signed-off-by: chenjh <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>

vop: rk3288: update dither config for 10bit output mode

example for 10bit dual lvds output:
timing0 {
screen-type = <SCREEN_DUAL_LVDS>;
out-face    = <OUT_P101010>;
color-mode  = <COLOR_RGB>;
...
}

Signed-off-by: hjc <hjc@rock-chips.com>

rk3368 vop: cabc lut update only when cabc enable

Signed-off-by: hjc <hjc@rock-chips.com>

hdmi:edid: improve edid check redundancy.

If edid first block header check or checksum is error,
but data[126] value is smaller than 4, we think it is
accecptable, return suscess.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

VPU: add cru reset if vpu hardware hang or vpu report
error.

It depend on pmu driver. and require pmu to complete
its idle request function.

temporary, it haven't enable yet, because rk3368 pmu
function had not completed.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

VPU: add a hardware error check in interrupt handle.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

VPU: use debugfs_remove_recursive to recursive remove
debugfs node.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

VPU: abondon old time consume log print, used new time record
interface to calculate and print time logs.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

VPU: add debug log classification output method.

Use /sys/module/vcodec_service/parameters/debug to
control log output, each bit represent a type of debug
information.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

VPU: support compatible vpu request from userspace.

This revision need rk3368 android library libvpu to
revert it VPUReq_t definition, Revert RK_U64 req;
to RK_U32 *req;

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

rk1000: shorter reset delay time.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

rk1000: fix create sysfs file permission error.

Wrong permission will case following warning:

------------[ cut here ]------------
WARNING: at drivers/base/core.c:576 device_create_file+0x74/0xa4()
Attribute rkcontrl: write permission without 'store'
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.0 #247
Call trace:
[<ffffffc000087dc0>] dump_backtrace+0x0/0x10c
[<ffffffc000087edc>] show_stack+0x10/0x1c
[<ffffffc00087c0e4>] dump_stack+0x1c/0x28
[<ffffffc0000a1b08>] warn_slowpath_common+0x74/0x9c
[<ffffffc0000a1b7c>] warn_slowpath_fmt+0x4c/0x58
[<ffffffc00036cfec>] device_create_file+0x70/0xa4
[<ffffffc000399fc4>] rk1000_probe+0x1d0/0x20c
[<ffffffc00058b190>] i2c_device_probe+0x9c/0xd4
[<ffffffc000370e70>] driver_probe_device+0xd0/0x210
[<ffffffc00037105c>] __driver_attach+0x60/0x90
[<ffffffc00036f394>] bus_for_each_dev+0x60/0x88
[<ffffffc00037096c>] driver_attach+0x1c/0x28
[<ffffffc000370540>] bus_add_driver+0xf4/0x210
[<ffffffc000371698>] driver_register+0xbc/0x138
[<ffffffc00058b054>] i2c_register_driver+0x48/0xac
[<ffffffc000bf2934>] rk1000_init+0x14/0x20
[<ffffffc000081554>] do_one_initcall+0x80/0x120
[<ffffffc000bdb8f0>] kernel_init_freeable+0x148/0x1e8
[<ffffffc000876a10>] kernel_init+0x10/0xcc
---[ end trace 1cc1e45d37744cff ]---

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

rk1000: fix rk1000-core.c code style.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

arm64: rockchip: rockchip_defconfig enable PRINTK_PROCESS

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

add support show process information on printks

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rk fb: if win close we have to set 4 area state to 0, otherwise will lead to pagefault

Signed-off-by: hjc <hjc@rock-chips.com>

rk fb: 2 pixel align for interlace and xact offset

Signed-off-by: hjc <hjc@rock-chips.com>

rk3368 lcdc: in interlace mode & resolutation is p to i scale, disable vscale done and enable gt2

Signed-off-by: hjc <hjc@rock-chips.com>

rfkill-wlan.c: solve mac addr all zero error, cause can't connect ap problem