UPSTREAM: mmc: dw_mmc: Wait for data transfer after response errors

According to the DesignWare state machine description, after we get a
"response error" or "response CRC error" we move into data transfer
mode.  That means that we don't necessarily need to special case
trying to deal with the failure right away.  We can wait until we are
notified that the data transfer is complete (with or without errors)
and then we can deal with the failure.

It may sound strange to defer dealing with a command that we know will
fail anyway, but this appears to fix a bug.  During tuning (CMD19) on
a specific card on an rk3288-based system, we found that we could get
a "response CRC error".  Sending the stop command after the "response
CRC error" would then throw the system into a confused state causing
all future tuning phases to report failure.

When in the confused state, the controller would show these (hex codes
are interrupt status register):
 CMD ERR: 0x00000046 (cmd=19)
 CMD ERR: 0x0000004e (cmd=12)
 DATA ERR: 0x00000208
 DATA ERR: 0x0000020c
 CMD ERR: 0x00000104 (cmd=19)
 CMD ERR: 0x00000104 (cmd=12)
 DATA ERR: 0x00000208
 DATA ERR: 0x0000020c
 ...
 ...

It is inherently difficult to deal with the complexity of trying to
correctly send a stop command while a data transfer is taking place
since you need to deal with different corner cases caused by the fact
that the data transfer could complete (with errors or without errors)
during various places in sending the stop command (dw_mci_stop_dma,
send_stop_abort, etc)

Instead of adding a bunch of extra complexity to deal with this, it
seems much simpler to just use the more straightforward (and less
error-prone) path of letting the data transfer finish.  There
shouldn't be any huge benefit to sending the stop command slightly
earlier, anyway.

BUG=redmine:102457

(cherry picked from commit 46d179525a1f6d16957dcb4624517bc04142b3e7)

Change-Id: I1356df95ea7851b2143ba48dc66310e203341721
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>

drm/rockchip: fix error when build rockchip drm as modules

fix build error:
drivers/gpu/drm/rockchip/rockchip_drm_fb.c:
    In function 'rockchip_drm_fb_destroy':
drivers/gpu/drm/rockchip/rockchip_drm_fb.c:74:21:
    error: 'struct rockchip_drm_fb' has no member named 'sgt'

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

driver, mpu: Increase the speed of wake up after hardware power off

Change-Id: I191324c9d4c2e5c632c6de4a408f99174f019203
Signed-off-by: Zorro Liu <lyx@rock-chips.com>

UPSTREAM: clk: rockchip: use rk3288-efuse clock ids

Reference the newly added efuse clock-ids in the clock-tree.

Change-Id: I6951728bf84be9b2af99b3c7dbebfde327a89790
Signed-off-by: ZhengShunQian <zhengsq@rock-chips.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from commit 60ecbd9d94600121ee9e8fed523e62c19f269893)

video: rockchip: vop: 3288: add parse dsp mode for VR

Change-Id: I6a8a753146591fce74df1606fcd551024778f1d1
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>

video: rockchip: vop: 3399: add parse dsp mode for VR

Change-Id: Ia3d11083a87742344c790044658b3ff61d29c091
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>

ARM64: rockchip_defconfig: enable nvmem and rockchip efuse

Change-Id: Iea135fdd5d61c38349285564cf33d704dd38b2c3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>

arm64: dts: rockchip: add efuse0 device node for rk3399

Add a efuse0 node in the device tree for the ARM64 rk3399 SoC.

Change-Id: I603e02177138f699b8b5f9d5609573547076e058
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>

UPSTREAM: nvmem: rockchip-efuse: add rk3399-efuse support

1) the efuse timing of rk3399 is different from earlier SoCs.
2) rk3399-efuse is organized as 32bits by 32 one-time programmable
electrical fuses, the efuse of earlier SoCs is organized as 32bits
by 8 one-time programmable electrical fuses with random access interface.

This patch adds a new read function for rk3399-efuse.

Change-Id: I04c70a18f7f7e77eded6ffde132baac47b3aff73
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 02baff325462cc7e81241b21959c5e62e7ca575e)

