mmc: block: Fix tag condition with packed writes

Apparently a cut-and-paste error, 'do_data_tag' is using 'brq' for data
size even though 'brq' has not been set up. Instead use blk_rq_sectors().

Change-Id: I721c02d7a937844ecedeb6c24d8439f8a9c29fef
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

ARM64: dts: rk3399: support more frequency for evb2

RK3399 evb2 support A72 1.8G / A53 1.5G.

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

video: rockchip: vop: 3399: restore interrupt reg config

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

UPSTREAM: spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver

In gerenal, the "rockchip,rockchip-spi" string will match the dts
that's great in spi driver. After all the most of rockchip SoCs ar
same spi controller.

Then, we should keep the old style to match the dts various.

Change-Id: Ib6e7b6e778e875f644a832a6c02d94bca8d60b48
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from git.kernel.org next/linux-next.git master
 commit aa29ea3df27dbba19ef59023d0f7330f2fdc58ae)

UPSTREAM: spi/rockchip: add rk3036/rk3228/rk3368 SoCs for spi document

We had supported the rk3036/rk3066/rk3188/rk3228/rk3288/rk3368/rk3399
family SoCs in linux kernel.

Let's add the other SoCs, in order to a better understanding from the
rockchip spi document.

Change-Id: If527c4356c2049a2d5bfc88ffec4cd1350f7b9be
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 1eb1c5dc601a9f53d5bd53702d95afad337d35d2)

UPSTREAM: spi: rockchip: Spelling s/divsor/divisor/

Change-Id: I28ae83b204b0cb81e60bfc8927e1544466b360cb
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit bb51537aa825e98b970c784f802e7e09f29df3ba)

UPSTREAM: spi: rockchip: covert rsd_nsecs to u32 type

rsd_nsecs is defined as u8 memeber of struct rockchip_spi,
but using of_property_read_u32. That means we take risk of
truncation by type conversion if we pass on big value from
dt.

Change-Id: I4d3e29b64749ac8a86782413d0f41691b9ff4e84
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 108b5c8bba6be101100596bf37a165214e1c8458)

UPSTREAM: spi: rockchip: header file cleanup

Remove some of unused header files and reoder
it into alphabetical order.

Change-Id: Ib3ae644de08e7e6c6a77393940ceb8897c87e943
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit ec5c5d8ac028cfec4c7c976d93bed1734f1a670a)

UPSTREAM: spi: rockchip: check requesting dma channel with EPROBE_DEFER

Let's defer probing the driver if the return value of
dma_request_slave_channel is ERR_PTR(-EPROBE_DEFER) instead
of disabling dma capability directly.

Change-Id: I8371178a772cd310df711d7d3b5fe5288be5000d
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 61cadcf46cfdb9f7eec70527968c2b91e9823786)

UPSTREAM: spi: rockchip: migrate to dmaengine_terminate_async

dmaengine_terminate_all is deprecated, let's use
dmaengine_terminate_async for interrupt handling.

Change-Id: I8c06ef2147c0583d28eeed5b623920199efa9810
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 557b7ea34b9a10a5e13f4d7fd58ac965d801e3bd)

UPSTREAM: spi: rockchip: check return value of dmaengine_prep_slave_sg

We should check return value of dmaengine_prep_slave_sg, otherwise
we take risk of null pointer.

Change-Id: I2cc468563d630169f314e353d835ad33091c0d3c
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit ea98491133439773b69345eb9a314fc5f15e07a4)

UPSTREAM: dmaengine: Add transfer termination synchronization support

The DMAengine API has a long standing race condition that is inherent to
the API itself. Calling dmaengine_terminate_all() is supposed to stop and
abort any pending or active transfers that have previously been submitted.
Unfortunately it is possible that this operation races against a currently
running (or with some drivers also scheduled) completion callback.

Since the API allows dmaengine_terminate_all() to be called from atomic
context as well as from within a completion callback it is not possible to
synchronize to the execution of the completion callback from within
dmaengine_terminate_all() itself.

This means that a user of the DMAengine API does not know when it is safe
to free resources used in the completion callback, which can result in a
use-after-free race condition.

This patch addresses the issue by introducing an explicit synchronization
primitive to the DMAengine API called dmaengine_synchronize().

