cpuquiet: Remove synchronization from runnables_work_func()

runnables_stop() can deadlock when cancel_work_sync() waits for the
work function to end and the work function blocks on the same lock
held by runnables_stop().

Removing the locks from runnables_work_func() fixes this. This should
be safe because runnables_lock protects runnables_state and
runnables_work_func() only reads runnables_state. Also, the functions
that change state to DISABLED do a cancel_work_sync() to guarantee the
work function stopped running.

Bug 1215668

Change-Id: I70617b3b0fc81db8555869e67e3b11652af8d94c
Signed-off-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
Reviewed-on: http://git-master/r/193881
Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com>
Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>

cpuquiet: Fix warning about unused variable

drivers/cpuquiet/governors/runnable_threads.c: In function 'runnables_work_func':
drivers/cpuquiet/governors/runnable_threads.c:184:14: warning: unused variable 'state' [-Wunused-variable]

Change-Id: I26c2288876043cf3dd21e1b57317a1f5b2de5a9b
Signed-off-by: Sami Liedes <sliedes@nvidia.com>
Reviewed-on: http://git-master/r/197469
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>

cpuquiet: Add GCOV_PROFILE for governors

Include cpuquiet in GCOV profiling when enabled by defconfig.

Change-Id: Iadac806d4b7efd9e34afa765dbec59f0491b96a8
Signed-off-by: Juha Tukkinen <jtukkinen@nvidia.com>
Reviewed-on: http://git-master/r/192980
Reviewed-by: Automatic_Commit_Validation_User

cpuquiet: Add GCOV_PROFILE

Include cpuquiet in GCOV profiling when enabled by defconfig.

Change-Id: I448602d2c79f4113b99e6546743585e629fa726e
Signed-off-by: Juha Tukkinen <jtukkinen@nvidia.com>
Reviewed-on: http://git-master/r/131127
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Rebase-Id: R7daa534f10a211bf7b15a253f5cfee7a126428f0

cpuquiet: Fix race in runnable governor

Fixed a race where the cpuquiet driver would call device_free() before
the governor was started, which would lead to a kernel panic because
runnables_timer was not initialized.

Introduced RUNNING state, so states are:
- DISABLED: truly disabled
- IDLE: enabled, but not polling upon request from the driver
- RUNNING: actively polling

Bug 1189042

Change-Id: I45b9ce40e61e1cfddde74ff7b2691722204045bb
Signed-off-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
Reviewed-on: http://git-master/r/168803
Reviewed-by: Sang-Hun Lee <sanlee@nvidia.com>
Tested-by: Sang-Hun Lee <sanlee@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>

cpuquiet: Make stats optional

Make the per CPU statistics a configureable option.

bug 1049625

Change-Id: I28b248bbbad89a19e8d8d69400733dfd4a2cf052
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/168749
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>

cpuquiet: Update runnable gov param 20/100ms (1.25/2.25/2.5 +.5)

Sampling interval: 20ms
Window size: 100ms

Thresholds: 1.25/2.25/2.5 thread
Hysteresis: .5 thread

Bug 1050445

Change-Id: I5138bed06e6f3548ec440d2b9ee17460fc37adfb
Signed-off-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
Reviewed-on: http://git-master/r/163105
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>

cpuquiet: initialize runnable threads first as the default governor

Add the necessary code to initialize the runnable threads governor first when
selected as the default governor.

Change-Id: Iebbf304f3934b429d8a217011b3cb45ecddfd558
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/131438
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Rebase-Id: Rb5009930e554648a17d78edf9d8bdd17199c9c6a

cpuquiet: balanced governor requires cpufreq

The balanced governor relies on cpufreq for some of its decisions. Fail
initialization if there are no cpufreq OPP tables available.

Change-Id: I5d64215d56f50d5df52c1433208b1eb40440c812
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/131437
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Rebase-Id: R03bb471218a088a816a67232861759cba2b91f38

cpuquiet: cleanup Kconfig and Makefile

Add options to enable/disable individual governors and adjust the Makefile
to only build the selected governors.

Change-Id: Ia3d36afd0f1d2e8cc622956fa0dc16c23cc9904d
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/131436
Reviewed-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Rebase-Id: R0353ccd8d52227302fe7a890b9805b6c9170f58c

cpuquiet: Update averaging of nr_runnables

Doing a Exponential moving average per nr_running++/-- does not
guarantee a fixed sample rate which induces errors if there are lots of
threads being enqueued/dequeued from the rq (Linpack mt). Instead of
keeping track of the avg, the scheduler now keeps track of the integral
of nr_running and allows the readers to perform filtering on top.

Implemented a proper exponential moving average for the runnables
governor and a straight 100ms average for the balanced governor. Tweaked
the thresholds for the runnables governor to minimize latency. Also,
decreased sample_rate for the runnables governor to the absolute minimum
of 10msecs.

Updated to K3.4

Change-Id: Ia25bf8baf2a1a015ba188b2c06e551e89b16c5f8
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/131147
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>

cpuquiet: Add notifiers for the runnables governor

The governor stops sampling whenever the device is busy and starts its
sampling loop when the device is free.

