rk3368: iommu: fix warning when compiling

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

rk3368: iommu: delete region list if map failed

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

rk3368: iommu: add page fault call back for master

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

rk818-battery: fix index of array CHRG_CVCC_HOUR error

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

rk31xx lvds: compatible with rk31xx and rk3368

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

HDMI:rk3288: fix pinctrl mode switch error.

For 3288, i25 pinctrl gpio mode name is "sleep",
not "gpio" any more.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Conflicts:
drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c

rockchip: rk312x: vop: fix iommu crash when resume

Maybe win is enabled and H/W address is not a vaild
iommu mapped addr, So we need delay to ensure H/W
switch done before enable iommu.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

video: rockchip: rk312x lcdc: Refine lcdc standby

add wait for lcdc hold valid when standby and add standby when
lcdc timing is changing at the moment of switch hdmi.

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

rk iommu: fix system panic when iommu pagefault

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

rk3368 lcdc: add lcdc extend function for some special config

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

rk fb: add for iommu pagefault debug

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

rk fb: add interface for debug

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

RK3368 DDR: change get ddr freq method

The old method get ddr freq from MCU through mailbox,and new method get ddr
freq from ddrpctl register

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

rk3368 hdmi : fix the hdmi bitstream connot idenfify sometimes

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

mend rk1000 display ,remove some code in lcdc

After insert HDMI reboot only, insert cvbs display become green

when uboot logo on ,first cvbs display no need init rk1000

mend rk1000 cvbs display when open uboot logo

add suspend ctrl in rk3368-tb_8846.dts

RK3368 MCU: add MCU suspend and resume function

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

rk3288 lcdc: delete unused message and update coding style

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

rk3288 lcdc: add overscan for extern screen

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

rk3368 lcdc: update deflick config for interlace mode ouput

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

rk3368: ddrfreq: add compat_ioctl support

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

rk3x: pmic: rk818_battery: fix code style issues from checkpatch.pl

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

rk3368-p9: dts: mdify dvfs table

rk31xx lvds: make sure lvds do init in kernel

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

cpufreq: rockchip_big_little: minor cleanups

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

rk818-battery: update version to 3.0.0

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

rk3368-p9: dts: add property of rk818 battery node

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

rk3368 lcdc: add ccir656 output format support

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

arm64: rockchip: rk3368: cpu0 use rockchip timer

prepare for power off all cpu when idle

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

clocksource: rockchip_timer: support percpu timer on ARM64

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

rk fb: fix hdmi/cvbs display error when uboot display logo

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

rk3368 lcdc: fix system crash when in blank mode to update register

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

rk fb: delay 200ms when extern display switch screen can fix mmu pagefault

HDMI: improve EDID parse.

1. For some sink device, there is no available video mode
   in EDID. hdmi driver will crash under such case.
2. There are some video mode is not defined in EDID extend
   block, so we need to check first block data.

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

phy: phy-rockchip-usb: add support of rk33 usb phy

The usb phy of rk33's ehci usb controller usb genernic phy
subsystem to handle suspend and resume

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

phy: merge and backport phy core from linux kernel 4.1

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

HDMI: rk3368/rk3288: If HDCP is enabled in uboot, do not set again.

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

display-sys: fix code style

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

display-sys: list supported 3d format of all resolution.

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

rk1000 codec: fixed rk1000 av startup pop

USB: gadget: rndis: fix compilation warning

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

usb: gadget: mtp: add new ioctl for compat

Define a new ioctl for MTP_SEND_EVENT, as its
ioctl numbers depends on the size of struct
mtp_event, which varies in ARCH32 and ARCH64.

Bug 1466403

Change-Id: I1d172aae422ca483b00c6dd59e739166f40c53ce
Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com>
Reviewed-on: http://git-master/r/377800
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>

Revert "usb: ftp: fix the bug of ftp ioctrl args problem with 32bit userspace on 64bit platforms"

This reverts commit c04cdecff9f7283308b286e1bc1dbf0edfe4453b.

rk3368 lcdc: update gather config

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

rk3368 lcdc: fix system crash when send reboot cmd in sleep mode

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

HDMI: 3288/3368: hdcp check firmware pointer.
If firmware is NULL, HDCP is disabled.

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

linux os can config sleep mode

Revert "staging: Remove the Android logger driver"

This reverts commit 4f8c75c8d90e9b65ead2eb6d92aaa6f4e43adef8.

Revert "staging: Remove the Android alarm-dev driver"

This reverts commit 013845fd73a5cbefec6e2234d873ea11c320c655.