The existing dmaengine_terminate_all() is deprecated in favor of
dmaengine_terminate_sync() and dmaengine_terminate_async(). The former
aborts all pending and active transfers and synchronizes to the current
context, meaning it will wait until all running completion callbacks have
finished. This means it is only possible to call this function from
non-atomic context. The later function does not synchronize, but can still
be used in atomic context or from within a complete callback. It has to be
followed up by dmaengine_synchronize() before a client can free the
resources used in a completion callback.

In addition to this the semantics of the device_terminate_all() callback
are slightly relaxed by this patch. It is now OK for a driver to only
schedule the termination of the active transfer, but does not necessarily
have to wait until the DMA controller has completely stopped. The driver
must ensure though that the controller has stopped and no longer accesses
any memory when the device_synchronize() callback returns.

This was in part done since most drivers do not pay attention to this
anyway at the moment and to emphasize that this needs to be done when the
device_synchronize() callback is implemented. But it also helps with
implementing support for devices where stopping the controller can require
operations that may sleep.

Change-Id: Ica0822ecbe803ec9605787e30751dfb098bdbe80
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit b36f09c3c441a6e59eab9315032e7d546571de3f)

UPSTREAM: spi/rockchip: fix endian mode for 16-bit transfers

16-bit transfers must be in big endian mode on wire.

Change-Id: I21e660de04867871132e4d5b0f2d943a30167aeb
Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 0277e01aebc8895198a4717ccaf7e4fcf39ada78)

UPSTREAM: spi: rockchip: remove xfer_completion from rockchip_spi

xfer_completion isn't been used anywhere, so it can be
removed.

Change-Id: I5a653609c8afaa83665ebc050274d3c9dcf59777
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 23366a02bfd3b4d3075aefcfd71600fb1360a02e)

UPSTREAM: spi: rockchip: add missing spi_master_put

Add missing spi_master_put for rockchip_spi_remove since
it calls spi_master_get already.

Change-Id: If76b124b5122d8ca4c65014831afdf1f4893a7cc
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 844c9f476a43db0bdf61df409026a026ce98ec1b)

UPSTREAM: spi: rockchip: disable runtime pm when in err case

Before registering master, driver enables runtime pm.
This patch  pm_runtime_disable in err case while probing
driver to balance pm reference count.

Change-Id: I63688e1b07b0b157a663f67e50ac74c5273ce353
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit b8659adda9e295eca0b10a67f3b15a8644c8ed6f)

arm64: dts: rockchip: set the suspend voltage for rk3399-evb-rev2 board

Change-Id: I6e49d935b7aaa54f3a2870a477504970559da6c1
Signed-off-by: Shengfei xu <xsf@rock-chips.com>

driver, iio, mpuxxx: increase spi speed to 20Mhz when read sensor data

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

driver, iio, mpuxxx: add _RATE_DEBUG log

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

FROMLIST: ARM: dts: rockchip: enable hdmi audio on rk3036-kylin

Enable the basic hdmi audio function on rk3036 kylin board.