UPSTREAM: nvmem: rockchip-efuse: update compatible strings for Rockchip efuse

Rk3399-efuse is organized as 32bits by 32 one-time programmable electrical
fuses. The efuse of earlier SoCs are organized as 32bits by 8 one-time
programmable electrical fuses with random access interface.

Add different device tree compatible string for different SoCs to be able
to differentiate between the two. The old binding is of course preserved,
though deprecated.

Change-Id: Id8e0e95dd1c7897235afd47d5576d15cfcb577cc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit b3149f4e333eb629e0c4c100f337edb0b37cdb79)

ARM64: dts: rk3399-mid: close gpu power in suspend

Change-Id: Ie8d8eea49c6f7637d4e0e4b3e8749f04e90603a8
Signed-off-by: Yankun Zheng <zyk@rock-chips.com>

video: rockchip: rk fb: add disp mode for VR

DEFAULT_MODE: default mode
ONE_VOP_DUAL_MIPI_HOR_SCAN: one vop to dual mipi screen hor scan
ONE_VOP_DUAL_MIPI_VER_SCAN: one vop to dual mipi screen ver scan
TWO_VOP_DUAL_MIPI: two vop to dual mipi screen

Change-Id: I48a96369059afd5615ebf41b4b6178d7206c4f72
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>

video: rockchip: vop: 3399: add support serial rgb 8bit output

Change-Id: I297cc8ba92e0b120a5d72eaf9abe361cf564563f
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>

arm64: dts: rockchip: change rt5651 card name on rk3399-sapphire-excavator

Change-Id: If5ccdbc40a99bf7015d2c5dbf8da2638b23a60e7
Signed-off-by: Huang zhibao <hzb@rock-chips.com>

arm64: rockchip: rockchip_defconfig enable rt5651 codec

Change-Id: If2b69169d32c1863187a073c37d049dcac9f108a
Signed-off-by: Huang zhibao <hzb@rock-chips.com>

video: rockchip: fb: add reference count for vsync

Change-Id: I76ff8489f3e71f21de3461c0834424b5d1bf1962
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>

phy: rockchip-inno-usb2: correct 480m output clock stable time.

We found that the system on rk3366 SoC was crashed due to 480m
output clock of usb-phy was unstable after clock had been enabled by
gpu module.

Theoretically, 1 millisecond is a critical value for 480 output clock
stable time, so we try changing the delay time to 1.2 millisecond to
avoid this issue.

Change-Id: I8790eb3d7fccc9fbaa7b49f8d4386df147a95b75
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

BACKPORT: Don't show empty tag stats for unprivileged uids

BUG: 27577101
BUG: 27532522
hxw: fix cts com.android.cts.appsecurity.AppSecurityTests#testAppFailAccessPrivateData fail

Change-Id: Id6f7933b966ecad0b4d1249ea8ade86b97477545
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Signed-off-by: HaoXiaowei <hxw@rock-chips.com>

drm/rockchip: vop: move plane calculate to atomic_check

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

drm/rockchip: vop: remove unused device

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

ARM64: dts: rockchip: rk3399-vr: vcc3v3_s3/vdd_center off when sleep

Change-Id: Ic96087fbb0e8187920f1f5278c3db089f1688378
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>

net: rkwifi: add 'disable_proptx = 1' for AP6354

This patch add to fix AP6354's throughput abnormal in p2p mode.

Change-Id: I8c52981dfacee092493442d3223066f9d82c0334
Signed-off-by: Weilong Gao <gwl@rock-chips.com>

arm64: dts: rk3399-box: adjust cpul opp table

Adjust voltage of 1512M to 1.125v

Change-Id: I7da47f0df8b45cb769e5f273d334ce9056347235
Signed-off-by: Hans Yang <yhx@rock-chips.com>

ARM: dts: rk3288: remove nau8825 node for miniarm

This patch remove nau8825 sound card node for rk3288-miniarm board,
because the change of hardware.

Change-Id: I2bc447bb247cbc5da9452591ee13dd3ae101c299
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

