Commit Graph

602892 Commits

Author SHA1 Message Date
Jerry Xu
cce05971db ARM: dts: rk3288: dts configuration example for dual-channel dsi panel
Change-Id: I6557681b51026a0f216f873b9a49048dd374acef
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2017-08-02 10:26:02 +08:00
WeiYong Bi
78fc83b3c0 arm64: dts: rockchip: rk3399-android: add route-dsi1 node
Change-Id: I0978d80237276d84f9df51d97997dd861aa8ae96
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-08-02 10:24:22 +08:00
WeiYong Bi
a827ecbec6 arm64: dts: rockchip: rk3399: add dsi1 node
Change-Id: I964f047b0cf9f6355d61630d03181f229fdd8c15
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-08-02 10:24:02 +08:00
WeiYong Bi
1ae2dccdfa drm/rockchip: vop: add data01_swap support
Change-Id: I4a00e7d5efe49ee9621ed7218a10e0ef1628ee47
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-08-02 10:23:46 +08:00
William Wu
d7338bf594 usb: dwc_otg_310: support battery charger detect for rk3288w
rk3288 and rk3288w use different compatible string, so add
"rockchip,rk3288w" to support rk3288w.

Change-Id: I828f09d26fea30921159f24ce9bdffd286df777a
Signed-off-by: William Wu <william.wu@rock-chips.com>
2017-08-02 10:21:12 +08:00
William Wu
80e9c60c52 usb: ehci-platform: use no relinquish port quirk only for rk3288
rk3288 and rk3288w use the same dts which includes no relinquish
port quirk, however rk3288w ohci can work well, so we need to add
an additional condition to disable ohci only for rk3288.

Change-Id: Ic2bd0ce577cbebe7ae2cf1b153f9e46935022f77
Signed-off-by: William Wu <william.wu@rock-chips.com>
2017-08-02 10:20:58 +08:00
William Wu
32f0d2c081 usb: ohci-platform: disable ohci for rk3288
rk3288 ohci doesn't actually work on hardware, so we
need to disable it in ohci-platform driver.

Change-Id: I72750edda67358ff1e8fe66047bf60420500997e
Signed-off-by: William Wu <william.wu@rock-chips.com>
2017-08-02 10:20:46 +08:00
William Wu
ccc750901f ARM: dts: rockchip: enable ohci for rk3288-evb
Change-Id: I8eaa71694dd132a32b00ef273aaaeb8835a22cb9
Signed-off-by: William Wu <william.wu@rock-chips.com>
2017-08-02 10:20:30 +08:00
William Wu
01ab34d927 ARM: dts: rockchip: add usb ohci node for rk3288
rk3288 and rk3288w have an ohci controller, although rk3288
ohci doesn't actually work on hardware, but rk3288w ohci can
work well, so we need to add usb ohci node in dts, and then
add a quirk in ohci driver to disable ohci for rk3288.

Change-Id: I0ce26a9851f6bc3c82cc8b7dc16ecc7b4ce2ca28
Signed-off-by: William Wu <william.wu@rock-chips.com>
2017-08-02 10:20:12 +08:00
William Wu
10ae32f67c ARM: dts: rockchip: fix reg size for rk3288 ehci
According to rk3288 TRM, the size of usb ehci is 128K,
so let's fix it in dts.

Change-Id: I1adf02080033906a88b34cae877bb84ad0f63059
Signed-off-by: William Wu <william.wu@rock-chips.com>
2017-08-02 10:19:38 +08:00
Finley Xiao
b5fa303fb5 arm64: dts: rk3368: enable dfi and dmc nodes for sheep board
Change-Id: I7b73448ab1bb812fc026931651be66f2db010e76
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-08-01 18:21:40 +08:00
Finley Xiao
796f116833 drm/rockchip: vop: add mutex lock to two vops
Each vop should add mutex lock when do ddr frequceny change.

Change-Id: Ie63c90b0b4421d1be6bf8bdc9ff3b179fdf2193d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-08-01 18:14:43 +08:00
Mark Yao
44aa45da29 drm/rockchip: vop: correct pin_pol define
Fixes: b2d8717 ("drm/rockchip: vop: split dclk_pol from pin_pol")
Change-Id: If756fe0791d41c7084296f4f28481cbc665f09c4
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-08-01 18:09:59 +08:00
zzc
602539cfc9 net: wireless: rockchip_wlan: add rtl8723ds support
update rtl8723ds wifi driver to version v5.1.1.5_20523.20161209_BTCOEX20161208-1212

