Commit Graph

606747 Commits

Author SHA1 Message Date
Zorro Liu
3726b810fe drivers: input: sensors: reset sensor rate
Change-Id: I3fc1fbe5c054867fe6ce93f64bc2dc14f6abeb9c
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-02-02 19:06:30 +08:00
Algea Cao
21c38316b3 drm/rockchip: Support tve uboot logo
Add tve connector port. If uboot logo is enabled,
dac will not be disabled when tve bind.

Change-Id: I5d87f9d1afc05481968dc34b0bd09dd82719a933
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-02-02 18:55:50 +08:00
David Wu
9d155c640f power: avs: rockchip-io-domain: Change the name from vccio0 to vccio6 for px30
Checked with ic colleague, the name should be same as the datasheet,
so need to change the name, they also change it at trm.

Change-Id: Ie98ba5397cf0e5a2dba4e07fc0ca31a3330f05a6
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-02-02 18:51:52 +08:00
Zhou weixin
3bc1d7d06f arm64: dts: rockchip: Auto match emmc and nand devices for px30/rk3326
Change-Id: I787e0cefdf8bc7d0f5ae1483233017edafa7ee31
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-02 18:49:57 +08:00
Finley Xiao
588ae5977e clk: rockchip: Adjust the order of cpu boost
Change-Id: I5fe78b451f9afaff276aeb251d68daf780c1eecf
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-02 18:36:40 +08:00
Finley Xiao
fe53e62332 clk: rockchip: px30: Fix boost mask
Change-Id: I507efe5bf432556a9e603275f03c81a5a8ef96ed
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-02 18:33:59 +08:00
Finley Xiao
f1ae3d9c5a clk: rockchip: px30: Fix wait boost recovery idle
Change-Id: If407926c5fedd1e91b1223a3926f3bb98f4cb17c
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-02 18:33:36 +08:00
Finley Xiao
b503ff5697 clk: rockchip: rk3368: Add clock id for tsp
Change-Id: I79a423f93f991aab43922e58ce34eac1754304e2
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-02 09:46:34 +08:00
Jung Zhao
5f049afc2c arm64: dts: rockchip: px30: add core reset
Change-Id: I7a3bf6d6098fdd12f71d5b2a51e898dc8ed24e12
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-02-02 09:44:16 +08:00
Weiguo Hu
623a187bd8 net: phy: rockchip: optimize for long cable
Change-Id: I125fb3a325946e82ccf021b02df194282b9d60f0
Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
2018-02-01 19:13:45 +08:00
Algea Cao
793ca73b39 media: cec: Fix crash if HPD is occurred before adapt allocated.
Change-Id: I4d546cdbbecfd124c7cd6a985f0843879037b6dc
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-02-01 19:10:59 +08:00
Wu Liangqing
7e0c9d357c ARM: dts:rk3126-bnd-d70: enabled emmc default
Change-Id: Id41ec3b9262091775a0494447e2ca8a34763ed8f
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2018-02-01 19:10:31 +08:00
Zheng Yang
3a61ef4874 drm: bridge: synopsys: update mc_clkdis in dw_hdmi_bind
If vop return error when showing kernel logo, connector atomic flush
will not be call, and mc_clkdis can not be updated.

This patch update mc_clkdis in the dw_hdmi_bind, when phy clock is
locked and HPD is connected.

Change-Id: I1498d787a993961fe75236c309ecc3c898d611a4
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2018-02-01 15:18:41 +08:00
Douglas Anderson
8ebe023800 UPSTREAM: usb: dwc2: host: Don't retry NAKed transactions right away
On rk3288-veyron devices on Chrome OS it was found that plugging in an
Arduino-based USB device could cause the system to lockup, especially
if the CPU Frequency was at one of the slower operating points (like
100 MHz / 200 MHz).

Upon tracing, I found that the following was happening:
* The USB device (full speed) was connected to a high speed hub and
  then to the rk3288.  Thus, we were dealing with split transactions,
  which is all handled in software on dwc2.
* Userspace was initiating a BULK IN transfer
* When we sent the SSPLIT (to start the split transaction), we got an
  ACK.  Good.  Then we issued the CSPLIT.
