Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/log

UPSTREAM: Coccinelle: noderef: Add new rules and correct the old rule

Add new rules to detect the cases where sizeof is used in
function calls as a argument.

Also, for the patch mode third rule should behave same as
second rule with arguments reversed. So, change that as well.

Change-Id: Id50b413c43d1c7f8c17a8cd784aa4d9d90046e62
Signed-off-by: Vaishali Thakkar <vaishali.thakkar@oracle.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit bf56cc04ef97c8ec536e3fcd16fc57902cba339f)

UPSTREAM: scripts: coccinelle: remove check to move constants to right

The header mentions this check depends on personal taste. I agree.
Running coccicheck on patches before I apply them, this SmPL produced
enough false positives for me that I'd rather see it removed.

Change-Id: Ia9638b059dd9eedb5f266061ae61ede963870acd
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit f931362b38191016b7a6dc31d90a515b37658e02)

UPSTREAM: Coccinelle: setup_timer: Add space in front of parentheses

Add space in front of the offending parentheses to silent the
parse error for older Coccinelle versions. This makes the rule
usable with all Coccinelle versions.

Change-Id: I44060c14a88fa322ac609474cc9b03b0856d5dab
Reported-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Vaishali Thakkar <vaishali.thakkar@oracle.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Fixes: c5eda8fd10c6 ("Coccinelle: Add api/setup_timer.cocci")
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 531f50388f1b05a297c6eab7a0c1e8e6d997678b)

UPSTREAM: Coccinelle: Add api/setup_timer.cocci

Use the timer API function setup_timer instead of structure field
assignments to initialize a timer.

Change-Id: I18ecc8a8ac368b893f0ceab9ad41add255bc3cd5
Signed-off-by: Vaishali Thakkar <vaishali.thakkar@oracle.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit c5eda8fd10c64720d5232189f812a3b1cc983b8b)

UPSTREAM: coccinelle: bugon: reduce rule applicability

Rule r is only use in org or report mode, so only execute it in those
cases.

Change-Id: If04125246bc21159b37d41c67a5b2556ec8ede3a
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit f75621c6ecadbd1802a7142fd346511cea05250a)

UPSTREAM: Coccinelle: pm_runtime: reduce rule applicability

Rule r is only used in org or report mode, so only execute it in those
cases.

Change-Id: Ib2311a33fca6544b885bbf44b9695e1984680f96
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 79ff2b3deae7db21e73f1e0add92c988135defd2)

UPSTREAM: Coccinelle: array_size: reduce rule applicability

Rule r is only use in org or report mode, so only execute it in those
cases.

Change-Id: I00224a5dda297070e31defd650247261e08dc830
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit c7eaa8873b3e50667e0b6529141139147f34748e)

UPSTREAM: Coccinelle: reduce rule applicability

Rule r is only use in org or report mode, so only execute it in those
cases.

Change-Id: Id2705a31f11329132b5af54ba933c208a49557bd
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 8f551befa2269dc244bcfbcad795132f833cb71c)

UPSTREAM: coccinelle: tests: unsigned value cannot be lesser than zero

Unsigned expressions cannot be lesser than zero. Presence of comparisons
'unsigned (<|<=|>|>=) 0' often indicates a bug, usually wrong type of variable.
The patch beside finding such comparisons tries to eliminate false positives,
mainly by bypassing range checks.

gcc can detect such comparisons also using -Wtype-limits switch, but it warns
also in correct cases, making too much noise.

Change-Id: I9fbf55a16d9ae508ca46cba2f8292d5e4b4cc697
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 3f984cb39907f87515d83657ecd471ae396a6c4a)

sched/fair: fix building without CGROUP_SCHEDTUNE

Fixes: e00ebdcb8a7c ("sched/tune: don't use schedtune before it is ready")
Change-Id: I86312b6d271365cfb94e6ca570771a6bca46e67b
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

Merge tag 'lsk-v4.4-17.06-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

LSK 17.06 v4.4-android