Change-Id: Ifd44ce917d1fcb47696b893f2293ed932952bdef
Signed-off-by: zzc <zzc@rock-chips.com>
2017-08-01 17:13:14 +08:00
Jerry Xu
6cd4eabae7 drm/rockchip: dw-mipi-dsi: add dual-channel dsi support
Change-Id: I11f203794d9b07a6a60e0c583827154da8c9daf6
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2017-08-01 14:51:47 +08:00
Jerry Xu
b8c261fb83 drm/rockchip: dw-mipi-dsi: adjust the calculation of lane_mbps
adjust the calculation of lane_mbps to distinguish between
two different phy. also convenient to add support for dual-channel

Change-Id: I2916d880202bba11b9db1fa48a7534fc1f65e331
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2017-08-01 14:51:25 +08:00
Jerry Xu
2506d1ef59 ARM: dts: rk3288: add dual-channel dsi support
Change-Id: Ic28014af8e5a264f6ccf760caf7ef888392ff63d
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2017-08-01 14:50:53 +08:00
Meng Dongyang
ce201dfb77 usb: dwc_otg_310: set operational mode of phy to normal when suspend for rk3368
The phy driver of otg port set operational mode to non-driving
when suspend and set to normal when resume. But if we connect
with low speed, it may be disconnected after suspend and resume
by the changing of operational mode. In addition, the linestate
change interrupt flag can't be cleared if the operational mode
is non-driving. This patch set operational mode to normal even
if the phy is suspended, and make sure that operational mode is
same during suspend and resume.

Change-Id: I670d2cbd4e7c4dc115a735feef848f36f120c295
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
2017-08-01 14:47:45 +08:00
Chen Liang
39d75ac63a ARM: dts: rockchip: add RK3126 eavluation board devicetree
This patch add rk3126-evb.dts for RK3126 evaluation board.
Tested on RK3126 evb.

Change-Id: I56d416416e16e9a8f8f0a57d926aad7ac2fadbba
Signed-off-by: Chen Liang <cl@rock-chips.com>
2017-08-01 14:31:57 +08:00
Chen Liang
f5d3b32988 ARM: dts: rockchip: add core dtsi file for RK3126 and RK3128 SoCs
This patch adds core dtsi file for Rockchip RK3126 and RK3128 SoCs.

Change-Id: I4b64594a8d0351f65a6947e16ec0682d6ac2520e
Signed-off-by: Chen Liang <cl@rock-chips.com>
2017-08-01 14:31:49 +08:00
Elaine Zhang
4bb19becb4 clk: rockchip: rk3128: modify rk3128 clk driver to support rk3126
rk3128 and rk3126 have some gate registers describe differences.
So need to make some distinctions.
The RK3126 and RK3128 Same clock description we move it to
the common clock branches.
And the different clks description use the own clock branches.

Change-Id: If9571da0a86067d814c225629a6b6f07f0270f14
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-08-01 14:31:38 +08:00
tony.xie
14fd931192 arm64: dts: rockchip: support cluster idle feature for rk3366
1) Add cluster sleep mode in cpu idle_states for RK3366 SoCs.
2) Modify cpu idle parameter.

Change-Id: I538c0bead8642c3642448edfe9971a3b09e919e0
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
2017-08-01 14:28:57 +08:00
Jung Zhao
8dfdd0e349 video: rockchip: vpu: add core&cabac&niu_a|h reset
Change-Id: Ied8f16b79ac0142fadbc1ce3a3f47ede7d22790b
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2017-07-31 18:08:33 +08:00
Finley Xiao
c6880daeb7 soc: rockchip: pvtm: fix undefined reference to rockchip_get_pvtm_value
This patch fixed compilation error when compiled rockchip_linux_defconfig
without CONFIG_ROCKCHIP_PVTM

Change-Id: Icb43485a9ce8dca0e40507b370487b89617813c4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-07-31 11:12:53 +08:00
Finley Xiao
14cca08e1b arm64: dts: rockchip: rk3399-android: enable pvtm
Change-Id: Id84681069a4e83c8307cdf5baef3a6126af0edb2
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-07-31 10:43:23 +08:00
WeiYong Bi
b2046b12f2 arm64: dts: rockchip: rename mipi to dsi for rk3399
Change-Id: I6c6fb4e0399b805dfa012cc5562ad71103aa85e9
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-28 17:53:18 +08:00
Huibin Hong
e8b7cbd64a watchdog: dw_wdt: fix overflow issue in dw_wdt_top_in_seconds
If top is 15, (1 << (16 + top)) may be negative.