* When we sent the CSPLIT, we got back a NAK.  We immediately (from
  the interrupt handler) started to retry and sent another SSPLIT.
* The device kept NAKing our CSPLIT, so we kept ping-ponging between
  sending a SSPLIT and a CSPLIT, each time sending from the interrupt
  handler.
* The handling of the interrupts was (because of the low CPU speed and
  the inefficiency of the dwc2 interrupt handler) was actually taking
  _longer_ than it took the other side to send the ACK/NAK.  Thus we
  were _always_ in the USB interrupt routine.
* The fact that USB interrupts were always going off was preventing
  other things from happening in the system.  This included preventing
  the system from being able to transition to a higher CPU frequency.

As I understand it, there is no requirement to retry super quickly
after a NAK, we just have to retry sometime in the future.  Thus one
solution to the above is to just add a delay between getting a NAK and
retrying the transmission.  If this delay is sufficiently long to get
out of the interrupt routine then the rest of the system will be able
to make forward progress.  Even a 25 us delay would probably be
enough, but we'll be extra conservative and try to delay 1 ms (the
exact amount depends on HZ and the accuracy of the jiffy and how close
the current jiffy is to ticking, but could be as much as 20 ms or as
little as 1 ms).

Presumably adding a delay like this could impact the USB throughput,
so we only add the delay with repeated NAKs.

NOTE: Upon further testing of a pl2303 serial adapter, I found that
this fix may help with problems there.  Specifically I found that the
pl2303 serial adapters tend to respond with a NAK when they have
nothing to say and thus we end with this same sequence.

Change-Id: Ie9306eeef2694ceb59a07658905223f698b74e9a
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git next
 commit 38d2b5fb75)
2018-02-01 11:30:44 +08:00
xxh
1ee5e73c0e net: wireless: rockchip_wlan: fix bcmdhd driver for GTS
Change-Id: I63173d9c83a2cd2e722dc279f18b226aff3595bf
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
2018-02-01 10:02:44 +08:00
Zhou weixin
ec33359b7f arm64: dts: rockchip: enable vpu_combo for 3326/px30 board
Change-Id: I1f4f8800945e9c329b5e5fe87acf032cf5fe163b
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-01 10:01:36 +08:00
Tao Huang
f9eefeeaa7 rk: add SPDX license identifier to files with no license
Change-Id: I754250669891307b0deab2bdab1bd01512713f79
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-01-31 20:56:06 +08:00
Zhen Chen
cc941b22d4 MALI Utgard: rk.c: change licence announcement to use GPLv2
Change-Id: I1230425dd33b48b7dc3d8b49d8912713ebb97ca5
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2018-01-31 20:45:39 +08:00
Zhen Chen
469e3ee54b MALI Utgard: RK: remove unused files with proprietary announcement
Change-Id: Iffe6df7c406dff1efad10934fc09ca7fd2f101ec
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2018-01-31 20:45:25 +08:00
Tao Huang
878bfd1fe6 sound/soc/codecs: remove unused rt5625.c.enc
Change-Id: Id5ea219c9faae173096fb4532772f90238ea53b8
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-01-31 20:33:03 +08:00
Sandy Huang
11905fc191 drm/rockchip: fix hdmi kernel logo display error
when have two connector, show_loader_logo() must free the
unused connect resources.

Change-Id: Ic0ad98988d7dbae8143087cf00e3c5914281188a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-31 19:22:29 +08:00
Tao Huang
9be9564661 drivers/media/video: remove unused icatch7002
Change-Id: Iba11051d729b3546b279eccb14d981c85332d38d
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-01-31 19:21:09 +08:00
Tao Huang
62bf938f08 drivers/base: remove unused devices_filter.h
Change-Id: I50622b8c2d59addd303d897b57ee48b691e59b33
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-01-31 19:20:57 +08:00
Rocky Hao
41decf17a9 soc: rockchip: pm_test: fix memleak bug
Change-Id: If484e4e8d18b860c32fbd2389c59db971b212d80
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-01-31 19:12:38 +08:00
Sandy Huang
62779bcb89 drm/rockchip: backlight: fix compile warning
warning: Access to field 'dev' results in a dereference of a null
pointer (loaded from variable 'panel')