Revert "UPSTREAM: usb: dwc3: gadget: disable XFER_NOT_READY"

This reverts commit 2a1f2d1e890354821dd8a8e621998d532185061d.

Refer to DWC3 databook, Table 7-7 Device Endpoint-n Events(DEPEVT),
XferNotReady is generated when the core responds NRDY to the host
on the USB. It is useful in the beginning of a transfer when
software wants to wait for the host to start polling the endpoint
before setting up TRBs. And also refer to 8.2.4 Transfer Setup
Recommendations, when using on-demand transfers, the XferNotRead
event must be enabled.

TEST=Set usb gadget work as RNDIS, connect to win7/win10, check
the RNDIS function

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

video: rockchip: vop: 3366: add reg restore for interrupt register

Change-Id: I088d4ef85acc786f8e5ec123b73f6ed504c83dcd
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>

ASoC: es8316: fix pop noise issue when shutdown and reboot

Change-Id: Iceb02b033803afd0e66ea34a4d04e02d4487a557
Signed-off-by: zhangjun <zhangjun@rock-chips.com>

ARM: dts: rockchip: add sdcard io-domain node for miniarm

Both 3.3v and 1.8v are available on rk3288-miniarm board, so add sd
io-domain support in case need to deploy UHS speed mode.

Change-Id: I44a7c775620e32105c8c1b91219aac8b9d8b9e92
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>

ASoC: rt5651: add codec driver

Change-Id: Id538b6e4abb33fb6c01a5d7e89d1a0f269f29867
Signed-off-by: Huang zhibao <hzb@rock-chips.com>

arm64: dts: rk3399: add reserved memory for drm loader display

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

drm/rockchip: optimize the loader display

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

input: make light sensor cm32181 works on rk3399 tablet product

Change-Id: I6a3e93ea5480ab66f2b67a826a88ac7e7f1416c8
Signed-off-by: jerry.zhang <jerry.zhang@rock-chips.com>

rockchip/vcodec: remove noisy log on encoder

New user encoder will send larger register size to kernel with extra
info right after the register file. The extra information will specify
the offset patch for address registers. This behavior will cause a lot
of noisy log. So we need to disable it.

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

dt-bindings: Add AUO H546DLB01 single channel MIPI screen dts

H546dlb01 is a 5.46 inch OLED screen with resolution 1080x1920.

Change-Id: I977f355c53c58f6dba46c4581fc8190bfce04cf2
Signed-off-by: bivvy <bivvy.bi@rock-chips.com>

cpufreq: interactive: add touch boost and init some param on rockchip platform

Change-Id: Iebc2edaedbeeb5a3a758b963230b5f95136b2af6
Signed-off-by: Chen Liang <cl@rock-chips.com>

ARM64: rockchip: cpufreq-dt: enable CPUFREQ_HAVE_GOVERNOR_PER_POLICY

The cpu class need independent governor tunables for big/little system.

Change-Id: I0c31f694b6790c05c18b0c3d5522fa75143f293e
Signed-off-by: Chen Liang <cl@rock-chips.com>

staging: android: add timed gpio driver to present vibrator control interface to userspace

Change-Id: I725a8620669c4286dda5bcbbbd1b984843a6b006
Signed-off-by: jerry.zhang <jerry.zhang@rock-chips.com>

arm64: dts: rockchip: add vibrator device node for rk3399 tablet product

Change-Id: I932bd2e56c7addbb7b4f725ad5c31779125dfc57
Signed-off-by: jerry.zhang <jerry.zhang@rock-chips.com>

ARM64: dts: rockchip: rk3399-tablet/vr: disabled cpu_l 1.5G

Change-Id: Iddaea7efc29d513d547d30f73f5cfee054605153
signed-off-by: Wu Liangqing <wlq@rock-chips.com>

video: rockchip: dp: fix dp bugs when dp probing and connecting.

set port->cap_lanes to 0 when dp connected error last time, and allow
dp go on probing if there is only one fusb302.

Change-Id: I90169f77ac02a94f42da96f20aacfd51b898de09
Signed-off-by: wenping.zhang <wenping.zhang@rock-chips.com>

