Commit Graph

602324 Commits

Author SHA1 Message Date
Luis R. Rodriguez
fed2eddfd5 UPSTREAM: scripts/coccinelle: require coccinelle >= 1.0.4 on device_node_continue.cocci
Make use of the new Requires: tag to be able to specify coccinelle binary
version requirements. The cocci file device_node_continue.cocci requires at
least coccinelle 1.0.4.

Change-Id: I11e894e3b2cbd88362271ea064ec3674ae9ffd71
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Acked-by: Nicolas Palix <nicolas.palix@imag.fr>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit cc65e82336)
2017-07-12 21:17:10 +08:00
Yann Droneaud
d3dd61f590 UPSTREAM: coccinelle: catch krealloc() on devm_*() allocated memory
krealloc() must not be used against devm_*() allocated
memory regions:

- if a bigger memory is to be allocated, krealloc() and
  __krealloc() could return a different pointer than the
  one given to them, creating a memory region which is not
  managed, thus it will not be automatically released on
  device removal.

- if a bigger memory is to be allocated, krealloc() could
  kfree() the managed memory region which is passed to it.
  The old pointer is left registered as a resource for the
  device. On device removal, this dangling pointer will be
  used and an unrelated memory region could be released.

- if the requested size is equal to 0, krealloc() can also
  just behave like kfree(). Here too, the old pointer is
  kept associated with the device. On device removal, this
  invalid pointer will be used and an unrelated memory
  region could be released.

For all these reasons, krealloc() must not be used on a
pointer returned by devm_*() functions.

Change-Id: I36061f5668a1b1128df9414b577150281f0f8a5a
Cc: Tejun Heo <tj@kernel.org>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit b7b2ee41f3)
2017-07-12 21:17:10 +08:00
Yann Droneaud
8ecb0a075b UPSTREAM: coccinelle: recognize more devm_* memory allocation functions
Updates free/devm_free.cocci to recognize functions added by:

- commit 64c862a839 ('devres: add kernel standard devm_k.alloc functions')
- commit e31108cad3 ('devres: introduce API "devm_kstrdup"')
- commit 3046365bb4 ('devres: introduce API "devm_kmemdup')
- commit 43339bed70 ('devres: Add devm_get_free_pages API')
- commit 75f2a4ead5 ('devres: Add devm_kasprintf and devm_kvasprintf API')

See also Documentation/driver-model/devres.txt

Change-Id: I5224960b028811484f27dd174629df6d5b052cd3
Cc: Joe Perches <joe@perches.com>
Cc: Manish Badarkhe <badarkhe.manish@gmail.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Eli Billauer <eli.billauer@gmail.com>
Cc: Himangi Saraogi <himangi774@gmail.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Daniel Thompson <daniel.thompson@linaro.org>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit a720c0644d)
2017-07-12 21:17:10 +08:00
Yann Droneaud
8b5b2895d7 UPSTREAM: coccinelle: also catch kzfree() issues
Since commit 3ef0e5ba46 ('slab: introduce kzfree()'),
kfree() is no more the only function to be considered:
kzfree() should be recognized too.

In particular, kzfree() must not be called on memory
allocated through devm_*() functions.

Change-Id: I9cde2ad48245c628c6708ab008e0513945a04cef
Cc: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 6dd9379e8f)
2017-07-12 21:17:10 +08:00
Vaishali Thakkar
24b3eaac3a 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 bf56cc04ef)
2017-07-12 21:17:10 +08:00
Wolfram Sang
265269d9da 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 f931362b38)
2017-07-12 21:17:10 +08:00
Vaishali Thakkar
988bd2d239 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: c5eda8fd10 ("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 531f50388f)
2017-07-12 21:17:10 +08:00
Vaishali Thakkar
78fe547da4 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 c5eda8fd10)
2017-07-12 21:17:10 +08:00
Julia Lawall
0d906e763c 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 f75621c6ec)
2017-07-12 21:17:10 +08:00
Julia Lawall
60c3b34419 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 79ff2b3dea)
2017-07-12 21:17:10 +08:00
Julia Lawall
a6a3fd8095 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 c7eaa8873b)
2017-07-12 21:17:10 +08:00
Julia Lawall
94e1aa8024 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 8f551befa2)
2017-07-12 21:17:10 +08:00
Andrzej Hajda
b6927d861c 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 3f984cb399)
2017-07-12 21:17:10 +08:00
Huang, Tao
0dc92faf3e sched/fair: fix building without CGROUP_SCHEDTUNE
Fixes: e00ebdcb8a ("sched/tune: don't use schedtune before it is ready")
Change-Id: I86312b6d271365cfb94e6ca570771a6bca46e67b
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-07-12 21:05:48 +08:00
Huang, Tao
793e6e3001 LSK 17.06 v4.4-android
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAllWMEkTHGJyb29uaWVA
 a2VybmVsLm9yZwAKCRAk1otyXVSH0KDgB/48PYf4q++JtyKQhDl0zr1Mjj3qokSe
 To8dkdzJDIN4Yoiojc7NF+POwxoKdm4Qf/cdj6/lul0QoJAbSDMGsqNgEnQmWPrd
 U7Olce+YF0oxeZEjbDzfdfKIV/cDTJY5DGGoR2CQzn+81SrL4O2yEJQFiXG7g/TW
 +SgHOim5evK/gSr5mk8gIEYmQ2q6+B8CBHL6PCzfg5u6Tk1epn2X/X+u6o0kJwnC
 qwl5E7eqpTwclpqHLmFP503FnaQQc2Jyco4kdjcZL67Gf8SxkqbEqJWAblzP//j2
 Y5z2pHbOnU4zHxZw+ma8NM05+AhFNaKmb3zKmhQUu8M52we6Z6BeV/OR
 =MtWF
 -----END PGP SIGNATURE-----

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
  ...
