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

rk3368:camera: change aclk_isp from <&gates17 0> to <&gates16 0>.

default disable gmac in rk3368-p9_818.dts

dts: rk3368: enable fclk_mcu\stclk_mcu\clk_jtag temporarily

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

arm64: rockchip: update rockchip_defconfig by savedefconfig

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

arm64: rockchip: rockchip_defconfig enable DEBUG_INFO

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

Merge branch develop-3.10

Conflicts:
arch/arm/mach-rockchip/dvfs.c

usb: dwc_otg: fix bug in FORCE_HOST_MODE

rk3368: usb: adjust usb phy parameter

rk: arm64: disable set pm_power_off for compatible with old pmic driver

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

DMA: pl330: add chan_status to mutex between pl330_tasklet and pl330_control DMA_TERMINATE_ALL

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>

camsys_drv: v0.0x1e.0

rk fb: box product not need to load screen when switch screen par enable is zero

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

rk fb: fix open hdmi open backlight again in no dual mode

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

rk3368 lcdc: support win mirror and update NO_DUAL mode

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

rk fb: compatible when 32bit system call used on 64bit kernel

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

rk3368 lcdc: add CABC mode config

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

solve bluetooth hid problem:
  when bluetooth hid device connected, the key is delayed to be reponse about 5 second

revert drivers/hid/uhid.c of commit 522c0bb37a66e65b704a4bd0f1bee7fec526dd32
  solve uhid Bad address error in 64bit cpu

rk fb: box product not need to load screen when switch screen par enable is zero

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

revert drivers/hid/uhid.c of commit 522c0bb37a66e65b704a4bd0f1bee7fec526dd32
  solve uhid Bad address error in 64bit cpu

rk fb: if not want the config effect,set reserved[3] bit[0] 1

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

rk fb: if uboot-logo-on set 1, open iommu when iommu en

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

rk fb: update pixclock init value and scale mode only support ONE_DUAL mode

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

rk fb: add win mirror pos config

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

rk fb: add support phy address config

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

rk fb: compatible with 32 bit system

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

mmc: rk_sdmmc: remove hpclk ops in set_sdio_status callback

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

mmc: rk_sdmmc: close FJTAG when drv probe

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

rk fb: update check var screen info

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

solve realtek wifi driver compile error with rk3368

Revert "Add flags parameter to get_country_code template"

This reverts commit a3d5a3f5affd45d9aa21daf04d4eb543fd3ed444.

Conflicts:
include/linux/wlan_plat.h

dvfs: add gpu temperate control

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

arm64: rockchip: rk3368: set sleep idle latency as large as possible

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

dvfs: add gpu temperate control

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

rk3368: support armoff

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

rk3368: update arm dvfs table and add gpu 576M

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

pd: rk3368: add qos save support

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

rk: move cpu_axi.h from arch/arm/mach-rockchip to include/linux/rockchip

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