arm64: dts: rockchip: enable dp for sapphire-excavator-edp board

Change-Id: I7097592d124952bf12677c69146576525a125bbe
Signed-off-by: Zorro Liu <lyx@rock-chips.com>

drivers: iio: imu: add sync attribute in sysfs,for HAL sending sync message to nanoc

Change-Id: I1ab3e116207e88fa380e90ffcc84866ffcec01ce
Signed-off-by: lanshh <lsh@rock-chips.com>

hid: rkvr: add sync process before start snesor data transfer if sync_string no empty

Change-Id: Ifd20949963171fff4df694b58b629065a37ea492
Signed-off-by: lanshh <lsh@rock-chips.com>

ARM64: dts: rockchip: rk3399-tablet: modify the gpu's opp table

Change-Id: I42aa5514b64882b5c0b7eabcc01e2c908321e1a8
signed-off-by: Wu Liangqing <wlq@rock-chips.com>

arm64: dts: rockchip: enable typec0 for Sapphire board

Change-Id: I9a32472307329ed6d7121359f77aa1aaba501821
Signed-off-by: Zorro Liu <lyx@rock-chips.com>

ARM64: dts: rk3399: enable cdn_dp_fb for box

Change-Id: Idf28d25381b20e1a92193a3a825405a6ef41dfa5
Signed-off-by: xuhuicong <xhc@rock-chips.com>

video: rockchip: dp: fix sound problam when disconnect to dp

Change-Id: I49b96426939f0c9d1c016ca00cc5df1f43cbf848
Signed-off-by: xuhuicong <xhc@rock-chips.com>

soc: rockchip: mmc: add emmc vendor storage

Change-Id: I3996cccaed265af2295dbc1ee77746928e1beec5
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com>

ARM: dts: rockchip: Add SPDIF optical out on rk3288-firefly

Enable the SPDIF optical output on rk3288-firefly boards.

Change-Id: I84701df1b193e69673a963045cbd9fb4069e9741
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

ARM: dts: rockchip: make vcca_33 always on in firefly board

rk3288-firefly board needs vcca_33 to be always on.

Change-Id: Iffde1a2857b92d10bf8f306c2257480fdf7f091c
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

MALI: midgard: RK: fix compiling fail without CONFIG_REGULATOR defined

Change-Id: I4eb6fcae00d934c1fc2cbffc888a88c2fda9c22d
Signed-off-by: chenzhen <chenzhen@rock-chips.com>

ARM64: dts: rockchip: rk3399-vr: set syr827 pwm mode

Change-Id: I8916c1f34f5dd39c500e0e18fe174ce1c62607b4
signed-off-by: Wu Liangqing <wlq@rock-chips.com>

ARM64: dts: rk3399-mid: ajust eas parameter

Ajust eas parameter to match opp table.

Change-Id: I752b5271ab1bffb009135708250694ac2d3c5e1c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

backlight: move the backlight off operation to the front of the LCD

The backlight pwm operation depends on vop module if vop_pwm enabled.

Change-Id: I5b87e4dabb4ef3767344a60e7e324d23fbbbc1cd
Signed-off-by: Zhou weixin <zwx@rock-chips.com>

arm64: dts: rk3399-vr: modify the cpu's opp table

Change-Id: I7f659dd159188205c6f8ee12bd0d2c189854cf34
signed-off-by: Wu Liangqing <wlq@rock-chips.com>

arm64: dts: rk3399-vr: modify the gpu's opp table

Change-Id: I52483fd8fd85d97ff8bef1908a1a370fb8b62aec
signed-off-by: Wu Liangqing <wlq@rock-chips.com>

video: rockchip: dp: add support for nanoc discret vr device.

add feature of SUPPORT_RK_DISCRETE_VR for discrete vr device in dp,
and add sync code for nanoc vr device.

Change-Id: I5fe1f29ede8ac35f99b62e524bf541a7aaee4307
Signed-off-by: wenping.zhang <wenping.zhang@rock-chips.com>

