display-sysfs:
Do not disable HDMI in function rk_display_device_enable.

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

rk: ion: Add trace emit function for ion debug

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

HDMI: rk_fb_disp_scale is disabled.
Overscan function is achieved by fb driver, so HDMI
driver do not call this function.

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

NAND DRIVER: rk3368 support nand.
    using __dma_map_area and virt_to_phys instead of rknand_dma_map_single
 and rknand_dma_unmap_single.
    dma_map_single need dev config dma ops struct and config dma_mask.
NAND flash driver has not this config and got the incorrect phy addr return by
dma_map_single.

rk fb: add switch enable status when send uevent

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

arm64: kuser32-bit helpers: do not include unistd32.h explicitly

We get following warnings while building for arm64 arch:
----->8-----
In file included from arch/arm64/kernel/kuser32.S:32:0:
/linaro/android/kernel/pundir/arch/arm64/include/asm/unistd32.h:24:0: warning: "__NR_restart_syscall" redefined
 #define __NR_restart_syscall 0
 ^
In file included from include/asm-generic/unistd.h:1:0,
                 from /linaro/android/kernel/pundir/arch/arm64/include/uapi/asm/unistd.h:16,
                 from /linaro/android/kernel/pundir/arch/arm64/include/asm/unistd.h:50,
                 from arch/arm64/kernel/kuser32.S:31:
include/uapi/asm-generic/unistd.h:390:0: note: this is the location of the previous definition
 #define __NR_restart_syscall 128
 ^
In file included from arch/arm64/kernel/kuser32.S:32:0:
/linaro/android/kernel/pundir/arch/arm64/include/asm/unistd32.h:26:0: warning: "__NR_exit" redefined
 #define __NR_exit 1
 ^
In file included from include/asm-generic/unistd.h:1:0,
                 from /linaro/android/kernel/pundir/arch/arm64/include/uapi/asm/unistd.h:16,
                 from /linaro/android/kernel/pundir/arch/arm64/include/asm/unistd.h:50,
                 from arch/arm64/kernel/kuser32.S:31:
include/uapi/asm-generic/unistd.h:292:0: note: this is the location of the previous definition
 #define __NR_exit 93
 ^
-----8<-----

This patch removes unitstd32.h include to avoid duplication of
"__NR_" syscall definitions.

This patch is based on AOSP commit: cfc7e99e9e3900056028a7d90072e9ea0d886f8d,
"arm64: Add __NR_* definitions for compat syscalls", which adds
__NR_* definitions to asm/unistd32.h, moves the __NR_compat_*
definitions to asm/unistd.h and removes all the explicit unistd32.h
includes apart from the one building the compat syscall table.
The aim is to have the compat __NR_* definitions available but
without colliding with the native syscall definitions (required
by lib/compat_audit.c to avoid duplicating the audit header files
between native and compat).

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Jon Medhurst <tixy@linaro.org>

rk fb: update message info when page fault

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

rk fb: send uevent when change video mode

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

mmc: core: fix race condition in mmc_wait_data_done

The following panic is captured in ker3.14, but the issue still exists
in latest kernel.
---------------------------------------------------------------------
[   20.738217] c0 3136 (Compiler) Unable to handle kernel NULL pointer dereference
at virtual address 00000578
......
[   20.738499] c0 3136 (Compiler) PC is at _raw_spin_lock_irqsave+0x24/0x60
[   20.738527] c0 3136 (Compiler) LR is at _raw_spin_lock_irqsave+0x20/0x60
[   20.740134] c0 3136 (Compiler) Call trace:
[   20.740165] c0 3136 (Compiler) [<ffffffc0008ee900>] _raw_spin_lock_irqsave+0x24/0x60
[   20.740200] c0 3136 (Compiler) [<ffffffc0000dd024>] __wake_up+0x1c/0x54
[   20.740230] c0 3136 (Compiler) [<ffffffc000639414>] mmc_wait_data_done+0x28/0x34
[   20.740262] c0 3136 (Compiler) [<ffffffc0006391a0>] mmc_request_done+0xa4/0x220
[   20.740314] c0 3136 (Compiler) [<ffffffc000656894>] sdhci_tasklet_finish+0xac/0x264
[   20.740352] c0 3136 (Compiler) [<ffffffc0000a2b58>] tasklet_action+0xa0/0x158
[   20.740382] c0 3136 (Compiler) [<ffffffc0000a2078>] __do_softirq+0x10c/0x2e4
[   20.740411] c0 3136 (Compiler) [<ffffffc0000a24bc>] irq_exit+0x8c/0xc0
[   20.740439] c0 3136 (Compiler) [<ffffffc00008489c>] handle_IRQ+0x48/0xac
[   20.740469] c0 3136 (Compiler) [<ffffffc000081428>] gic_handle_irq+0x38/0x7c
----------------------------------------------------------------------