* tag 'lsk-v4.4-17.06-android': (134 commits)
  ANDROID: sdcardfs: remove dead function open_flags_to_access_mode()
  ANDROID: android-base.cfg: split out arm64-specific configs
  usb: gadget: f_fs: Fix possibe deadlock
  ANDROID: uid_sys_stats: check previous uid_entry before call find_or_register_uid
  ANDROID: sdcardfs: d_splice_alias can return error values
  android: base-cfg: disable CONFIG_NFS_FS and CONFIG_NFSD
  schedstats/eas: guard properly to avoid breaking non-smp schedstats users
  BACKPORT: f2fs: sanity check size of nat and sit cache
  FROMLIST: f2fs: sanity check checkpoint segno and blkoff
  sched/tune: don't use schedtune before it is ready
  sched/fair: use SCHED_CAPACITY_SCALE for energy normalization
  sched/{fair,tune}: use reciprocal_value to compute boost margin
  sched/tune: Initialize raw_spin_lock in boosted_groups
  sched/tune: report when SchedTune has not been initialized
  sched/tune: fix sched_energy_diff tracepoint
  sched/tune: increase group count to 5
  cpufreq/schedutil: use boosted_cpu_util for PELT to match WALT
  sched/fair: Fix sched_group_energy() to support per-cpu capacity states
  sched/fair: discount task contribution to find CPU with lowest utilization
  sched/fair: ensure utilization signals are synchronized before use
  ...

BACKPORT: FROMLIST: mmc: dw_mmc: introduce timer for broken command transfer over scheme

Per the databook of designware mmc controller 2.70a, table 3-2, cmd
done interrupt should be fired as soon as the the cmd is sent via
cmd line. And the response timeout interrupt should be generated
unconditioinally as well if the controller doesn't receive the resp.
However that doesn't seem to meet the fact of rockchip specified Soc
platforms using dwmmc. We have continuously found the the cmd done or
response timeout interrupt missed somehow which took us a long time to
understand what was happening. Finally we narrow down the root to
the reconstruction of sample circuit for dwmmc IP introduced by
rockchip and the buggy design sweeps over all the existing rockchip
Socs using dwmmc disastrously.