Change-Id: I76e4a603a54f093e64a4b266008570e3afcdb35a
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2017-07-28 17:52:33 +08:00
Jianqun Xu
b926b11cab ARM: dts: rockchip: rk3288-android add vmalloc=496M
Change-Id: Ia26646946a74554aa298bc5a13d9fcadb5bd0a21
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2017-07-28 17:46:14 +08:00
WeiYong Bi
b1ae872815 drm/rockchip: vop: add dual-channel dsi support
Change-Id: Ibddc064c6c588d0733a238b08b7ba4c5bd4518a2
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-28 15:51:48 +08:00
WeiYong Bi
488f7b9a6a Revert "clk: rockchip: rk3368: Add CLK_IGNORE_UNUSED flag for mipi phy refclk"
This reverts commit 71d279801c.

Change-Id: I2e258616f64458a29845308cf697b00be2e0460c
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-28 09:28:41 +08:00
WeiYong Bi
5bd8a41377 arm64: dts: rockchip: remove unused "rockchip,dsi-panel" property
Change-Id: I144776a377bf3eeb5e56065fa9aff7c2c43c8e6d
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-28 09:27:17 +08:00
WeiYong Bi
9d268a4e2b drm/rockchip: dsi: Clearly distinguish between SNPS PHY and Non-SNPS PHY
Change-Id: Ia947050f444eac75e951ddc8cd7e0b4453673094
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-28 09:25:35 +08:00
WeiYong Bi
e21df29591 arm64: dts: rockchip: rk3368: export MIPI DPHY PLL clock
Change-Id: I15ef0a01cde0459d1993110f5653f6bf10f99a64
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-28 09:23:13 +08:00
WeiYong Bi
62fd234123 arm64: dts: rockchip: rk3366: export MIPI DPHY PLL clock
Change-Id: I99a4c252f877ff36a16f991ee2e94bb110401e47
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-28 09:22:22 +08:00
WeiYong Bi
fd964decbc phy: rockchip-inno-mipi-dphy: export PLL clock
Change-Id: I1eb96241930e380997dd66f3a3b479fe53a72a98
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
2017-07-28 09:21:40 +08:00
Zhou weixin
0b20916b09 arm64: dts: rockchip: fix pwm3 pinctrl for rk3368
Change-Id: I0e232a4df41d88afadd6a99011a71bbacab6e375
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2017-07-28 09:13:58 +08:00
Mark Yao
559207f083 drm/rockchip: vop: only initial pll for enabled vop
Change-Id: I33521c7ca57869913e94522b19ff3a2a20250829
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-27 16:45:59 +08:00
Mark Yao
3fa0f9ff62 drm/rockchip: vop: move dclk pll into vop private data
each vop only need one dclk pll reference, Save dclk pll
on rockchip_crtc_state would make things complex

Change-Id: Id779f1bf54d5bfa52aed413c238781083f333782
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-27 16:45:55 +08:00
tony.xie
9c8a30957f arm64: dts: rockchip: add rktimer device node for rk3366
Select rktimer0 as broadcast timer.

Change-Id: I1f9d80d920b063135c3b220b4df995eb5fcefa44
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
2017-07-27 11:44:09 +08:00
Wenping Zhang
b34a51794b ARM: dts: rk3229-gva-sdk: update changes for new gva hardware.
1. use emmc instead of nand.
2. enable cypress cy8c4024 touchpad support.

Change-Id: Ie9e72516601f2af8caaa1325b98d1574d010a22f
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
2017-07-27 11:42:00 +08:00
Wenping Zhang
476da669d3 ARM: rockchip_defconfig: enable TOUCHSCREEN_CY8C40XX.
Change-Id: I2d21f06116f4af6a1dbcd1f0dd3444bded085487
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
2017-07-27 11:41:37 +08:00
Wenping Zhang
2a573afcd2 input: touchscreen: add cy8c40xx touchpad support.
Change-Id: I765177ee00472e19b8bc6fcbdb79db4ea914f3a9
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
2017-07-27 11:41:23 +08:00
Huang, Tao
6ee6d6d68b Merge tag 'lsk-v4.4-17.07-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
LSK 17.07 v4.4-android