Because in SMP, "mrq" has race condition between below two paths:
path1: CPU0: <tasklet context>
  static void mmc_wait_data_done(struct mmc_request *mrq)
  {
    mrq->host->context_info.is_done_rcv = true;
    //
    // If CPU0 has just finished "is_done_rcv = true" in path1, and at
    // this moment, IRQ or ICache line missing happens in CPU0.
    // What happens in CPU1 (path2)?
    //
    // If the mmcqd thread in CPU1(path2) hasn't entered to sleep mode:
    // path2 would have chance to break from wait_event_interruptible
    // in mmc_wait_for_data_req_done and continue to run for next
    // mmc_request (mmc_blk_rw_rq_prep).
    //
    // Within mmc_blk_rq_prep, mrq is cleared to 0.
    // If below line still gets host from "mrq" as the result of
    // compiler, the panic happens as we traced.
    wake_up_interruptible(&mrq->host->context_info.wait);
  }

path2: CPU1: <The mmcqd thread runs mmc_queue_thread>
 static int mmc_wait_for_data_req_done(...
 {
    ...
    while (1) {
          wait_event_interruptible(context_info->wait,
                  (context_info->is_done_rcv ||
                   context_info->is_new_req));

  static void mmc_blk_rw_rq_prep(...
  {
    ...
    memset(brq, 0, sizeof(struct mmc_blk_request));

This issue happens very coincidentally; however adding mdelay(1) in
mmc_wait_data_done as below could duplicate it easily.
  static void mmc_wait_data_done(struct mmc_request *mrq)
  {
    mrq->host->context_info.is_done_rcv = true;
    mdelay(1);
    wake_up_interruptible(&mrq->host->context_info.wait);
  }
At runtime, IRQ or ICache line missing may just happen at the same place
of the mdelay(1).

This patch gets the mmc_context_info at the beginning of function, it can
avoid this race condition.

Signed-off-by: Jialing Fu <jlfu@marvell.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: lintao <lintao@rock-chips.com>

rk3368: clk: powerdomain: enable powerdomain func.

test:Passed the special test.Test machine 15 for P9 and test 12H.
Have the test report form Quality department.

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

rk fb: do something when user set invalid config

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

rk: iommu: enable iommu by default on rk33xx platform

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

dts: rk3368: add mcu jtag pcl sd1 inactive state

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

rk fb: set retire fence fd to -1 when ignore this frame

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

HDMI: calling rk_fb_switch_screen() to close vop related to HDMI
      before calling switch_set_state() when HDMI is removed.
      For android hwcompser need to make sure vop is disabled when
      received hdmi removing event.

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

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

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

rk3368-p9: dts: enabled  change ddr-freq

usb: dwc_otg: fix bugs

1.Cancel usb vbus detect work in driver shutdown rountine
2.Check empty list
3.Disable usb interrupt before usb mode change

TEST:

1.reboot test
2.while true; do
    echo 1 > force_usb_mode;busybox sleep 5;
    echo 2 > force_usb_mode;busybox sleep 5;
  done

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

IEP: Support processing part of input image

Enable virtual size and actual size and start offset, to support
processing part of input image.

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

HDMI: call function hdmi->ops->disable() if it is disabled.
      For system can not be wakeup under following case:
      step1. Disable HDMI.
      step2. set system to deep sleep mode.
      step3. remove HDMI connection.
      step4. wake up system.

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

rk fb: when unplug hdmi,post fb to display

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

rk fb: hdmi 24hz frame time need 41ms

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

rk fb: recovery need two framebuffer

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

RK3368 DDR: add support 3368 ddr change freq function

note:need using new trustimage and uboot for support ddr change freq

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

i2s:fix the hdmi no sound sometimes
    support for hdmi passthrough output

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

rk3368 lcdc: flush update regs worker when switch screen

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

arm64: rockchip: rockchip_defconfig enabled rk818 & gt9xx & es8316

rk fb: ignore frame when in hdmi switch or set error config

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

rk3368 lcdc: reset lcdc when switch screen video mode

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

ARM64: dt: rk3368: add driver support for rk818

Support rk818 pmic, patch is from zhangqing@rock-chips.com.

Signed-off-by: Zhangqing <zhangqing@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

rk3368-box.dts: enable uboot logo.

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

dts:rk3368-box.dts default iommu

RK3368 GPU version: L0.12
1. Instead kmalloc to kzalloc.
2. Clear cleanup_sync in pvr_sync_clean_freelist.

rk3368:mipi: Solve clk_unprepare error problem when plug and pull out hdmi.

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

rk3368: clk: clk_add_recalc_ddr_freq.

Get ddr frequency correctly.

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

mailbox: rockchip: add driver for Rockchip SoCs integrated mailbox && System Control and Power Interface(SCPI) protocol

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

rk fb: from rk3368 fb only need to reserved 1 framebuffer

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

delete unused file

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

HDMI: revert commit 3fe08a661c106d071afb45ddf3660c2e92fe8b52 for
      find root reason on commit 7f2f16780d1a27cffcaa8a2310621771174defe1.

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

HDMI: improve cec function:
        1. To get logic address more stable, we ping 3 times to each
   logic address. If the result is NACK for two times, this
   logic address is not occupied.
        2. If transmmit cec data failed, retry immediately.
        4. set CECOP_IMAGE_VIEW_ON only taget to TV, not broadcasting.

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

HDMI: fix edid mode list error: set head->prev to edid->modelist.

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

Merge tag lsk-v3.10-15.03-android

lsk-v3.10-15.03-android release

arm64: rockchip: rk3368 support boot from little core without swap

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

rm64: rockchip: rockchip_defconfig enable POWERVR_ROGUE

just for debug

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

arm64: rockchip: rockchip_defconfig disable reboot while panic

just for debug

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

modify wifi: load driver when kernel bootup:
 can increase speed of wifi open/close
 can solve memory alloc fail when open wifi

usb: gadget: MTP support compat ioctl

usb: dwc_otg: fix usb otg force_device_mode

TEST: set rockchip,usb-mode = <2> in dts and then the usb works

Tested-by: huang zhibao <hzb@rock-chips.com>
Signed-off-by: lyz <lyz@rock-chips.com>

rk3368 lcdc: fix fps show error

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

rk3368-p9: dts : add core&gpu dvfs table

rk3368: thermal: add suspend judeg

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

mend debug info

rk3368-p9 : dts: set vccio to 3.3V

rk3368 lcdc: update lcdc interface for mutile area check

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

rk fb: add consider vop full mutile area for vsync register check

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

rk818 battery update:low power check and statu reg setting,uboot

rk3368-p9 : dts: enable dsihost0

rk3368-p9: dts: disabled vdd_arm when deep yxsuspend

mipi-ld089wu1: increase lcdc frame rate to 60 fps.

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

Revert "ARM64: dts: act8846: ldo5 output 3.0v"

This reverts commit 1fff298dee47c7d9280ef895296a6294652dc9d0.

defconfig: add rk1000 support

HDMI: fix crash error when insert HDMI with following log:
      Unable to handle kernel paging request at virtual address 40ce80f8
      pgd = ffffffc001022000
      [40ce80f8] *pgd=0000000025b19003, *pmd=000000001cb1f003, *pte=0000000000000000
      Internal error: Oops: 96000005 [#1] PREEMPT SMP
      Modules linked in: pvrsrvkm(O) drmboot(PO)
      CPU: 7 PID: 2558 Comm: kworker/u16:1 Tainted: P        W  O 3.10.0 #66
      Workqueue: hdmi-ff980000.hdmi hdmi_work_queue
      task: ffffffc01ca83f00 ti: ffffffc033e00000 task.ti: ffffffc033e00000
      PC is at hdmi_wq_insert+0xa4/0x2ac
      LR is at hdmi_wq_insert+0x74/0x2ac
      pc : [<ffffffc000341014>] lr : [<ffffffc000340fe4>] pstate: 60000145

      Use inline fuction hdmi_destroy_modelist replace fb_destroy_modelist.
      For unkown reason, variable struct hdmi *hdmi is deferent before and
      after calling fb_destroy_modelist.

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

dts: lcd-box.dtsi change screen-type fome SCREEN_HDMI to SCREEN_RGB

spdif: init spdif later

defconfig: add usb video camera support

HDMI: remove limited conditions of calling switch_set_state.
      Application should read /sys/class/display/HDMI/audioinfo
      to detect sink device support audio or not.

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

rk_fb: 1. Make sure fb_par->state lowest value is zero.
       2. For box, video layer z-order is always zero.

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

RK3368 GPU version: L0.11
Fix 'Watchdog detected hard LOCKUP on cpu 0' bug casued by illegal visit register after disable clk.

clk: rockchip: dump more cru register when panic

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

rk3368: iommu: fix hevc_mmu base address

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

rk3368 lcdc: fix deadlock when close lcdc and update reg

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

rk3368: efuse: fix warning and
renamed rockchip_efuse_get_temp to rockchip_efuse_get_temp_adjust;

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

rk3368: efuse: change efuse get temp func

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

arm64: Fix deadlock scenario with smp_send_stop()

If one process calls sys_reboot and that process then stops other
CPUs while those CPUs are within a spin_lock() region we can
potentially encounter a deadlock scenario like below.

CPU 0                   CPU 1
-----                   -----
                        spin_lock(my_lock)
smp_send_stop()
 <send IPI>             handle_IPI()
                         disable_preemption/irqs
                          while(1);
 <PREEMPT>
spin_lock(my_lock) <--- Waits forever

We shouldn't attempt to run any other tasks after we send a stop
IPI to a CPU so disable preemption so that this task runs to
completion. We use local_irq_disable() here for cross-arch
consistency with x86.

Based-on-work-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Arun KS <getarunks@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit b9acc49ee9464f8f8232a790045d057eb158e869)

Conflicts:
arch/arm64/kernel/process.c

arm64: Fix machine_shutdown() definition

This patch ports most of commit 19ab428f4b79 "ARM: 7759/1: decouple CPU
offlining from reboot/shutdown" by Stephen Warren from arch/arm to
arch/arm64.

machine_shutdown() is a hook for kexec. Add a comment saying so, since
it isn't obvious from the function name.

Halt, power-off, and restart have different requirements re: stopping
secondary CPUs than kexec has. The former simply require the secondary
CPUs to be quiesced somehow, whereas kexec requires them to be
completely non-operational, so that no matter where the kexec target
images are written in RAM, they won't influence operation of the
secondary CPUS,which could happen if the CPUs were still executing some
kind of pin loop. To this end, modify machine_halt, power_off, and
restart to call smp_send_stop() directly, rather than calling
machine_shutdown().

In machine_shutdown(), replace the call to smp_send_stop() with a call
to disable_nonboot_cpus(). This completely disables all but one CPU,
thus satisfying the kexec requirements a couple paragraphs above.

Signed-off-by: Arun KS <getarunks@gmail.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 90f51a09ef83703b6c2e0434e0384b61b59699d3)

rk3368: thermal: add adjust temp from efuse

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

rk3368: add rockchip_get_temp function and
rockchip_get_leakage support for 3368

mipi: arm64: rockchip_defconfig enable mipi default.

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

rk3368: dvfs: avoid null-pointer dereference in dvfs_get_temp

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

mmc: rk_sdmmc: substitude regulator_set_voltage for io switch usage

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

HDMI: rockchip-hdmiv2:
Set i2c5_hdmi to gpio mode when suspend and reset
it to hdmi ddc mode when system resume.

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

HDMI: add dts node "rockchip,defaultmode" to define HDMI default output mode.

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

mipi: rk3368 support power domain - pd_mipi_dsi.

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

Merge branch develop-3.10

mipi: correct coding style error of rk32_mipi_dsi.c

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

HDMI: fix feature SUPPORT_TMDS_600M filter error.
For some sink device, it's max tmdsclk is only 300M, but
it support 4K YUV420 mode, so it can be filted by feature
SUPPORT_TMDS_600M under current code.

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

HDMI: fix feature SUPPORT_TMDS_600M filter error.
For some sink device, it's max tmdsclk is only 300M, but
it support 4K YUV420 mode, so it can be filted by feature
SUPPORT_TMDS_600M under current code.

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

add rga2 pd_clk support

update 8723bu wifi driver
1.Improve_P2P_compatibility for Android L
2.Fix_HiddenAP_handle
3.P2P ScanSparse For Miracas

RK3368 GPU version: L0.10
Init Power Rogue DDK code

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

rk3368: dvfs: add temperature control

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

rk3368: pwm: add pwm interface for cabc

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

rk3368 lcdc: CABC regulation pwm in frame start

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

rk3368 dts: add backlight node into lcdc

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

rk fb: add lut for CABC

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

rk fb: only use iommu need to check config

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

rk fb: add lut for CABC

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

rk fb: only use iommu need to check config

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

disabled gmac as default in rk3368.dtsi

sensor: add mpu6500 accel support