It seems no way to work around this bug without the proper break-out
mechanism so that we seek for a parallel pair the same as the handling
for missing data response timeout, namely dto timer. Adding this cto
timer seems easily to handle this bug but it's hard to restrict
the code under the rockchip specified context. So after merging this
patch, it sets up the cto timer for all the platforms using dwmmc IP
which isn't ideal but at least we don't advertise new quirk here.
Fortunately, no obvious performance regression was found by test and the
pre-existing similar catch-all timer for sdhci has proved it's an acceptant
way to make the code as robust as possible.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196321
Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
[shawn.lin: rewrite the code and the commit msg throughout]
Change-Id: I47238c9758fe74b98a1dd3939f22e569261e696f
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
(cherry picked from https://patchwork.kernel.org/patch/9834331/)

drm/rockchip: hdmi: Limit rk3229/rk3328 max output resolution

Limit RK3229/RK3328 max output resolution to 4K 50/60 YCbCr420 mode.

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

arm64: dts: rockchip: rk3328-evb: enable hdmiphy

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

arm64: dts: rockchip: rk3328: hdmi enable inno-hdmi-phy driver

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

drm: bridge: dw-hdmi: delete phy ops read/write

RK3328/RK3228 phy registers are mapped by inno-hdmi-phy driver,
there is no need to register hdmi phy debugfs on RK3328/RK3228.

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

drm/rockchip: hdmi: use inno-hdmi-phy driver to operate rk3328 hdmi phy

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

phy: rockchip-inno-hdmi-phy: support rk3328 hdmi phy

RK3328 hdmi phy is an upgraded version of 3228 hdmi phy, with
a completely different register layout. It improves physical
and antistatic capabilities.

It's max output bandwidth is same as rk3228 hdmi phy, optimized
up to 3.72Gbps per TMDS link.

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

arm64: rockchip_linux_defconfig: enable CONFIG_PHY_ROCKCHIP_INNO_HDMI_PHY

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

drm/rockchip: vop: support get register by name

When get vop base register byname failed, retry first entry.

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

dt-bindings: rockchip: vop: introduce registers names

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

arm64: dts: rockchip: rk3399-android: enable fiq mode

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

ARM: dts: rk3288-android: enable dmc auto frequency adjustment

Enable dmc auto frequency adjustment and
set dmc minimum frequency to 400MHz for better performance

Change-Id: I0d2a192f438c23d879158f55dc948205f67f8663
Signed-off-by: Steven Chen <cw@rock-chips.com>

spi: rockchip: test: update driver

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

spi: rockchip: rockchip_spi_prepare_dma return 1 if it is ok

If rockchip_spi_prepare_dma return 0, spi_transfer_one_message
won't wait for the dma complete event. Which may cause unknown
error.

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

soc: rockchip: vendor storage support realloc

To rewrite the same id with the data size large than first alloc size,
it`s will write fail. This commit will support realloc new memory
for rewrite.

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

arm64: dts: rockchip: use dwmmc for rk3366

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

drm/rockchip: vop: fliter interlace mode

rk3288 and rk3368 are not support interlace mode

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

power: rk818-charger: fix usb charger undetected

On some platforms (e.g. rk3399), we use extcon notify
framework to receive USB charger notifier from USB PHY
driver. Generally, the USB PHY driver uses a work to check
vbus status and the USB charger type every 2 seconds,
this polling mechanism may cause USB charger undetected
if we plug in/out USB charger quickly.

A typical error case is:
1. Plug in an USB DCP Adapter.
   - USB PHY driver sends notifier to rk818-charger
2. Plug out the USB Adapter, and plug in again immediately
   - rk818 detects plug out irq, and turns off charging
   - USB PHY driver schedule work doesn't detect the plug
     out/in operations, and doesn't send usb charger notifier

Fortunately, rk818 can detect plug in irq, so let's check
the USB charger type in rk818 plug in irq handler.

Change-Id: Iee45769c8a98c709da2dbfa514198ab0f648fd20
Signed-off-by: William Wu <william.wu@rock-chips.com>

UPSTREAM: drm: introduce pipe color correction properties

Patch based on a previous series by Shashank Sharma.

This introduces optional properties to enable color correction at the
pipe level. It relies on 3 transformations applied to every pixels
displayed. First a lookup into a degamma table, then a multiplication
of the rgb components by a 3x3 matrix and finally another lookup into
a gamma table.

The following properties can be added to a pipe :
  - DEGAMMA_LUT : blob containing degamma LUT
  - DEGAMMA_LUT_SIZE : number of elements in DEGAMMA_LUT
  - CTM : transformation matrix applied after the degamma LUT
  - GAMMA_LUT : blob containing gamma LUT
  - GAMMA_LUT_SIZE : number of elements in GAMMA_LUT

DEGAMMA_LUT_SIZE and GAMMA_LUT_SIZE are read only properties, set by
the driver to tell userspace applications what sizes should be the
lookup tables in DEGAMMA_LUT and GAMMA_LUT.

A helper is also provided so legacy gamma correction is redirected
through these new properties.

v2: Register LUT size properties as range

v3: Fix round in drm_color_lut_get_value() helper
    More docs on how degamma/gamma properties are used

v4: Update contributors

v5: Rename CTM_MATRIX property to CTM (Doh!)
    Add legacy gamma_set atomic helper
    Describe CTM/LUT acronyms in the kernel doc

v6: Fix missing blob unref in drm_atomic_helper_crtc_reset

Signed-off-by: Kumar, Kiran S <kiran.s.kumar@intel.com>
Signed-off-by: Kausal Malladi <kausalmalladi@gmail.com>
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Acked-by: Rob Bradford <robert.bradford@intel.com>
[danvet: CrOS maintainers are also happy with the userspacde side:
https://codereview.chromium.org/1182063002/ ]
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1456506302-640-4-git-send-email-lionel.g.landwerlin@intel.com
(cherry picked from commit 5488dc16fde74595a40c5d20ae52d978313f0b4e)

Change-Id: I8952fa72998b669cf6d8a7e120a72ffb225b1ba1
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

UPSTREAM: GPU-DRM: Delete unnecessary checks before drm_property_unreference_blob()

The drm_property_unreference_blob() function tests whether its argument
is NULL and then returns immediately.
Thus the tests around the calls are not needed.

This issue was detected by using the Coccinelle software.

Link: http://patchwork.freedesktop.org/patch/msgid/563C8B3E.405@users.sourceforge.net
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit 5f911905054a64cf8c7871fddd33f4af74f07a17)

Change-Id: I599721227294c7cde5fd4f2ef6d5a97212b61b77
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

ARM: dts: rockchip: fix rk3288-android fiq-debugger irq

153 is arm pmu irq.

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

ARM: dts: rk3288-evb: enable hs200 mode

Change-Id: I2a805198e2441a33f721a2b7167c99a180f1fc21
Signed-off-by: Steven Chen <cw@rock-chips.com>

rk_fiq_debugger: reset and init uart, if uart is abnormal

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

arm64: dts: rockchip: fix the memory size of PX5 Evaluation board

Commit 122682b2abb6 ("arm64: dts: rockchip: Add PX5 Evaluation board")
sets the memory size to 2 GB, but this board only has 1 GB DRAM, so change
it to the correct value here.

Fixes: 122682b2abb6 ("arm64: dts: rockchip: Add PX5 Evaluation board")
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
commit 2f513bd9eac1a2642b40387d4f89c3987641e59b)

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

arm64: dts: rockchip: add sdmmc support for px5-evb

px5-evb has one sdmmc slot, so we could support sdmmc.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
commit 41a603b9337c412e5902091f5343f803b36b9995)

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

arm64: dts: rockchip: Add more properties for emmc on px5-evb

The emmc on px5-evb can support hs200, so let's add mmc-hs200-1_8v.
And in order to speed up the boot time, we could add no-sdio and
no-sd to simplify the initialization.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
commit 674c81cf2c22918e34a8b42b89aaf89247256b6d)

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

arm64: dts: rockchip: Add PX5 Evaluation board

PX5 EVB is designed by Rockchip for automotive field
with integrated CVBS (TP2825) / MIPI DSI / CSI / LVDS
HDMI video input/output interface, audio codec ES8396,
WIFI/BT (on RTL8723BS), Gsensor BMA250E and light&proximity
sensor STK3410.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Conflicts:
Documentation/devicetree/bindings/arm/rockchip.txt
arch/arm64/boot/dts/rockchip/Makefile

(cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
commit 76c923bb64923a387f0fc95480afb61ff1504eae)

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

power_supply: Add support TI BQ25703 charger chip

Change-Id: I3689a9f108e6fb86db4800d47a3aa7da7f7010e7
Signed-off-by: shengfei Xu <xsf@rock-chips.com>

PM / devfreq: get lcdc type from vop drivers for rk3368

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

arm64: rockchip_defconfig: enable CROSS_MEMORY_ATTACH

For pass Android bionic sys_uio_test.

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

arm64: rockchip_defconfig: update by savedefconfig

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

ARM: dts: rockchip: rk322x: update thermal config and add cpu's parameters

add cpu's dynamic power coefficient and add gpu as a cooling device in the
thermal zone. rename the thermal zone's config and make it more readable.

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

arm64: dts: rockchip: add gpu in thermal control for rk3328

add gpu as a cooling device in thermal control

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

arm64: dts: rockchip: change "power-mode" to "power_model" in gpu node for rk3328

The reference code from ARM uses "power_model".
It's convenient to use the same name
for rebasing Mali DDK update from ARM and avoiding confusion.

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

ARM: dts: rk322x: change "power-mode" to "power_model" in gpu node

The reference code from ARM uses "power_model".
It's convenient to use the same name
for rebasing Mali DDK update from ARM and avoiding confusion.

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

arm64: dts: rockchip: rk3368-r88: solve gmac open fail probability

Change-Id: I64d358bfa4d64f53a207d5358615c3819a1566a5
Signed-off-by: huweiguo <hwg@rock-chips.com>

ARM: dts: rockchip: rk3288 re-name dts files

Intent to keep same dts with upstream version, this patch does:
1. restore rk3288-evb-act8846.dts, keep without android configurations.
2. add char of "-android-" to android dts files.

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

ARM: dts: rk322x: move the gpio_keys node from dtsi to product dts.

The keys configuration is constantly changed on different products,
so move it to product's dts.

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

arm64: dts: rockchip: rk3368-p9: add RKPM_CLUSTER_L_WKUP_EN for gpio wakeup

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

arm64: dts: rockchip: rk3368-r88: sdio work up

Change-Id: I7026275e46cce6a4460bd5464d63f583984b9d5e
Signed-off-by: huweiguo <hwg@rock-chips.com>

ARM: configs: rockchip_defconfig select CROSS_MEMORY_ATTACH

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

ARM: dts: rk3229-gva-sdk: enable cw2015 fuel gauge

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

drm/rockchip: vop: support drm legacy set property

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

ARM: dts: rk3229-gva-sdk: delete vcc_host node in gva dts.

Gva products don't use usb host mode, so delete vcc_host regulator
node and other related configuration.

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

arm: dts: rk3288: use vopb by default, disabled mipi_in_vopl

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

MALI: utgard: read parameters of power model from device tree

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

arm: dts: rk3288-android: rename card name

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

ASoC: hdmi_analog: add snd_card's name parsing from DT node support

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

arm: dts: rockchip: enable dfi and dmc nodes for rk3288 rk818 edp board

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

arm: dts: rockchip: rk3328: add gpu_power_model in gpu node

Indeed, the values of the model parameters are supplied by Rocky Hao.

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

arm: dts: rockchip: rk322x: add gpu_power_model in gpu node

Indeed, the values of the model parameters are supplied by Rocky Hao.

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

drm: rockchip: hdmi: check sink max_tmds_clock in mode_valid

If sink max TMDS clock < 340MHz, we think the mode pixel clock
greater than 340MHz should support YCbCr420, or it is a bad mode.

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

arm64: dts: rk3368-r88: enabled usb host

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

arm: dts: rk3288: remove cpll from cru

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

arm: dts: rk3288: support mipi dsi uboot display for rk818 evb

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

clk: rockchip: 3288: dclk will change if cpll initialized

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

arm: dts: rk3288: add dfi and dmc device nodes

Add dfi and dmc nodes in the device tree for the ARM rk3288 SoC.
To support ddr frequency scaling function, we need enable dmc and
dfi nodes.

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

PM / devfreq: assign set_auto_self_refresh for rk3288

This makes ddr possible to enter auto self-refresh mode
when early suspend.

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

drm/edid: Clear the old hdmi info before parsing display info

The current EDID might not support advanced HDMI 2.0 features.
Leaving old hdmi info in the drm_display_info will make display
work not okay, when switching display from HDMI 2.0 device to
HDMI 1.4 device.

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

arm: dts: rk3288-android: enable built-in hdmi and rt5640 sound

This patch use one cpudai->multicodecs card for built-in hdmi and
external codec which share the same i2s controller.

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

arm: configs: rockchip: enable SND_ROCKCHIP_HDMI_ANALOG

This patch enable SND_ROCKCHIP_HDMI_ANALOG for built-in hdmi sound
and external codec which share the same i2s controller.

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

ARM: dts: rk3288: fix to timer0 for broadcast timer

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

arm64: dts: rk3368-r88: add hdmi sound card

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

arm: dts: rk3288: add iep node and enable it

Change-Id: Ie7fe0bbc91a5fedb0617d9b6c6056bdb4aed610d
Signed-off-by: buluess.li <buluess.li@rock-chips.com>

input: touchscreen: gsl3673: to solve the boot and resume slowly

when boot and resume,the fw should load/reload,this will take up
much time in the main thread,so here add a thread to load/reload
fw in order to void this situation.

Change-Id: Ic1a67fd662b0406ede08b0aeb944525fabc519e6
Signed-off-by: buluess.li <buluess.li@rock-chips.com>

arm: dts: rockchip: rk3288: update tsadc's working frequence

tsadc in rk3288 can not work well at 10k hz clock. at most time, tsadc
in rk3288 can work well, but it will wrongly report a very high
temperature (eg. 110 degree) occasionally. we set 5k hz can
resolve this issue.

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

Revert "FROMLIST: drm: edid: HDMI 2.0 HF-VSDB block parsing"

This reverts commit 6e9aa006c4ae10f95bba0121c26b06363efb3b96.

UPSTREAM code has support parsing HDMI.20 HF-VSDB.

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

drm: bridge: dw-hdmi: use scdc struct and function defined in upstream

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

UPSTREAM: drm/edid: detect SCDC support in HF-VSDB

This patch does following:
- Adds a new structure (drm_hdmi_info) in drm_display_info.
  This structure will be used to save and indicate if sink
  supports advanced HDMI 2.0 features
- Adds another structure drm_scdc within drm_hdmi_info, to
  reflect scdc support and capabilities in connected HDMI 2.0 sink.
- Checks the HF-VSDB block for presence of SCDC, and marks it
  in scdc structure
- If SCDC is present, checks if sink is capable of generating
  SCDC read request, and marks it in scdc structure.

V2: Addressed review comments
  Thierry:
  - Fix typos in commit message and make abbreviation consistent
    across the commit message.
  - Change structure object name from hdmi_info -> hdmi
  - Fix typos and abbreviations in description of structure drm_hdmi_info
    end the description with a full stop.
  - Create a structure drm_scdc, and keep all information related to SCDC
    register set (supported, read request supported) etc in it.

  Ville:
  - Change rr -> read_request
  - Call drm_detect_scrambling function drm_parse_hf_vsdb so that all
    of HF-VSDB parsing can be kept in same function, in incremental
    patches.

V3: Rebase.
V4: Rebase.
V5: Rebase.
V6: Addressed review comments from Ville
  - Add clock rate calculations for 1/10 and 1/40 ratios
  - Remove leftovers from old patchset
V7: Added R-B from Jose.
V8: Rebase.
V9: Rebase.
V10: Rebase.

Change-Id: I14d2a5585a528b7195170a4202be87199eb858c6
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-5-git-send-email-shashank.sharma@intel.com
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from 62c58af32c935a98a1e8d8ceb39a3a47b36fbbcd)

arm: dts: rk3288-evb: set i2c4 clock frequency to 400khz

Change-Id: I849a99d147e9336ba81cd25c92594ffb1289cb53
Signed-off-by: buluess.li <buluess.li@rock-chips.com>

UPSTREAM: drm/edid: detect SCDC support in HF-VSDB

This patch does following:
- Adds a new structure (drm_hdmi_info) in drm_display_info.
  This structure will be used to save and indicate if sink
  supports advanced HDMI 2.0 features
- Adds another structure drm_scdc within drm_hdmi_info, to
  reflect scdc support and capabilities in connected HDMI 2.0 sink.
- Checks the HF-VSDB block for presence of SCDC, and marks it
  in scdc structure
- If SCDC is present, checks if sink is capable of generating
  SCDC read request, and marks it in scdc structure.

V2: Addressed review comments
Thierry:
- Fix typos in commit message and make abbreviation consistent
   across the commit message.
- Change structure object name from hdmi_info -> hdmi
- Fix typos and abbreviations in description of structure drm_hdmi_info
   end the description with a full stop.
- Create a structure drm_scdc, and keep all information related to SCDC
   register set (supported, read request supported) etc in it.

Ville:
- Change rr -> read_request
- Call drm_detect_scrambling function drm_parse_hf_vsdb so that all
   of HF-VSDB parsing can be kept in same function, in incremental
   patches.

V3: Rebase.
V4: Rebase.
V5: Rebase.
V6: Rebase.
V7: Added R-B from Jose.
V8: Rebase.
V9: Rebase.
V10: Rebase.

Change-Id: I93cd26ee5c51c3714eb702e8a1bd1b335385f26e
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-4-git-send-email-shashank.sharma@intel.com
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit afa1c763653e0fd68f2d1e3dca869c9453d8ef06)

UPSTREAM: drm/edid: check for HF-VSDB block

This patch implements a small function that finds if a
given CEA db is hdmi-forum vendor specific data block
or not.

V2: Rebase.
V3: Added R-B from Jose.
V4: Rebase
V5: Rebase
V6: Rebase
V7: Rebase
V8: Rebase
V9: Rebase
V10: Rebase

Change-Id: Ie787aa71b17a5aad6b30722872e9befe79803baa
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-3-git-send-email-shashank.sharma@intel.com
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit 50dd1bd1e2395a78e5adfad96487092e215483e0)

scripts/gcc-wrapper.py: ignore drm_edid.c:3506

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

drm: bridge: dw-hdmi: correct the judgment condition of curr_ctrl

The judgment condition of curr_ctrl is curr_ctrl->mpixelclock. It is
a hand mistake of commit <594a077e31e8b1ff0bd192e9af702fecaeea31ba>,
when patch(https://patchwork.kernel.org/patch/9603303) is merged.

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

arm: rockchip_defconfig: enable CONFIG_IEP

Change-Id: I2b37378eb04f2146c515e074ba4f6d83d6148a0e
Signed-off-by: buluess.li <buluess.li@rock-chips.com>

ASoC: rockchip: hdmi_analog: set sysclk for codec dai

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

video: rockchip: iep: compatible for did not config CONFIG_FB_ROCKCHIP

if there not config CONFIG_FB_ROCKCHIP that will build error

Change-Id: Icaa837f3c0a539e98133b7cb9550700e8a46817f
Signed-off-by: buluess.li <buluess.li@rock-chips.com>

ARM: dts: rockchip: add power key support on gva sdk board.

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

drm: bridge: dw-hdmi: correct the judgment condition of pll_config

The judgment condition of pll_config is phy_config->mpixelclock. It is
a hand mistake of commit <594a077e31e8b1ff0bd192e9af702fecaeea31ba>.

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

arm64: dts: rk3328: enable the power domain for decoder

The decoder requests the power domain is idle status when
it is resetting. Without the power domain it won't work.

Change-Id: If3afdbefbe40bc7529f13c12444adddbb328a21b
Signed-off-by: Randy Li <randy.li@rock-chips.com>

arm64: dts: rk3368: add system-status-freq and auto-freq-en properties for dmc

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

drm: bridge/dw-hdmi: add platform_device_unregister when remove

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

arm64: rockchip_defconfig: enable drm tve

Change-Id: Ic1fb7387191a16cb37f690ce300ff0814af51c9c
Signed-off-by: algea.cao <algea.cao@rock-chips.com>

ARM64: dts: rk3328-evb: enable tve

tve is enabled by default.

Change-Id: I43f9103a0a8d3078031e5d32a1d99602fb0a96ed
Signed-off-by: algea.cao <algea.cao@rock-chips.com>

ARM64: dts: rk3328: add tve display node

support rk3328 cvbs.Some display parameter can be configured,
such as saturation.For more information, please check
Documentation/devicetree/bindings/display/rockchip/rockchip_drm_tve.txt

Change-Id: Ifcc074a34910b58a26fc309fc601494562851025
Signed-off-by: algea.cao <algea.cao@rock-chips.com>

arm64: dts: rk3399: remove 297MHz and add 300MHz for dmc

Only 200MHz, 300MHz, 400MHz, 528MHz, 600MHz, 666MHz, 732MHz and
800MHz are available at present.

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

PM / devfreq: assign set_auto_self_refresh for rk3368

This makes it possible to enter ddr self-refresh mode
when early suspend.

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

PM / devfreq: rockchip_dmc: change frequency according to system status

This registers a reboot notifier, it will change ddr frequency to a
specified value when reboot system.

This registers a fb notifier, it will change ddr frequency to a specified
value and enable ddr self-reflash mode when early suspend.

This adds a new sysfs node system_status, so that different system status
can change ddr frequency through the node.

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