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

arm64: rockchip: rockchip_defconfig sync with samsung product

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

rk: RK_CONSOLE_THREAD no depends on FIQ_DEBUGGER_CONSOLE

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

RK3368 GPU version: Rogue L 0.17
1. Support gpu disable dvfs case.
2. Add rk_tf_check_version to compatible for rk3328.
3. merge 1.4_ED3573678 DDK code.
   Tip: Need update RK3368 GPU so version to L0.17(@vendor/rockchip/common).

rk: gcc-wrapper.py fix psci ignore

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

Merge branch android-common-3.10

Merge tag 'lsk-v3.10-15.05-android' into develop-3.10

Revert "zram: don't grab mutex in zram_slot_free_noity"

This reverts commit 66db73c14bd16d8ad05ecb80e6bf6050d8828467.

arm64: rockchip: efuse: support set system serial

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

bcmdhd wifi: update to 1.201.59.4

rfkill-wlan, solve rockchip_wifi_mac_addr error

HDMI: add mutex lock to edid modelist operation.

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

android: drivers: workaround debugfs race in binder

If a /d/binder/proc/[pid] entry is kept open after linux has
torn down the associated process, binder_proc_show can deference
an invalid binder_proc that has been stashed in the debugfs
inode.  Validate that the binder_proc ptr passed into binder_proc_show
has not been freed by looking for it within the global process list
whilst the global lock is held. If the ptr is not valid, print nothing.

Bug 19587483
Change-Id: Ice878c171db51ef9a4879c2f9299a2deb873d255
Signed-off-by: Riley Andrews <riandrews@android.com>

esp8089 wifi: solve warning in 64bit, new method

rk: iommu: support iommu region guard

Add an guard area after each iommu region, it is used to detect cross-border access

Signed-off-by: CMY <cmy@rock-chips.com>
Signed-off-by: XXM <xxm@rock-chips.com>

rk fb: act_height should be 2 pix align for interlace output

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

neigh: Better handling of transition to NUD_PROBE state

[1] When entering NUD_PROBE state via neigh_update(), perhaps received
    from userspace, correctly (re)initialize the probes count to zero.

    This is useful for forcing revalidation of a neighbor (for example
    if the host is attempting to do DNA [IPv4 4436, IPv6 6059]).

[2] Notify listeners when a neighbor goes into NUD_PROBE state.

    By sending notifications on entry to NUD_PROBE state listeners get
    more timely warnings of imminent connectivity issues.

    The current notifications on entry to NUD_STALE have somewhat
    limited usefulness: NUD_STALE is a perfectly normal state, as is
    NUD_DELAY, whereas notifications on entry to NUD_FAILURE come after
    a neighbor reachability problem has been confirmed (typically after
    three probes).

Change-Id: I1d01d40ef3bc4753b0eaa79da2b27235425b1934
Signed-off-by: Erik Kline <ek@google.com>
Acked-By: Lorenzo Colitti <lorenzo@google.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

New Build Breakage in branch: kernel-m-dev-tegra-flounder-3.10 @ 1960706

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I5682198bce94e66ff3de52989c7e361ffc25ba51

net/unix: sk_socket can disappear when state is unlocked

got a rare NULL pointer dereference in clear_bit

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 21252747
Change-Id: I27e70f2543034097c8a590a212c2c6fa846fe695

rm64: rockchip: rockchip_defconfig disable EARLY_PRINTK

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

arm64: rockchip: check tf version later

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

vcodec: add soft reset after reading dec registers

Sometimes decoder got a timeout error and can not recover from error status.
We need to add soft reset after reading dec registers.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>

vcodec: fix enable race condition when power on/off

When multi-instances power on at same time the condition enabled maybe
set mutli-times. Use atomic function to replace orginal
read/compare/change operation to avoid multi-instances.
Also add power on/off count to debugfs for checking

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>

add func: check tf ver

rk3368 lcdc: update hdmi overscan config path

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

rk fb: fix in interlace mode switch between ntsc and pal lead to pagefault

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

rk3368 lcdc: add wait frame start for uboot logo switch kernel logo and enable iommu

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

rk fb: fix uboot logo switch to kernel logo splash screen

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

dvfs: rockchip: add cpu thermal management test nodes

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