Revert "staging: Remove logger and alarm-dev from android Makefile"

This reverts commit a290c3e430b1e5c7ddacc3e126e93a008c682cd4.

Merge tag 'lsk-v3.10-15.04-android'

Conflicts:
drivers/base/cpu.c
drivers/misc/Kconfig
drivers/misc/Makefile

dma: pl330: silence a compile warning

On 64 bit systems GCC warns that:

drivers/dma/pl330.c: In function ‘pl330_filter’:
drivers/dma/pl330.c:2317:21: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]

It's harmless and I have casted it away.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit 2f986ec6fa57a5dcf77f19f5f0d44b1f680a100f)

dma: pl330: use dma_addr_t for describing bus addresses

The microcode bus address (pl330_dmac.mcode_bus) is currently a u32,
which fails to compile when building on a system with 64-bit bus
addresses.

This patch uses dma_addr_t to represent the address instead.

Cc: Jassi Brar <jaswinder.singh@linaro.org>
Cc: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit fed8c45727abd273fd74b3e78b35be4929121334)

rk: gcc-wrapper.py ignore psci.c

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

rfkill-bt: fix compilation warning

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

input: gt9xx: fix compilation warning

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

mmc: rk_sdmmc: fix compilation warning

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

inv_mpu: fix compilation warning

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

media: camsys_marvin: fix compilation warning

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

input: vtl_ts: fix compilation warning

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

iommu: rockchip-iovmm: fix compilation warning

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

arm: rockchip: pm: fix compilation warning

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

arm: rockchip: ddr_freq: fix compilation warning

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

arm64: cpuinfo: compat task get hwcap from compat_hwcap_str

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

media: rk_camsys: fix compilation warning

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

rk: gcc-wrapper.py ignore compat_binfmt_elf.c:58

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

rkwifi: dhd_config: fix compilation warning

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

video: rk32_mipi_dsi: fix compilation warning

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

media: camsys_soc_rk3368: fix compilation warning

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

thermal: rockchip: fix compilation warning

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

spi: rockchip: fix compilation warning

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

spi: rockchip: todos spi-rockchip-test.c

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

RK3368 DDR:Add lcdc type detect for mcu DCF

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

mmc: sdhci-of-arasan: Omit superfluous error messages

sdhci_add_host and sdhci_platfm_init already report failure,
so don't emit error messages when a failure occurs. This prevents
occurences of "deferred" messages when required power supplies
are not ready for operation yet.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

mmc: sdhci-of-arasan: Use signed formatting in error messages

"ret" is a signed int, so use "%d" in format strings instead of "%u".
This prevents cryptic codes in error messages like this:
sdhci-arasan e0101000.sdhci: platform register failed (4294966779)

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

mmc: sdhci-of-arasan: Call OF parsing for MMC

Also check MMC OF properties. The controller supports MMC too.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

mmc: arasan: Add driver for Arasan SDHCI

Add a driver for Arasan's SDHCI controller core.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Rob Herring <rob.herring@calxeda.com> [binding]
Acked-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Chris Ball <chris@printf.net>
Conflicts:
MAINTAINERS

MIPI: Provide a function，get screen type，for frequency conversion.

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

cpufreq: rockchip_big_little: update current policy cpu before cpufreq_cpu_get

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

RK3368 GPU version: Rogue L 0.15
1. Fix lock bug in hrtimer.
2. Add USE_KTHREAD to simulate timer.Now open USE_HRTIMER instead of USE_KTHREAD by default.

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

rk fb: kfree envp[1], if we not do real switch screen

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

rk fb: fix iommu page fault when in video test

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

rk3368 lcdc: update win state

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

cpufreq: rockchip_big_little: check cpufreq_cpu_get return value

fix panic when cpu up/down

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

HDMI: rk3368: add function for HDCP2.2.

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

rockchip: video: fix logo display when switch screen

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

Revert "video: rockchip: logo: copy loader to framebuffer"

This reverts commit a9085919caeb58941c216e63a2bdef458d549f4d.

Revert "video: dts: add disp fullscreen for box logo"

This reverts commit b8667979fa6e142bae9d1731039a250525b7a05a.

rk3368: add the hdmi nlpcm and hbr mode for direct output

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

dts: delete node rockchips,hdmi_audio_source.

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

video: rockchip: update display buffer dump

Create a new sys node "/sys/class/graphics/fb0/dump_buf" to dump
display buffer.

Now can support trace multi frames and kernel logo dump.
More info see by "cat /sys/class/graphics/fb0/dump_buf"

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Conflicts:
include/linux/rk_fb.h