arm64: rockchip_defconfig: add CONFIG_HID_RKVR for rkvr

Change-Id: I67b1a1af3756b78773a9e7a0853e6c22faac11c5
Signed-off-by: lanshh <lsh@rock-chips.com>

sound: usb: add USB ID for nanoc audio codec

Change-Id: I3c25691a74c9cf66e587fd4a5dcb6cef46040eec
Signed-off-by: lanshh <lsh@rock-chips.com>

ARM64: dts: rk3399: add support-hw-poweroff for mpu6500 node

Change-Id: I49f25a362f43f3e36787125389c81e565b4aff6b
Signed-off-by: Zorro Liu <lyx@rock-chips.com>

driver, inv_mpu: store register suspend and recover register resume, if hardware poweroff when suspend

Change-Id: I758be101acfd7a3a756c75bd4f13542daef850d1
Signed-off-by: Zorro Liu <lyx@rock-chips.com>

iio: imu: add usb sensor driver to support rkvr

Change-Id: I7aeaba5a90f427304b0debf0e0063685fa2f6f09
Signed-off-by: lanshh <lsh@rock-chips.com>
Signed-off-by: Zorro Liu <lyx@rock-chips.com>

hid: add usb hid driver for rockchip discrete vr device.

repor key event and send sensor data to iio driver

Change-Id: I6fdaa1eb88e8974675550061f022ce506e00f28e
Signed-off-by: lanshh <lsh@rock-chips.com>

usb: dwc3: fix possible NULL pointer dereference for rockchip plat

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

usb: dwc3: gadget: stop gadget even if fail to stop ctrl

In dwc3_gadget_suspend(), if fail to stop DWC3 controller,
and return without do __dwc3_gadget_stop(), it will not
disable ep0 and ep1, and the dep->flags stays in the state
DWC3_EP_ENABLED, this will casue gadget connect failed.

A typical case is:
DWC3 works as DRD mode, fist plug in OTG HOST cable and
works as HOST mode, then plug out HOST calbe, after this
operation, it will do runtime supend -> dwc3_gadget_suspend()
-> dwc3_gadget_run_stop() fail -> return without stop gadget,
and then plug in OTG device cable, fail to connect with PC.

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

usb: dwc3: support runtime power management for rockchip platform

This patch adds runtime power management support for rockchip platform.
It depends on extcon notifier to do runtime resume and runtime suspend.
And since the dwc3 core dev is the only child of dwc3 rockchip dev, so
we need to ensure dwc3 core dev enter runtime suspend befer put dwc3
rockchip dev in runtime suspend. And after do runtime resume dwc3 core
dev, the PM core will resume dwc3 rockchip dev prior to dwc3 core dev
resume. With this patch, we can power off USB3 power domain and disable
clocks in runtime suspend.

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

arm64: dts: rk3399-box: vdd_gpu force PWM mode via regulator mode

Change-Id: I20552fb4896cc6de20b7729a6ec42447c447c01c
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>

ARM64: dts: rockchip: rk3399: vr: adjust temperature

Change-Id: Ifef9ff7092a6f80e805bfcb249ed41c4a5c7a4fa
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>

ARM64: dts: rockchip: rk3399: vr: add io for syr828/827 sleep off contrl

Change-Id: Ibc9419b86c0038217a69e14a2b7dd511ebe58f5d
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>

power: rk818: add power on/off source print

Change-Id: I4ea6cff9ecd0ebe87fb454cd26945c252f342e1f
Signed-off-by: Binyuan Lan <lby@rock-chips.com>

arm64: dts: rk3399-rev3: modify the cpu's opp table

The opp table can cover the chips whose leakage is between 30mA and 60mA.

Change-Id: I50be3923eb6016cba6309380006ce902d22fe123
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>

arm64: dts: rockchip: enable dmc and set A53 1.5G voltage to 1.1V on rk3399 mid

Change-Id: Iba037b12276f2f4db22611e6cb944643056345c6
Signed-off-by: Zhou weixin <zwx@rock-chips.com>

arm64: dts: rockchip: add 32.768K clk node for BT on rk3399 evb/mid/vr board