Makefile: revert to 899286fb6a7a20f5b5c5d0a9a22e4fc39b2d9e70

display-sys: fix compile warning

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

display-sys: function mode_string check input parameter.

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

modify smc call func id to Standard sip id for efuse and pm-rk3368

rk3368 lcdc: fix iommu crash when resume

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

arm64: rockchip: rk3368: refactor efuse code

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

arm64: rockchip: rk3368: dts: add rockchip,rk3368-efuse-256

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

fix rga mmu buf cause system crash when use ion mmu buf

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

rk3368: iommu: fix region free position when iovmm_activate failed

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

Revert "mmc: rk_sdmmc: manually zero desc after allocated on ARM64 platform."

This reverts commit e68d16d33646fabf36e782b300404f112eb94d1d.

mmc: dw_mmc: init desc in dw_mci_idmac_init

Set 0 to des1 in 32bit case.
Otherwise the random value of des1 will be used in
dw_mci_translate_sglist: IDMAC_SET_BUFFER1_SIZE(desc, length)

Signed-off-by: Fei Wang <w.f@huawei.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

dts: arm64: rk3368: fix wrong property for esd

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
cc: Sam Guo <sam.guo@rock-chips.com>
cc: Xiao Yao <xiaoyao@rock-chips.com>

CVBS: Add gm7122 driver.

      If you use it, should add board information to dts file, such as i2c address, sleep pin.
      like that:
gm7122_tve@44 {
compatible = "gm7122_tve";
reg = <0x44>;
rockchip,source = <0>; //0: LCDC0; 1: LCDC1
rockchip,prop = <PRMRY>;//<EXTEND>
gpio-reset = <&gpio0 GPIO_A1 GPIO_ACTIVE_HIGH>;
gpio-sleep = <&gpio0 GPIO_C6 GPIO_ACTIVE_HIGH>;
status = "okay";
};

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

HDMI: No need to set audio when hdmi is not connected.

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

arm64: kernel: add system revision support

Bug 1248538

Change-Id: I272a264ba2904dfc7a2c6d74ab4fbfdd301b8985
Signed-off-by: Peng Du <pdu@nvidia.com>
Reviewed-on: http://git-master/r/260756
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>

selinux: enable genfscon labeling for sysfs and pstore files

Support per-file labeling of sysfs and pstore files based on
genfscon policy entries.  This is safe because the sysfs
and pstore directory tree cannot be manipulated by userspace,
except to unlink pstore entries.
This provides an alternative method of assigning per-file labeling
to sysfs or pstore files without needing to set the labels from
userspace on each boot.  The advantages of this approach are that
the labels are assigned as soon as the dentry is first instantiated
and userspace does not need to walk the sysfs or pstore tree and
set the labels on each boot.  The limitations of this approach are
that the labels can only be assigned based on pathname prefix matching.
You can initially assign labels using this mechanism and then change
them at runtime via setxattr if allowed to do so by policy.

Change-Id: If5999785fdc1d24d869b23ae35cd302311e94562
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Suggested-by: Dominick Grift <dac.override@gmail.com>

HDMI: register display type according lcdc property.

If property of lcdc connected by HDMI is EXTERN,
we register HDMI as a aux display device.

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

display-sys: delete unused code.

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

mmc: rk_sdmmc: fix compile warning

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

mmc: core: add wrapper for timeout value

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

mmc: rk_sdmmc: do more timeout recovery operation

  We stop slaver and rebank our setting for better
compatibility.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Reviewed-by: Roger Hu <roger.hu@rock-chips.com>
Tested-by: Allen Lee <allen.lee@rock-chips.com>
cc: Xiao yao <xiaoyao@rock-chips.com>

mmc: core: skyrocket timeout for cmd erase_group_xxx

  It shocked me that a buggy emmc need quite a long period
of time for setting its erase_group_xxx. Increase timeout
value does not harm to normal case which just under constrain.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Tested-by: Yongzhong Yang <yongzhong.yang@rock-chips.com>
cc: Xiao yao <xiaoyao@rock-chips.com>

mmc: rk_sdmmc: disable controller int before enter deepsleep

   Generally when machine enter deepsleep, with no cirrcumstance,