Change-Id: Ifdae4a84e56c2734be48e49f6112b537602a02da
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/124680
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

cpuquiet: Runnable threads governor

[perf] The runnable threads governor only looks at the average number of
runnables in the system to make a decision when bringing cores
offline/online. First pass; tweaks thresholds and delays to reduce
decision latency to about ~50-70ms per core (from ~100-150ms per core)

Change-Id: Idd3b268a74a8f56ad3fc0e5c7f388174d1b6611f
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/124679
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>

cpuquiet: Adding runnable thread knobs

Ported the knobs that select runnable thread profiles from autohotplug
into cpuquiet.

Change-Id: I6858731e238404d33c772767d066cd6d467267a8
Signed-off-by: Xiao Bo Zhao <xiaoboz@nvidia.com>
Reviewed-on: http://git-master/r/123852
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: R640f1619f85fbf52701b39f5649c950f0d2bf9a0

cpuquiet: Enable cpuquiet by default

Enable cpuquiet by default if autohotplug is enabled. Cpuquiet will now
replace autohotplug as the hotplugging infrastructure. The down_delay in
the balanced governor has also been increased to 2s from 500ms to match
a similar patch for autohotplug.

Change-Id: I36747af67c55547b3dee95f7d435f9ebc075d393
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/123851
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

cpuquiet: Fix cpuquiet for k3.4

Change-Id: I75d8dba6c9c4c43152c819e08beeccb1e3c07c0c
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/123850
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

ARM: tegra: cpuquiet: Notify the cpuquiet governor when the driver is busy

Added generic busy/free notifiers that the driver can invoke to let the
governor know that it cannot process further core online/offline
requests (invoked in our case whenever we switch to the LP cluster).

Change-Id: I5e3f7f28f38806a7f87050e8d0c8d2f2cf7521aa
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/114807
Reviewed-by: Lokesh Pathak <lpathak@nvidia.com>
Tested-by: Lokesh Pathak <lpathak@nvidia.com>

cpuquiet: Account for the corner case frequency when setting state

Now consider frequency greater than or equal to idle_top_freq as UP

Change-Id: I1332d46d1e42a00b3b31897b158eaf4ccfbaf8f5
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/113678
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
GVS: Gerrit_Virtual_Submit

Rebase-Id: Rd67b2870e4916d1e616adf61f4bd4f3ef8916d1f

cpuquiet: Fix compiler warning

Change-Id: I03c11c295b40ebd500a715974f7fdca560d9a43a
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/111286
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Rebase-Id: R843b536a90d042c7849fa3a44246e473f89e715f

cpuquiet: Update stats only on successful operations

Change-Id: I0584fba7458b3a860f9ab3751a8eb5f0345864ad
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/111285
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Rebase-Id: R8fb05f5e99be6262ec28d7e733904c450f3985f6

cpuquiet: Properly return the first registered governor

Change-Id: I8a21a15d5cf8e4c91a166810387b5d8f1dd7cdb6
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/111284
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Rebase-Id: R5df2ed43a42e0bd32eee1601a6f945bf6df90227

ARM: tegra: add sysfs support for tegra cpuquiet driver

Change-Id: I215c5de8e98d139a93113978e1e27adb5a6b252c
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/111283
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

cpuquiet: Makefile for cpuquiet framework

Change-Id: Ia071b03c6073c514b99457e35ebbd65ef32a6906
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/105273
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: Rafb8e4b976fac62210bc2e0e95837d4bdce7e61a

cpuquiet: Updated balanced governor to use the runnable threads patch

The balanced governor now looks at the average number of runnable
threads when bringing cores online and offline. The balanced governor
parameters have also been updated to reflect a similar patch for
autohotplug.

Change-Id: I8dac26659ba43d95a68830c6cc268591a7f03f80
Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/111282
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Rebase-Id: Raeb86f51e0e21475ee9b96f97ce95f00883dac11

drivers: cpuquiet: fix error message

Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Change-Id: If04c699e002542bd8ce4b37b2367d7ec496c284e
Reviewed-on: http://git-master/r/107959
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Tested-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-by: Matthew Longnecker <mlongnecker@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Rebase-Id: R97cd3cf7f09c2dd919177aea88f618df7fa6a0a1

cpuquiet: Makefile for governors

Change-Id: I33018bb5db39f2881a3defc55758681cfb1d6284
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/105272
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: R667765931c89762f949113e9132232391b952592

cpuquiet: balanced governor

This is a port of the existing governor logic in cpu-tegra3.c.

Change-Id: Id79e6fc697dd0de85242fb2471bbed3d10101693
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/105271
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: Rf6addc1b20f47ccee2180380d021b54c41adff57

cpuquiet: userspace governor

Change-Id: If9830d423b1751cbe9493eda0a85f88e7003173f
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/105270
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: R382af37ab50a08c17c635bb1fee7e16afd0d9a18

cpuquiet: governor support

Change-Id: I05b9dedc04bb3b2ddba6202a002c1e5514ec4777
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/105269
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: R481f3df7610b737f6c054370efbe3bdb95a5e78d

cpuquiet: sysfs interfaces