Change-Id: I0f4224b47b3b7c16a9022e19f8de28df66784a7f
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-31 18:39:26 +08:00
Finley Xiao
7bd13a986e clk: rockchip: px30: Modify SRST ID according to latest document
Change-Id: Idb6b845581a18082f851c4b67e1ef5bd3a5bc886
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-31 17:11:06 +08:00
Finley Xiao
401c07e068 clk: rockchip: px30: Fix div_core_mask
Change-Id: I985d27841de00ec7e6f9ca3454c0c4c4f8debacb
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-31 16:05:50 +08:00
Kaige Li
345820113a ARM64: dts: rockchip: rk3368-px5-evb-android: add gpio detection node
Change-Id: Ifb002c1211e1e92d759fbd2cc9ac3eb649167701
Signed-off-by: Kaige Li <kevin.li@rock-chips.com>
2018-01-31 09:53:42 +08:00
Sandy Huang
e680ddfb70 drm/rockchip: vop: correct register config
Change-Id: I5923580552d14dc25b61524e500b7449401b1cca
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-31 09:42:57 +08:00
Kaige Li
c27c194267 misc: fixed gpio-detection error
This patch can fix the following issue:
The gpio is not invalid when configured as active low.

Change-Id: Idc0618db3c20534ad5c952a4c9b4d4a366599cbf
Signed-off-by: Kaige Li <kevin.li@rock-chips.com>
2018-01-31 08:53:27 +08:00
Wyon Bi
1414eb5ed8 ARM: dts: rockchip: rk3128-fireprime: Fix lvds pinctrl-names
Change-Id: I0b1ba2f930bfe6b8541f5e980ec114240460f877
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-30 21:02:56 +08:00
Wyon Bi
3e0cd87ecd ARM: dts: rockchip: rk3126-evb: Fix lvds pinctrl-names
Change-Id: Iebb49608373efd4927b11f55f901c43017502f94
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-30 21:02:47 +08:00
Wyon Bi
5aca9d69ac ARM: dts: rockchip: rk3288-popmetal-android-vga: add pinctrl settings for lvds node
Change-Id: I75466dc63ba9f0761c64df30c9fd7288cfd8fe8b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-30 21:02:33 +08:00
Wyon Bi
df99532769 ARM: dts: rockchip: rk3288-popmetal-android: add pinctrl settings for lvds node
Change-Id: I435afb883ec6d3ee07523e1e933dfb3c564cd504
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-30 21:02:23 +08:00
Wyon Bi
ba7bf2b532 ARM: dts: rockchip: rk3288: remove pinctrl settings from lvds node
Change-Id: I22d95e660cba8f982ad6fbc869ea8b8286d5a641
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-30 21:01:12 +08:00
Wyon Bi
01007bae4d arm64: dts: rockchip: rk3366: remove pinctrl settings from lvds node
Change-Id: I07b01df67c006d14d19bc2277dc90d0e947793dd
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-30 21:00:51 +08:00
Wyon Bi
145c5d7914 arm64: dts: rockchip: rk3368-r88: add pinctrl settings for lvds node
Change-Id: I00dac84176e81332d16408e987e4873d17de37e6
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-30 21:00:38 +08:00
Wyon Bi
036d3e05f3 arm64: dts: rockchip: rk3368: remove pinctrl settings from lvds node
Change-Id: I89244be50902f7f76cc6e776decb93a83bbb063b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-30 21:00:10 +08:00
Wyon Bi
beec403373 drm/rockchip: lvds: Fix clock handing
Change-Id: I59bf0aa2969b3e9a192ec8c0cd785906951f4980
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-30 20:59:46 +08:00
Wyon Bi
e9e837490f drm/rockchip: lvds: remove unused code
Change-Id: I88eedd97d926017a350f76085b5d4292caa6d0e4
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-30 20:59:35 +08:00
Meng Dongyang
6a9f858a8d phy: rockchip: rockchip-inno-usb2: tuning pre-emphasize for rk3399
In current code, the pre-emphasize in eop state and chirp state are
disabled only if we add “rockchip,u2phy-tuning” property in RK3399 dts,
But we find that if we enable the pre-emphasize of sop/eop/chirp state
for rk3399 by default, it will cause usb2 compliance test item - EL_8
and EL_9 failure, so disable the pre-emphasize of sop/eop/chirp state
by default. And this can also help to avoid mis-trigger the disconnect
detection or high-speed handshake failure.