host can interact with slavery devices. So disbale our int generater
ourself. By occasionly, we find reset controller will trigger an
unexpected SEB int. It exists a race condition for reset and IO timing
before switched to gpio and confuse state machine.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Tested-and-Reviewed-by: Xiao yao <xiaoyao@rock-chips.com>

mmc: rk_sdmmc: add platform hook for special pm ops during deepsleep

  We register a platform hook and restore all of our regs if platform does
need to cutoff controller's power-supply during deepsleep in period of time.
Make sure your have added "controller-power-down" property AND comment out
"keep-power-in-suspend" in related dts file.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Xiaoyao <xiaoyao@rock-chips.com>
Reviewed-by: Chenjh <chenjh@rock-chips.com>
Tested-by: Chenjh <chenjh@rock-chips.com>

dtsi: ddr_freq: add vop bandwidth freq table

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

fb: add sysfs node lcdcid.

Now we have many fb devices, each vop layer is mapped to a fb device.
If there is 2 vop, we can not distinguish the vop between these fb devices.
Add sysfs node lcdcid to get the lcdc id mapped by fb device.

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

rfkill-wlan: skip can't find rockchip,grf property error in none 3368 platform

rk3368: pmic: rk818:adjust dcdc voltage step

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

selinux: enable per-file labeling for debugfs files.

upstream commit 6f29997f4a3117169eeabd41dbea4c1bd94a739c

Add support for per-file labeling of debugfs files so that
we can distinguish them in policy.  This is particularly
important in Android where certain debugfs files have to be writable
by apps and therefore the debugfs directory tree can be read and
searched by all.

Since debugfs is entirely kernel-generated, the directory tree is
immutable by userspace, and the inodes are pinned in memory, we can
simply use the same approach as with proc and label the inodes from
policy based on pathname from the root of the debugfs filesystem.
Generalize the existing labeling support used for proc and reuse it
for debugfs too.

[sds:  Back-ported to 3.10.  superblock_security_struct flags field
is only unsigned char in 3.10 so we have to redefine SE_SBGENFS.
However, this definition is kernel-private, not exposed to userspace
or stored anywhere persistent.]

Change-Id: I6460fbed6bb6bd36eb8554ac8c4fdd574edf3b07
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>

ASoC: es8316: use startup/shutdown to manager power consumption.

use startup/shutdown to reduce power consumption, every time codec
standby, we shutdown codec. so, there is no need extra operation in
suspend.

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

arm: rockchip: vcodec_service: allow no rockchip,grf in dts

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

clk: rockchip: allow no rockchip,grf in dts on arm

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

ASoC: dmaengine: use dma_request_slave_channel to request dma chan.

if i2s module probe before dma module, dma chan resources are not ready.
use dma_request_slave_channel to reinitialize dma chan if not ready.

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

HDMI: support show edid status.

Use /sys/class/display/HDMI/debug node to
show sink EDID status and raw status.

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

display-sys: debug node support to show debug information.

Add a callback function getdebug() to show debug information.

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

HDMI: just list common format when edid is not valid.

If EDID is not valid, list following common format:
1920x1080p-60
1920x1080p-50
1280x720p-60
1280x720p-50
720px576p-50
720px480p-60

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

ext4: don't save the error information if the block device is read-only

Google-Bug-Id: 20939131
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

Merge branch 'v3.10/topic/misc' into linux-linaro-lsk-v3.10

Pick up a ext4 optimiztion commit:
7afe5aa59ed3d ext4: convert write_begin methods to stable_page_writes

ext4: convert write_begin methods to stable_page_writes semantics

Use wait_for_stable_page() instead of wait_on_page_writeback()

Huawei engineer Jianfeng report that without this patch, the consequence
write may cause seconds to finish.

The patch helps because most of storage today doesn't require that the
page isn't changed while IO is in flight. That is required only for
data checksumming or copy-on-write semantics but ext4 does neither of
those. So we don't have to wait for IO completion in ext4_write_begin()
unless underlying storage requires it.

--Honza

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
(cherry picked from commit 7afe5aa59ed3da7b6161617e7f157c7c680dc41e)
Signed-off-by: Alex Shi <alex.shi@linaro.org>

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

 Merge tag 'v3.10.79' into linux-linaro-lsk-v3.10

 This is the 3.10.79 stable release

esp8089 wifi: solve warning in 64bit

video: rockchip: rga2: fix compilation error on arm

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