Change-Id: Idb454f7380c48e2f4bab20e6ae51fef577b0f6c5
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/105267
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: R30228222507c41e129cbc2700fdd4c19c2db8be8

cpuquiet: driver support

Change-Id: I4f3f67d4459eeda519efdfd80e1283bef2d597e3
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/105266
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: R23fdadebbf0644ed585f4d4d5ff8dad556773d2a

cpuquiet: public interfaces for cpuquiet

Change-Id: Ie391d6d11fad7b76b0bf5daff67ac46663651dc0
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/105265
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: R7d711a55352cde2eac5ddbe86be2f97bb576dd57

cpuquiet: Kconfig

Signed-off-by: Sai Charan Gurrappadi <sgurrappadi@nvidia.com>
Change-Id: I930dedaa3bf7b2c64bc61f28c3461f125cca2f44
Reviewed-on: http://git-master/r/105264
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: R99b786496aad17710bd9d878d7844c50aa105fbb

cpuquiet: base files

Change-Id: I611b72a2e63fffc788bc6c7594c738d5ad65e06f
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/105263
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: Rcace74f9483c6a9f2e345c206ba7ddc4c5f8c066

ASoC: es8316: reduce power consumption.

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

3368sdk: TP: Support GT911.

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

efuse: change PSCI_OS_ACCESS_REG to 0xa600ffb0

EDP: avoid repeatedly enable.

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

MIPI: 3368sdk : screen driver of tv080wum.

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

rk3368: dvfs: clk_ddr enable

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

Mipi: 312x: set shutd_active_low default value of 0.

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

mailbox: rockchip: modify the default time out value of scpi command from immediate
                   to a const define.
        If you would use another timeout value with your command, you shoul do it
        as below:
                   SCPI_SETUP_DBUF(sdata, mdata, SCPI_CL_CLOCKS,
                        SCPI_CMD_GET_CLOCK_VALUE, clk_id, buf);
                   sdata.timeout_ms = YOUR_CMD_DEFAULT_TIMEOUT_MS;

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

rk3368: iommu: remove hjc's commit

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

rk3368: iommu: fix warning when compiling

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

rk3368: iommu: delete region list if map failed

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

rk3368: iommu: add page fault call back for master

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

rk818-battery: fix index of array CHRG_CVCC_HOUR error

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

rk31xx lvds: compatible with rk31xx and rk3368

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

HDMI:rk3288: fix pinctrl mode switch error.

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

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

rockchip: rk312x: vop: fix iommu crash when resume

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

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

video: rockchip: rk312x lcdc: Refine lcdc standby

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

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

rk iommu: fix system panic when iommu pagefault

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

rk3368 lcdc: add lcdc extend function for some special config

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

rk fb: add for iommu pagefault debug

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

rk fb: add interface for debug

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

RK3368 DDR: change get ddr freq method

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

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

rk3368 hdmi : fix the hdmi bitstream connot idenfify sometimes

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

mend rk1000 display ,remove some code in lcdc

After insert HDMI reboot only, insert cvbs display become green

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

mend rk1000 cvbs display when open uboot logo

add suspend ctrl in rk3368-tb_8846.dts

RK3368 MCU: add MCU suspend and resume function

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

rk3288 lcdc: delete unused message and update coding style

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

rk3288 lcdc: add overscan for extern screen

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

rk3368 lcdc: update deflick config for interlace mode ouput

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

rk3368: ddrfreq: add compat_ioctl support

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

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

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

rk3368-p9: dts: mdify dvfs table

rk31xx lvds: make sure lvds do init in kernel

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

cpufreq: rockchip_big_little: minor cleanups

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

rk818-battery: update version to 3.0.0

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

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

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

rk3368 lcdc: add ccir656 output format support

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

arm64: rockchip: rk3368: cpu0 use rockchip timer

prepare for power off all cpu when idle

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

clocksource: rockchip_timer: support percpu timer on ARM64

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

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

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

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

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

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

HDMI: improve EDID parse.

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

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

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

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

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

phy: merge and backport phy core from linux kernel 4.1

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

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

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

display-sys: fix code style

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

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

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

rk1000 codec: fixed rk1000 av startup pop

USB: gadget: rndis: fix compilation warning

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

usb: gadget: mtp: add new ioctl for compat

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

Bug 1466403

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

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

This reverts commit c04cdecff9f7283308b286e1bc1dbf0edfe4453b.

rk3368 lcdc: update gather config

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

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

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

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

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

linux os can config sleep mode

Revert "staging: Remove the Android logger driver"

This reverts commit 4f8c75c8d90e9b65ead2eb6d92aaa6f4e43adef8.

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

This reverts commit 013845fd73a5cbefec6e2234d873ea11c320c655.

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

This reverts commit a290c3e430b1e5c7ddacc3e126e93a008c682cd4.

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

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

dma: pl330: silence a compile warning

On 64 bit systems GCC warns that:

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

It's harmless and I have casted it away.

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

dma: pl330: use dma_addr_t for describing bus addresses

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

This patch uses dma_addr_t to represent the address instead.

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

rk: gcc-wrapper.py ignore psci.c

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