Change-Id: Id9d0971203a75bba9a885d590c40b2ddce355b9f
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
(am from https://patchwork.kernel.org/patch/9178535/)

FROMLIST: ARM: dts: rockchip: add simple sound card for RK3036 SoCs

Using I2S as the audio input source, and force the mclk_fs to 256.

Change-Id: Ib85ba7be4de430d5536aaaebe74bb9fde9174f16
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
(am from https://patchwork.kernel.org/patch/9178533/)

FROMLIST: drm/rockchip: inno_hdmi: add audio support

Using the common hdmi-codec driver to support hdmi audio function.

Change-Id: I8d7f4166b8c64bc3975ad305a761e88c3404b136
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
(am from https://patchwork.kernel.org/patch/9178529/)

rockchip/vcodec: add shutdown ops

Add a shutdown opertion to prevent a system halt when
reboot executing.

Before this revision, driver will try to trigger hw after
power domain disable during reboot procedure, and cause a
system halt.

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

video: rockchip: hdmi: set hdcp hclk to modify standby crash

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

Revert "clk: rockchip: rk3399: remove GRF gates clock nodes from power domains"

This reverts commit aa197c2f234f1c9df3e6a3a110baf52d6985933d.

Change-Id: I7462950df48ea833f928c7d4d952ed65486f3acb
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>

Revert "clk: rockchip: rk3399: remove all of the NOC clock nodes"

This reverts commit aa4027b568ac9a4e5c7364c84a5e0019feb75912.

Change-Id: I18d2dbab04fd199ac20146e48d08e3d16b0d6311
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>

ARM64: rockchip_defconfig: enable pwm remote control

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

input: Add IR decode driver

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

ARM64: dts: rk3399: qos: fix up the qos node invalid format

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

ARM64: dts: rk3399: pd: add clk control when pd on/off

make sure the clk is enabled when read/write qos regs.

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

MALI: rockchip: add power-off-delay function

As gpu power on and off frequently, and the interval time is smaller
than the polling time of devfreq, add power-off-delay function to
ensure devfreq work fine.

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

ARM64: dts: rockchip: rk3399: add power-off-delay-ms for gpu

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

dtsi: screen-timing: lcd-ls055r1sx04-mipi: add screen parameter for vr

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

ARM64: dts: rk3399-mid-818-android: modify gt9xx touchscreen config

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

input: touchscreen: gt9xx: add firmware for rk3399 9.7' sample mid

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

ARM64: dts: rk3399-evb: rename spdif sound card name

just to compatiable with android sdk, anyway, change it.

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

ARM64: dts: rk3399-evb: disable spdif sound default

this patch disable spdif sound in rk3399-evb.dtsi, and enable on
product dts side as required.

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

rockchip/rga: add rga support yuv 10 bit

Change-Id: Id7bd3ea75831b671f9739337c457f59c38fde4c3
Signed-off-by: Zhiqin Wei <wzq@rock-chips.com>

ARM64: dts: rockchip: rk3399-vr-android.dts: add mpuxxx spi node and disabled i2c node

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

driver, iio, mpuxxx: driver need parse more platform define from dts file

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

driver, mpuxxx: add i2c disable/enable control when write user_ctrl register

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

arm64: dts: rockchip: add ap6330 support for rk3399-vr-android

Change-Id: I4ef1e7e4a673299d6e1f713e4945d533d5327276
Signed-off-by: zzc <zzc@rock-chips.com>

net: wireless: rockchip_wlan: rkwifi: fix softap issue

Change-Id: I8eb4a60c1e81b357eeb3aabdfa2aadbcc523d0d5
Signed-off-by: zzc <zzc@rock-chips.com>

clk: rockchip: rk3399: remove all of the NOC clock nodes

There are too many NOC clocks and all of them are critical clocks.
This approach is unnecessary, we only remove them and keep them
always enable, and caused by increased power consumption is only
<=3ma.

Change-Id: I6968dd9fe5632853fade831260d0cbeeb9f8fda3
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>

clk: rockchip: rk3399: remove GRF gates clock nodes from power domains

To simplify the description of the clock for RK3399, we don't need to
add many GRF gates clock nodes and keep them always enable,

In this case, we can avoid some of the operations GRF registers exception
problems, and caused by increased power consumption is only <=1ma.

Change-Id: Ifee9df2d5f869607191c5fb1165ec3e36e7bef9d
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>

power: cw2015: fix Power capacity jump after capacity is 0%

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

video: rockchip: hdmi: fix certain tv blank when mode switch

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

arm64: dts: rockchip: add burst mode for rk3399

Rk3399 support single and burst mode, and flushp instruction.
But burst mode improve transfer efficiency.

Please refer to:
Commit 8e770f371cc2
"dmaengine: pl330: add burst mode according to dts config"

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

arm64: dts: rockchip: add burst mode for rk3366

Rk3366 support single and burst mode, and flushp instruction.
But burst mode improve transfer efficiency.

Please refer to:
Commit 8e770f371cc2
"dmaengine: pl330: add burst mode according to dts config"

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

arm64: dts: rockchip: add burst mode for rk3368

Because rk3368 pl330 dma controller doesn't support single
mode, so it is necessary to set peripherals-req-type-burst.

Please refer to:
Commit 8e770f371cc2
"dmaengine: pl330: add burst mode according to dts config"

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

ARM: dts: rockchip: add burst mode for rk3288

Because rk3288 pl330 dma controller doesn't support single
mode, so it is necessary to set peripherals-req-type-burst.

Please refer to:
Commit 8e770f371cc2
"dmaengine: pl330: add burst mode according to dts config"

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

arm64: dts: rockchip: add arm,pl330-broken-no-flushp quirk for rk3368

Pl330 integrated in rk3368 platform doesn't support
DMAFLUSHP function. So we add arm,pl330-broken-no-flushp quirk
for it.

Change-Id: Ia7f4bb6ffa1fba01dac5ac2257499dbbc9887da6
Signed-off-by: Caesar Wang <wxt@rock-chips.com>

ARM64: dts: rockchip: add rk3399 vr dts rk3399-vr-android.dts

Change-Id: I850c46c15fb7021fcba16df0890f08ddb2145de6
Signed-off-by: WU liangqing <wlq@rock-chips.com>

ARM64: dts: rockchip: Add rk3399 MID sample board with PMU of rk818.

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

ARM64: rockchip_defconfig: enable sensor driver mpuxxx

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

staging, iio, mpu: add mpu spi driver

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

staging, iio, mpu: repack mpu driver's communicate interface

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

staging: iio: new invensence mpu6050/6500 driver

Change-Id: I0f804afa1f5ad0815fe0b8f3663423db1b1c0e43
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
Signed-off-by: Zorro Liu <lyx@rock-chips.com>

ARM64: dts: rk3399: android: turn on mipi for evb rev2

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

ARM64: dts: rk3399: android: turn on mipi for evb rev1

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

ARM64: dts: rk3399: android: disabled mipi by default

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

ARM64: dts: rk3399-android: disable hdmi sound default

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

ARM64: dts: rk3399: android: disabled hdmi by default

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

ARM64: dts: rk3399: add iep power domain resource

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

rockchip/iep: add pm runtime operation

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

ARM64: dts: rockchip: rk3399-android add edp node

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

video: rockchip: edp: rk3399: add edp support

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

UPSTREAM: ARM: dts: rockchip: Add arm, pl330-broken-no-flushp quirk for rk3xxx platform

Pl330 integrated in rk3xxx platform doesn't support
DMAFLUSHP function. So we add arm,pl330-broken-no-flushp quirk
for it.

Change-Id: Ibea3bc46e460bf2cf6253e6cc1eea109f651163e
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 9bed8b41d8da3acdb72d5fafa7ac5ec0016dd188)

UPSTREAM: ARM: dts: rockchip: Add arm, pl330-broken-no-flushp quirk for rk3288 platform

Pl330 integrated in rk3288 platform doesn't support
DMAFLUSHP function. So we add arm,pl330-broken-no-flushp quirk
for it.

Change-Id: I7ebd9fdd9b17b9a05e2ae859fab6b62f2967d9e5
Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from git.kernel.org next/linux-next.git master
 commit e7d6c9b1163255d8d6594e613eac7a4a8b1806a0)

ARM: dts: rockchip: add peripherals-req-type-burst for rk3036

As the rk3036 only support the burst mode, so we need add it since
The commit 8e770f371cc27
"dmaengine: pl330: add burst mode according to dts config"
had been supported in kernel.

Change-Id: I074aa9a98c78a8ad8b1263a07690ffc2f8dfa718
Signed-off-by: Caesar Wang <wxt@rock-chips.com>

clk: rockchip: fix the rk3399 spdif incorrect bit for DPTX

Change-Id: I46e8c54de7c74c1abb001512198176ee51b638ac
Reported-by: Chris Zhong <zyw@rock-chips.com>
Tested-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>

ROCKCHIP: sched: enable the feature ENERGY_AWARE

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

ARM64: dts: rk3399: add raw data for EAS

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

ARM64: rockchip_defconfig: enable EAS

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

arm: topology: Define TC2 energy and provide it to the scheduler

This patch is only here to be able to test provisioning of energy related
data from an arch topology shim layer to the scheduler. Since there is no
code today which deals with extracting energy related data from the dtb or
acpi, and process it in the topology shim layer, the content of the
sched_group_energy structures as well as the idle_state and capacity_state
arrays are hard-coded here.

This patch defines the sched_group_energy structure as well as the
idle_state and capacity_state array for the cluster (relates to sched
groups (sgs) in DIE sched domain level) and for the core (relates to sgs
in MC sd level) for a Cortex A7 as well as for a Cortex A15.
It further provides related implementations of the sched_domain_energy_f
functions (cpu_cluster_energy() and cpu_core_energy()).

To be able to propagate this information from the topology shim layer to
the scheduler, the elements of the arm_topology[] table have been
provisioned with the appropriate sched_domain_energy_f functions.

Change-Id: I8c014bbd04f6a1d57892be9bfa16affe07948dcf
cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

Merge branch 'lsk-v4.4-eas-v5.2' of git://git.linaro.org/arm/eas/kernel.git

* lsk-v4.4-eas-v5.2:
  DEBUG: schedtune: add tracepoint for schedtune_tasks_update() values
  DEBUG: schedtune: add tracepoint for CPU boost signal
  DEBUG: schedtune: add tracepoint for SchedTune configuration update
  DEBUG: sched: add energy procfs interface
  DEBUG: sched,cpufreq: add cpu_capacity change tracepoint
  DEBUG: sched: add tracepoint for CPU load/util signals
  DEBUG: sched: add tracepoint for task load/util signals
  DEBUG: sched: add tracepoint for cpu/freq scale invariance
  sched/fair: filter energy_diff() based on energy_payoff value
  sched/tune: add support to compute normalized energy
  sched/fair: keep track of energy/capacity variations
  sched/fair: add boosted task utilization
  sched/{fair,tune}: track RUNNABLE tasks impact on per CPU boost value
  sched/tune: compute and keep track of per CPU boost value
  sched/tune: add initial support for CGroups based boosting
  sched/fair: add boosted CPU usage
  sched/fair: add function to convert boost value into "margin"
  sched/tune: add sysctl interface to define a boost value
  sched/tune: add detailed documentation
  fixup! sched/fair: jump to max OPP when crossing UP threshold
  fixup! sched: scheduler-driven cpu frequency selection
  sched: rt scheduler sets capacity requirement
  sched: deadline: use deadline bandwidth in scale_rt_capacity
  sched: remove call of sched_avg_update from sched_rt_avg_update
  sched/cpufreq_sched: add trace events
  sched/fair: jump to max OPP when crossing UP threshold
  sched/fair: cpufreq_sched triggers for load balancing
  sched/{core,fair}: trigger OPP change request on fork()
  sched/fair: add triggers for OPP change requests
  sched: scheduler-driven cpu frequency selection
  cpufreq: introduce cpufreq_driver_is_slow
  sched: Consider misfit tasks when load-balancing
  sched: Add group_misfit_task load-balance type
  sched: Add per-cpu max capacity to sched_group_capacity
  sched: Do eas idle balance regardless of the rq avg idle value
  arm64: Enable max freq invariant scheduler load-tracking and capacity support
  arm: Enable max freq invariant scheduler load-tracking and capacity support
  sched: Update max cpu capacity in case of max frequency constraints
  cpufreq: Max freq invariant scheduler load-tracking and cpu capacity support
  arm64, topology: Updates to use DT bindings for EAS costing data
  sched: Support for extracting EAS energy costs from DT
  Documentation: DT bindings for energy model cost data required by EAS
  sched: Disable energy-unfriendly nohz kicks
  sched: Consider a not over-utilized energy-aware system as balanced
  sched: Energy-aware wake-up task placement
  sched: Determine the current sched_group idle-state
  sched, cpuidle: Track cpuidle state index in the scheduler
  sched: Add over-utilization/tipping point indicator
  sched: Estimate energy impact of scheduling decisions
  sched: Extend sched_group_energy to test load-balancing decisions
  sched: Calculate energy consumption of sched_group
  sched: Highest energy aware balancing sched_domain level pointer
  sched: Relocated cpu_util() and change return type
  sched: Compute cpu capacity available at current frequency
  arm64: Cpu invariant scheduler load-tracking and capacity support
  arm: Cpu invariant scheduler load-tracking and capacity support
  sched: Introduce SD_SHARE_CAP_STATES sched_domain flag
  sched: Initialize energy data structures
  sched: Introduce energy data structures
  sched: Make energy awareness a sched feature
  sched: Documentation for scheduler energy cost model
  sched: Prevent unnecessary active balance of single task in sched group
  sched: Enable idle balance to pull single task towards cpu with higher capacity
  sched: Consider spare cpu capacity at task wake-up
  sched: Add cpu capacity awareness to wakeup balancing
  sched: Store system-wide maximum cpu capacity in root domain
  arm: Update arch_scale_cpu_capacity() to reflect change to define
  arm64: Enable frequency invariant scheduler load-tracking support
  arm: Enable frequency invariant scheduler load-tracking support
  cpufreq: Frequency invariant scheduler load-tracking support
  sched/fair: Fix new task's load avg removed from source CPU in wake_up_new_task()

Conflicts:
drivers/cpufreq/Kconfig
include/linux/cpufreq.h
include/trace/events/power.h

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

usb: dwc_otg_310: Fixed that otg-host cannot transport LS device data.

Decreasing the use_count of urb is pended since core usb have put it
into the tasklet after HC dequeued, so we add a condition which check
urb in HC queue is NULL or not to enhance exception conditions here.

BUG=Redmine: Defect#95115
TEST=RK3366-SDK, LS mouse device works.

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

video: rockchip: vop: 3399: improve the vop bandwidth issue

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

dt/bindings: arm-pl330: Add peripherals-req-type-burst

This patch add peripherals-req-type-burst property to PL330 DMA
controller nodes to enable dma burst mode when it is present.

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

dmaengine: pl330: add burst mode according to dts config

Default is single mode, but some socs only support burst
mode. What's more, burst mode can improve memory accessing
efficiency.
In pl330 dts node:
Add peripherals_req_type_burst to enable burst mode.

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

UPSTREAM: usb: dwc3: core: improve reset sequence

According to Synopsys Databook, we shouldn't be
relying on GCTL.CORESOFTRESET bit as that's only for
debugging purposes. Instead, let's use DCTL.CSFTRST
if we're OTG or PERIPHERAL mode.

Host side block will be reset by XHCI driver if
necessary. Note that this reduces amount of time
spent on dwc3_probe() by a long margin.

We're still gonna wait for reset to finish for a
long time (default to 1ms max), but tests show that
the reset polling loop executed at most 19 times
(modprobe dwc3 && modprobe -r dwc3 executed 1000
times in a row).

Change-Id: Ie268d8fbe41dbe31e0070556dfd204ad51453c2f
Suggested-by: Mian Yousaf Kaukab <yousaf.kaukab@intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
(cherry picked from commit f59dcab176293b646e1358144c93c58c3cda2813)

usb: dwc3: gadget: fix OUT eps buffer size alignment issue

Per dwc3 databook "Buffer Size Rules and Zero-Length Packets",
dwc3 needs buffer size to be aligned to MaxPacketSize on ep out.

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

ARM64: dts: rk3399: add reg address for dwc3

This patch doesn't fix any issue, but conforms
to linux coding style.

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

ARM64: dts: rk3399: remove dwc3 tx-fifo-resize property

The FIFO resizing logic has been removed, and the default
Tx FIFO size is right on rk3399, so remove the property.

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

UPSTREAM: usb: dwc3: drop FIFO resizing logic

That FIFO resizing logic was added to support OMAP5
ES1.0 which had a bogus default FIFO size. I can't
remember the exact size of default FIFO, but it was
less than one bulk superspeed packet (<1024) which
would prevent USB3 from ever working on OMAP5 ES1.0.

However, OMAP5 ES1.0 support has been dropped by
commit aa2f4b16f830 ("ARM: OMAP5: id: Remove ES1.0
support") which renders FIFO resizing unnecessary.

Tested-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
(cherry picked from commit bc5081617faeb3b2f0c126dc37264b87af7da47f)

Conflicts:
drivers/usb/dwc3/core.h

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

UPSTREAM: dt/bindings: arm-pl330: add description of arm, pl330-broken-no-flushp

This patch adds the "arm, pl330-broken-no-flushp" for arm-pl330.

Change-Id: Iaf35b45c3d93e3909d09e500674fa8970d0e4f1b
Reviewed-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit 2318a3dd8880be30a46bbc54c2567b3f2a293360)

video: rockchip: hdmi-cec: fix quick standby then wake-up crash

code sync from kernel-3.10

Change-Id: I45d69e3901ea5c94fc148b1ef9761562ae465961
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>

UPSTREAM: clk: rockchip: fix the rk3399 sdmmc sample / drv name

The rk3399 clock table had a simple typo in it, calling the SDMMC sample
and drive clocks by the wrong name.  Fix this minor typo.

Change-Id: I154f70bd98b58bf3cc148043b11e4a8d18203816
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Acked-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
(cherry picked from git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
 commit 84752e8d8ab6bb72feab96785e9366783b4b9787)

UPSTREAM: irqchip/gic-v3: Make sure read from ICC_IAR1_EL1 is visible on redestributor

The ARM GICv3 specification mentions the need for dsb after a read
from the ICC_IAR1_EL1 register:

4.1.1 Physical CPU Interface:
The effects of reading ICC_IAR0_EL1 and ICC_IAR1_EL1
on the state of a returned INTID are not guaranteed
to be visible until after the execution of a DSB.

Not having this could result in missed interrupts, so let's add the
required barrier.

[Marc: fixed commit message]

Change-Id: I45f64990252b17a9e89ef69f3e53261b6af62ced
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Tirumalesh Chalamarla <tchalamarla@caviumnetworks.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 1a1ebd5fb1e203ee8cc73508cc7a38ac4b804596)