delete unused file drivers/video/rockchip/rk_fb.c.rej

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

sofia3gr: ion: fix this issue, the reason is ion_import_dma_buf may be invoked concurrently.

<4>[ 3123.242655] WARNING: CPU: 2 PID: 2648 at drivers/staging/android/ion/ion.c:512 ion_handle_add+0xb4/0xc0()
<7>[ 3123.252189] ion_handle_add: buffer already found.
<7>[ 3123.256694] Modules linked in: iwlmvm iwlwifi mac80211 cfg80211 compat
<7>[ 3123.263195] CPU: 2 PID: 2648 Comm: TimedEventQueue Tainted: G        W    3.14.0 #7
<7>[ 3123.270868]  00000000 00000000 9a3efd2c 80faf273 9a3efd6c 9a3efd5c 80935dc9 811d7fd3
<7>[ 3123.278405]  9a3efd88 00000a58 812208a0 00000200 80e128d4 80e128d4 8d4ae00c a8cd8600
<7>[ 3123.286065]  a8cd8094 9a3efd74 80935e0e 00000009 9a3efd6c 811d7fd3 9a3efd88 9a3efd9c
<7>[ 3123.293867] Call Trace:
<7>[ 3123.296159]  [<80faf273>] dump_stack+0x48/0x69
<7>[ 3123.300537]  [<80935dc9>] warn_slowpath_common+0x79/0x90
<7>[ 3123.305913]  [<80e128d4>] ? ion_handle_add+0xb4/0xc0
<7>[ 3123.310694]  [<80e128d4>] ? ion_handle_add+0xb4/0xc0
<7>[ 3123.315703]  [<80935e0e>] warn_slowpath_fmt+0x2e/0x30
<7>[ 3123.320586]  [<80e128d4>] ion_handle_add+0xb4/0xc0
<7>[ 3123.325450]  [<80e144cc>] ion_import_dma_buf+0x8c/0x110
<7>[ 3123.330490]  [<80c517c4>] reg_init+0x364/0x7d0
<7>[ 3123.334975]  [<80993363>] ? futex_wait+0x123/0x210
<7>[ 3123.339607]  [<80992e0e>] ? get_futex_key+0x16e/0x1e0
<7>[ 3123.344692]  [<8099308f>] ? futex_wake+0x5f/0x120
<7>[ 3123.349245]  [<80c51e19>] vpu_service_ioctl+0x1e9/0x500
<7>[ 3123.354508]  [<80994aec>] ? do_futex+0xec/0x8e0
<7>[ 3123.358885]  [<80971080>] ? prepare_to_wait_event+0xc0/0xc0
<7>[ 3123.364503]  [<80c51c30>] ? reg_init+0x7d0/0x7d0
<7>[ 3123.368955]  [<80a22562>] do_vfs_ioctl+0x2d2/0x4c0
<7>[ 3123.373816]  [<80b198ad>] ? inode_has_perm.isra.41+0x2d/0x40
<7>[ 3123.379278]  [<80b199cf>] ? file_has_perm+0x7f/0x90
<7>[ 3123.384217]  [<80b1a5f7>] ? selinux_file_ioctl+0x47/0xf0
<7>[ 3123.389351]  [<80a227a8>] SyS_ioctl+0x58/0x80
<7>[ 3123.393754]  [<80fb45e8>] syscall_call+0x7/0x7
<7>[ 3123.398043]  [<80fb0000>] ? mmc_do_calc_max_discard+0xab/0xe4
<4>[ 3123.404220] ---[ end trace bd195cf65df321ce ]---

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

TP: gt9xx: support early suspend&resume

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

arm64: respect mem= for EFI

When booting with EFI, we acquire the EFI memory map after parsing the
early params. This unfortuantely renders the option useless as we call
memblock_enforce_memory_limit (which uses memblock_remove_range behind
the scenes) before we've added any memblocks. We end up removing
nothing, then adding all of memory later when efi_init calls
reserve_regions.

Instead, we can log the limit and apply this later when we do the rest
of the memblock work in memblock_init, which should work regardless of
the presence of EFI. At the same time we may as well move the early
parameter into arm64's mm/init.c, close to arm64_memblock_init.

Any memory which must be mapped (e.g. for use by EFI runtime services)
must be mapped explicitly reather than relying on the linear mapping,
which may be truncated as a result of a mem= option passed on the kernel
command line.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 6083fe74b7bfffc2c7be8c711596608bda0cda6e)
Signed-off-by: Alex Shi <alex.shi@linaro.org>

dts: rk3368 box r88 add power led