Change-Id: I5ceac9c88de4cdae5af904e973124c194f7718f6
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
2018-01-30 20:58:26 +08:00
David Wu
f479e502c8 pinctrl: rockchip: Fix some clang warnings
This patch fixes the following warnings:
drivers/pinctrl/pinctrl-rockchip.c:1869:9: warning: 1st function call argument is an uninitialized value
                ret = regmap_read(extra_regmap, extra_reg, &temp);
                      ^
drivers/pinctrl/pinctrl-rockchip.c:1999:48: warning: The left operand of '+' is a garbage value
                data = ((1 << rmask_bits) - 1) << (extra_bit + 16);
                                                   ^

Change-Id: Ie1bfe825925505314d5d9a4d5491e38768916dbd
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-01-30 20:58:04 +08:00
Zhou weixin
dc26e28d83 arm64: dts: rockchip: enable rk_rga for 3326/px30 board
Change-Id: I5f98d63b2073c037a41d367639c19a962dbf79c4
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-01-30 20:56:10 +08:00
Zhou weixin
a25c80973c arm64: dts: rockchip: enable usb for 3326/px30 board
Change-Id: Id2c4326c9385f4a06a81dbad73d84e207bf9c5c4
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-01-30 20:55:50 +08:00
Huicong Xu
d4953cfed3 phy: rockchip: inno-hdmi: fix 4k10 bit display abnormal
avoid out of value range calculate catmdsclk when 4k10bit and set
scdc high tmds clock ratio when mtmdsclock is more than 340000000

Change-Id: I8aed4c99813e43c69526f3918d5e7024879d3288
Signed-off-by: Huicong Xu <xhc@rock-chips.com>
2018-01-30 16:24:50 +08:00
Huicong Xu
408f2a3e6f drm/bridge/synopsys: initialize hdmi variable when bootup with hdmi plugin
if bootup with hdmi plugin initialize mtmdsclock to modify voicelessness
and set bridge_is_on true to modify green screen when reboot from recovery

Change-Id: I0ed9f956d62ab4087cb42a54dafba6a0fc9e5a7e
Signed-off-by: Huicong Xu <xhc@rock-chips.com>
2018-01-30 16:24:37 +08:00
Huicong Xu
d7f22ab4c1 drm: bridge: dw-hdmi: fix wrong color if get edid error at bootup
if get edid error at bootup the input bus format will be set as
rgb and hdmi is no reinit, so hdmi color will be wrong if set yuv
in uboot, now reinit hdmi in this case.

Change-Id: I8d117b6e241079ceab44793f6566adf91e9d84c6
Signed-off-by: Huicong Xu <xhc@rock-chips.com>
2018-01-30 16:24:25 +08:00
Sandy Huang
752d7732ad pwm: rockchip: add pwm en for voppwm
voppwm is frame effect, so we need add vop pwm en to
indicate the pwm en state.

Change-Id: I1492322f99b638c8dc6cf03c87035f28dca3de8f
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-30 16:23:46 +08:00
Meiyou Chen
e5e9f55c57 drm/rockchip: priority use of highmem
Change-Id: Ib1f65ef5ed8afe15bc40b78cb756f6be6ba7687d
Signed-off-by: Meiyou Chen <cmy@rock-chips.com>
2018-01-30 16:13:17 +08:00
Sugar Zhang
7b43537ed9 arm64: dts: rockchip: px30: add i2s, pdm node
Change-Id: I601ea599353c1bd6c904aacbb554c776c7eeb7c6
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-01-30 14:38:13 +08:00