ARM64: dts: rk3399: android: update dts config for vop

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

ARM: dts: rk3036: add the supports-emmc for emmc property

I don't need send for upstream since the rockchip inside kernel
need it for tuning. At least the upstream can work it with dwmmc.

Change-Id: Ia9f0836624e8ef1df225dbc6ad1792ec4fb2abbd
Signed-off-by: Caesar Wang <wxt@rock-chips.com>

UPSTREAM: dmaengine: pl330: add max burst for dmaengine

This patch add max burst capability for dmaengine and
limit burst capability to one for PL330_QUIRK_BROKEN_NO_FLUSHP

Change-Id: I378325508af1246177e327c6572611545c52e04e
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 86a8ce7d4103f6680236af6916abf38e12477df8)

BACKPORT: dmaengine: core: expose max burst capability to clients

This patch add max_burst to dma_get_slave_caps for clients
to get the burst capability of slave dma controller.

Conflicts:
include/linux/dmaengine.h

Change-Id: I7ffcf775ad48247ee0bfa9e18c8ee3b4b256eab2
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit 6d5bbed30f89acd2ae0d23b3fff5b13b307525d9)

rockchip/rga: Enable runtime PM of RGA

Change-Id: I9452da520b675cb5d3a5ac8795571ade53e65297
Signed-off-by: Zhiqin Wei <wzq@rock-chips.com>