Change-Id: I712fa3915e7fa071d136cdf157dceee6b1f18994
Signed-off-by: Weilong Gao <gwl@rock-chips.com>

ARM64: dts: rk3399-android: add ddr devfreq nodes for rkfb

Devfreq will register notify to rkfb, to handle vop during ddr
changing frequency.

Change-Id: I22365597054b2155ef1b9754d6ecac243520b3ee
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

PCI: rockchip: fix wrong clr for phy interrupt

We probably didn't notice this as we still use
evb-rev1 to test our SSD with PCIe on which
the client interrput is broken actually.

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

arm64: rockchip_linux_defconfig: add some driver config according to cros

Some changes is made by savedefconfig

Change-Id: I19ac249e4510368299e8376bfbda30a34ade7b59
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

arm64: dts: rockchip: enable the backlight device node for Sapphire-linux

Change-Id: I6b9fe6d2563975a5524262aa3c32ebd37741f33c
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

video: rockchip: fb: add car_reversing for px5

if userspace set car_reversing 1, rk fb will ignore
buffer from hwc.

Change-Id: Ib3bb9a105a8d6b7a2cc0e71c21bf8cc208b4ffd3
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>

pwm: rockchip: add rk_fb config_done for voppwm

Change-Id: Iea012bfcec972f4b722950ea06713d2df4690242
Signed-off-by: David Wu <david.wu@rock-chips.com>

video: rockchip: hdmi: add new hdmi resolution mode support for discrete vr device.

For some special hdmi pixclock we should add support for this clock in hdmi phy mpll table.

Add new format SUPPORT_RK_DISCRETE_VR for rockchip discrete vr device,if hdmi device
is rockchip discrete vr device, please set the vic = HDMI_VIDEO_DISCRETE_VR in hdmi timing.

Change-Id: I820f967a84fbb7737cd9e1c2951b89df63863298
Signed-off-by: wenping.zhang <wenping.zhang@rock-chips.com>

video: rockchip: hdmi: add SUPPORT_VESA_DMT feature support for rk3399 hdmi.

Change-Id: Idafd772831593285af864eb3adf045e99f3c8d4a
Signed-off-by: wenping.zhang <wenping.zhang@rock-chips.com>

ARM64: dts: rk3399: syr82x: support vsel pin to en/disable dcdc

Set vsel pin to active to disable DCDC,
Set vsel pin to inactive to enable DCDC.

Change-Id: Ie7d98730e5f59ffe38f0b88388cfb5b852316fe3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>

regulator: fan53555: fix up the dcdc is disabled when reboot

Before reboot if the DCDC is disabled,
the DCDC is still disabled after restart.
We have an method to workaround:
Use vsel pin to switch the voltage between value in FAN53555_VSEL0
and FAN53555_VSEL1. If VSEL pin is inactive, the voltage of DCDC
are controlled by FAN53555_VSEL0, when we pull vsel pin to active,
they would be controlled by FAN53555_VSEL1.
In this case, we can set FAN53555_VSEL1 to disable dcdc,
So we can make vsel pin to active to disable dcdc,
VSEL pin is inactive to enable DCDC.

Change-Id: I14c823ed11dc3369044ad2ed0b53a6027acbccd0
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>

arm64: dts: rockchip: set gpu and cpu power control in suspend on rk3399 mid

Change-Id: I0c96ccc04f18c3a5df3a045dde62c7741acbbfbd
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Zhou weixin <zwx@rock-chips.com>

rockchip/vcodec: fix crash on decoder buffer empty

On vpu2 register separate interrupt bit and enable bit to different
register. When decoder found a buffer empty error which means the input
stream is not enough for one complete frame decoder will not stop
reading input stream buffer until it reach the end of buffer. This will
cause mmu fault on the buffer end.

In order to avoid this case decoder need to clear the enable bit in the
enable register to stop decoder from reading.

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

rockchip/rga: add src1 mmu table config when ABB mode

when rga2 use alpha under mmu, it must config src1
mmu addr for src1 channel will read mmu table