* tag 'lsk-v4.4-17.07-android': (402 commits)
  dt/vendor-prefixes: remove redundant vendor
  Linux 4.4.77
  saa7134: fix warm Medion 7134 EEPROM read
  x86/mm/pat: Don't report PAT on CPUs that don't support it
  ext4: check return value of kstrtoull correctly in reserved_clusters_store
  staging: comedi: fix clean-up of comedi_class in comedi_init()
  staging: vt6556: vnt_start Fix missing call to vnt_key_init_table.
  tcp: fix tcp_mark_head_lost to check skb len before fragmenting
  md: fix super_offset endianness in super_1_rdev_size_change
  md: fix incorrect use of lexx_to_cpu in does_sb_need_changing
  perf tools: Use readdir() instead of deprecated readdir_r() again
  perf tests: Remove wrong semicolon in while loop in CQM test
  perf trace: Do not process PERF_RECORD_LOST twice
  perf dwarf: Guard !x86_64 definitions under #ifdef else clause
  perf pmu: Fix misleadingly indented assignment (whitespace)
  perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed
  perf tools: Remove duplicate const qualifier
  perf script: Use readdir() instead of deprecated readdir_r()
  perf thread_map: Use readdir() instead of deprecated readdir_r()
  perf tools: Use readdir() instead of deprecated readdir_r()
  ...

Conflicts:
	Makefile
	drivers/Kconfig
	drivers/Makefile
	drivers/usb/dwc3/gadget.c

Change-Id: Ib4aae2e34ebbf0d7953c748a33f673acb3e744fc
2017-07-26 19:32:04 +08:00
Mark Yao
8ccefa5de2 arm64: dts: rockchip: rk3399: add cabc lut register
Change-Id: Ia4b47301b58141b24e75e35544beb903325e0a19
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-26 19:11:03 +08:00
Tomasz Figa
5fd5d0d25b UPSTREAM: drm/rockchip: Always signal event in next vblank after cfg_done
This patch makes the driver send the pending vblank event in next vblank
following the commit, relying on vblank signalling improvements done in
previous patches. This gives us vblank events that always represent the
real moment of changes hitting on the screen (which was the case only
for complete FB changes before) and lets us remove the manual window
update check.

Signed-off-by: Tomasz Figa <tfiga@chromium.org>
(cherry picked from commit 41ee436700)

Change-Id: Icb1d14cb8af942e39407cc6205a58b9c5e31122b
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-26 19:09:45 +08:00
Mark Yao
3e8b3fb984 drm/rockchip: fix mm_dump NULL pointer crash
drm mm is not initial on non-iommu context.

Fix crash:
[   11.635376] Unable to handle kernel NULL pointer dereference at virtual address 00000000
[   11.636148] pgd = ffffffc0de19d000
[   11.636474] [00000000] *pgd=0000000000000000, *pud=0000000000000000
[   11.637088] Internal error: Oops: 96000045 [#1] PREEMPT SMP
[   11.637594] Modules linked in:
[   11.637902] CPU: 4 PID: 424 Comm: sh Not tainted 4.4.71 #146
[   11.638406] Hardware name: Rockchip RK3399 Evaluation Board v3 (Android) (DT)
[   11.639050] task: ffffffc0de796800 ti: ffffffc0de260000 task.ti: ffffffc0de260000
[   11.639736] PC is at __mutex_lock_slowpath+0xa8/0x178
[   11.640198] LR is at __mutex_lock_slowpath+0x7c/0x178
[   11.788003] [<ffffff8008b85b5c>] __mutex_lock_slowpath+0xa8/0x178
[   11.788560] [<ffffff8008b85c58>] mutex_lock+0x2c/0x44
[   11.789024] [<ffffff800849e8d8>] rockchip_drm_mm_dump+0x30/0x5c
[   11.789560] [<ffffff80081d612c>] seq_read+0x1a8/0x3f8
[   11.790017] [<ffffff80081b4208>] __vfs_read+0x38/0xf4
[   11.790472] [<ffffff80081b4adc>] vfs_read+0x84/0x128
[   11.790927] [<ffffff80081b552c>] SyS_read+0x54/0xa4
[   11.791372] [<ffffff80080828b0>] el0_svc_naked+0x24/0x28

Change-Id: I342311da43d50b743257b81425dfc6a327306803
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-26 19:09:09 +08:00
Mark Yao
411afb7acf arm64: dts: rockchip: rk3366-android: enable vop lite
Change-Id: Ia10a57b86343048e038cb40a4e96de850cc707bc
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-26 16:04:38 +08:00
Mark Yao
1121ce783b arm64: dts: rockchip: rk3366: add vop lite support
Change-Id: I0e8afc5e7bc6b8e4f37b7d34e9126e931df68347
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-26 16:04:21 +08:00
Mark Yao
c2e4d4e9ca drm/rockchip: vop: add rk3366 vop lit support
Change-Id: Iaf869f0fbf7b703dff3c38e9df4b8570d9260bd4
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-26 16:04:06 +08:00
Mark Yao
b2d8717bea drm/rockchip: vop: split dclk_pol from pin_pol
Some vop have a difference pin_pol layout

Change-Id: I96c4dc9fbc00470828748a926d6248c5a5772c82
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-07-26 16:03:55 +08:00