ARM64: dts: rk3399: android: Enable rga power domain

Change-Id: Ia50326d382dd8c45a53dc388c029eb96bb6b7b00
Signed-off-by: Zhiqin Wei <wzq@rock-chips.com>

iommu: dma-iommu: export common_iommu_{setup|teardown}_dma_ops

This patch adds EXPORT_SYMBOL_GPL calls to common_iommu_setup_dma_ops
and common_iommu_teardown_dma_ops.

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

UPSTREAM: drm/rockchip: inno_hdmi: get rid of rockchip_drm_crtc_mode_config

Save output_type and output_mode into rockchip_crtc_state,
it's nice to make them into atomic.

Change-Id: I35b000a5dc599449dccf98c1fe58de24073b5246
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Tested-by: John Keeping <john@metanate.com>
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 4e257d9eee23582e36637ce7ea6b14f6f56b1839)

UPSTREAM: drm/rockchip: inno_hdmi: fix an error code

We were accidentally returning PTR_ERR(NULL) which means success when we
wanted to return a negative error code.

Change-Id: Ia56827712eeaafef93ce433c0e05b95534784e30
Fixes: 412d4ae6b7a5 ('drm/rockchip: hdmi: add Innosilicon HDMI support')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Yakir Yang <ykk@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 2743becb3338cf012dbe7b70c6c39bbac81cc101)

UPSTREAM: dt-bindings: add document for Innosilicon HDMI on Rockchip platform

Change-Id: If720c53580e7afde6aa8e2924dff643a552ad3b2
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
(cherry picked from git.kernel.org next/linux-next.git master
 commit a2b5f9b9f308f66140a14150b8b9162ce9ca043b)

UPSTREAM: drm/rockchip: hdmi: add Innosilicon HDMI support

The Innosilicon HDMI is a low power HDMI 1.4 transmitter
IP, and it have been integrated on some rockchip CPUs
(like RK3036, RK312x).

Change-Id: If2c52391f3dc6ca6de4411496c137b5b2fd5cb92
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
Tested-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 412d4ae6b7a508136822cd500c6a7e7e1fdefa28)