Change-Id: I6131a546421a5195bf3ae183f6fc7cb50fb09cfc
Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>
Signed-off-by: Zhiqin Wei <wzq@rock-chips.com>

Revert "arm64: Increase the max granular size"

This reverts commit 97303480753e48fb313dc0e15daaf11b0451cdb8.

All Rockchip SoCs only have 64 bytes cache line length, so
it is not need this patch, which increase memory consumption.

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

regulator: fan53555: add regulator-initial-mode to set default mode

regulator-initial-mode: default mode to set on startup
regulator-initial-mode is set as:
        REGULATOR_MODE_FAST                     0x1
        REGULATOR_MODE_NORMAL                   0x2
Example:
 vdd_cpu_b: syr827@40 {
                compatible = "silergy,syr827";
                reg = <0x40>;
                vin-supply = <&vcc5v0_sys>;
                regulator-compatible = "fan53555-reg";
                regulator-name = "vdd_cpu_b";
                regulator-min-microvolt = <712500>;
                regulator-max-microvolt = <1500000>;
                regulator-ramp-delay = <1000>;
                fcs,suspend-voltage-selector = <1>;
                regulator-always-on;
                regulator-boot-on;
                regulator-initial-state = <3>;
                regulator-initial-mode = <1>;/*1:pwm 2: auto mode*/
                        regulator-state-mem {
                        regulator-off-in-suspend;
                };
        };

Change-Id: I4d3bbd50fd40531113f2cc6fe63905e24888a752
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>

PM / devfreq: add to show current load of device

Calculate current load with busytime / totaltime from status,
also show the current frequency.

Change-Id: Ic310035db9c5478aa3d0b1e526b47c451fe09d23
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

camera: rockchip: camsys driver 0.0x21.5

Change-Id: I4855b2e31fff158ae4690781ccc8e0ab0a20273c
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>

HACK: lib/kobject_uevent.c: ignore thermal uevent when suspend

Android healthd try to listen power_supply subsystem uevent,
but which will block system from suspend on big.LITTLE system
because thermal_cooling_device_unregister will called when
cpufreq_exit. So ignore this uevent when suspend.

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

thermal: rockchip: add temperature dump when panic

Change-Id: I8cf3bbaea76d379dcfd1c89482254854df62cfea
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>

ARM64: dts: rk3399: add pd control for i2s, spdif

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

UPSTREAM: ASoC: simple-card: Add pm callbacks to platform driver

Set snd_soc_pm_ops for the pm ops to make sure that the ASoC level of PM
operations are going to happen. This is needed to get suspend/resume
working correctly when the audio is using simple-card.

Change-Id: Id0355673bc89456fedd3d035cbfd0f7f8f51d1da
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 7c3767115a04bc7aa87bdbd3352d1801d4bbeea4)

ARM: dts: rockchip: vr-android: add spi1 sleep pinctrl

Change-Id: Ie3a4d8ea56dc2343a749ccc035002f0b25a356a3
Signed-off-by: Zorro Liu <lyx@rock-chips.com>

power: rk818-battery: remove zero algorithm init and add dump info

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

arm64: dts: rockchip: add cdn-dp-fb node for rk3399 android

Change-Id: Ie9651babf59d29547f6b506356cce5cd2618e5ae
Signed-off-by: xuhuicong <xhc@rock-chips.com>

arm64: rockchip: rockchip_defconfig enable dp with rk fb

Change-Id: I3208244641cb95fd14c6b814efe2cc6af214affd
Signed-off-by: xuhuicong <xhc@rock-chips.com>

video: rockchip: dp: add cdn DP support for rk3399 with rk fb

Change-Id: Iaa36594e15d19e939f0929e2d6ee2ae99b6ce799
Signed-off-by: xuhuicong <xhc@rock-chips.com>

ARM64: dts: rk3399: add dmc and dfi node

To support ddr frequency scaling function, we need
enable dmc and dfi node.

Change-Id: I84ea6bff679365d86937ff10bcdf466ea31901fb
Signed-off-by: Lin Huang <hl@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>