2017-07-12 19:35:02 +08:00
Addy Ke
909a801f21 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/)
2017-07-12 19:28:06 +08:00
Zheng Yang
96471cefb8 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>
2017-07-12 19:21:57 +08:00
Zheng Yang
e7a7270135 arm64: dts: rockchip: rk3328-evb: enable hdmiphy
Change-Id: I173ec8ec759a1404f31718c8647cf6eb6315061f
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-07-12 19:21:34 +08:00
Zheng Yang
07de9f1996 arm64: dts: rockchip: rk3328: hdmi enable inno-hdmi-phy driver
Change-Id: I3d4c6dfcaffeb6679666fcedf58e645d26205efa
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-07-12 19:21:18 +08:00
Zheng Yang
70b06ed6f5 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>
2017-07-12 19:20:06 +08:00
Zheng Yang
4e7d536820 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>
2017-07-12 19:12:56 +08:00
Zheng Yang
95843d5e61 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>
2017-07-12 19:05:15 +08:00
Zheng Yang
0782841cc7 arm64: rockchip_linux_defconfig: enable CONFIG_PHY_ROCKCHIP_INNO_HDMI_PHY
Change-Id: Ie775672f43e6c2491d750c82f604c454a367e136
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-07-12 19:05:06 +08:00
Mark Yao
01e93d4065 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>
2017-07-12 16:04:28 +08:00
Mark Yao
db449c6bf5 dt-bindings: rockchip: vop: introduce registers names
Change-Id: I0df821f2582b26e26cfe3059db19a90b206df5c5
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-12 16:04:23 +08:00
Huibin Hong
5d2c557f03 arm64: dts: rockchip: rk3399-android: enable fiq mode
Change-Id: Ib40f065ba6ac2f597a27db87a46a0d2f7c0714ed
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2017-07-12 15:04:29 +08:00
Steven Chen
5955832084 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>
2017-07-12 14:40:35 +08:00
Huibin Hong
d1adb29d59 spi: rockchip: test: update driver
Change-Id: I773cdc245fcdf8eee10dd7983343f206aecb856c
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2017-07-12 14:39:27 +08:00
Huibin Hong
0e366d11fe 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>
2017-07-12 14:38:09 +08:00
Zhaoyifeng
5d40559119 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>
2017-07-12 14:28:43 +08:00
Zorro Liu
d76a04838f arm64: dts: rockchip: use dwmmc for rk3366
Change-Id: I3ecadd51e34545af61a1bfcc54ee0d6f045c40fa
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-07-12 11:30:12 +08:00
Mark Yao
bccd5ee2bd 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>
2017-07-11 10:50:17 +08:00
William Wu
f7169a90bc 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>
2017-07-07 19:17:12 +08:00
Lionel Landwerlin
9aeb1194e3 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 5488dc16fd)

Change-Id: I8952fa72998b669cf6d8a7e120a72ffb225b1ba1
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-07 19:09:13 +08:00
Markus Elfring
5dd1f2569f 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 5f91190505)

Change-Id: I599721227294c7cde5fd4f2ef6d5a97212b61b77
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-07 19:09:07 +08:00
Huang, Tao
78ea6c7b21 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>
2017-07-07 19:03:21 +08:00
Steven Chen
6eef1e1666 ARM: dts: rk3288-evb: enable hs200 mode
Change-Id: I2a805198e2441a33f721a2b7167c99a180f1fc21
Signed-off-by: Steven Chen <cw@rock-chips.com>
2017-07-07 16:32:57 +08:00
Huibin Hong
da9b140b66 rk_fiq_debugger: reset and init uart, if uart is abnormal
Change-Id: Idaa5d3d9ecd03325f3412a5b9e9b95eae20b0a22
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2017-07-06 21:28:11 +08:00
Andy Yan
2fc8002516 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 2f513bd9ea)

Change-Id: If6a64fa0eab3d76b90f122e63d30c1d7940b0a57
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-07-06 11:05:55 +08:00
Shawn Lin
d37beb1454 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 41a603b933)

Change-Id: I3f4edbeefb39516d814d54b6583e2ada5505ab75
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-07-06 11:05:55 +08:00
Shawn Lin
fc7cdfe977 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 674c81cf2c)

Change-Id: I2e72c7b2d6bc5da939068264ed90b2980ffdfabb
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-07-06 11:05:54 +08:00
Andy Yan
c17ee7bcfa 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 76c923bb64)

Change-Id: I41212701d9bec3ce0864b995070439d4640bce28
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-07-06 11:05:44 +08:00
shengfeiXu
d75db61d03 power_supply: Add support TI BQ25703 charger chip
Change-Id: I3689a9f108e6fb86db4800d47a3aa7da7f7010e7
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-07-06 09:32:57 +08:00
Tang Yun ping
b49f7beb28 PM / devfreq: get lcdc type from vop drivers for rk3368
Change-Id: I9205286f7b4c0d7ecba3bb08a45af3f49225abe5
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-07-06 09:29:01 +08:00
Huang, Tao
5de762aaa3 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>
2017-07-05 16:17:43 +08:00
Huang, Tao
65ecac8dd1 arm64: rockchip_defconfig: update by savedefconfig
Change-Id: I44fc7dbdd6b87089668a7231d06424ea773742bd
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-07-05 14:50:33 +08:00
Rocky Hao
c01b156f02 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>
2017-07-05 14:08:58 +08:00
Rocky Hao
e5f88fadef 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>
2017-07-05 14:06:28 +08:00
chenzhen
7a4ab2ac58 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>
2017-07-05 14:05:55 +08:00
chenzhen
aeac2cb5b5 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>
2017-07-05 12:48:04 +08:00