Commit Graph

606995 Commits

Author SHA1 Message Date
David Wu
ff72078491 arm64: dts: rockchip: Fix some adc key issues for rk3326/px30 board
1. add vref voltage 1.8v;
2. Alphabetical order;
3. Fix the press-threshold-microvolt;
4. Add poll interval 100ms

Change-Id: If5e29f5073155be3022053cc3516dda88c5db223
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-02-08 18:12:35 +08:00
David Wu
bbdfca3f4f arm64: configs: Enable CONFIG_KEYBOARD_ADC config for rockchip_defconfig
Change-Id: Ibb1deaeadc13186f12251a8596c8dd214bd0c12b
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-02-08 18:11:56 +08:00
Sandy Huang
bc11949511 drm/rockchip: vop: fix iommu pagefault
This version vop will read buffer when win2 master0-3 disable but
win2 enable, this is different from old vop version. so we add to
disable win2 en to make sure it's save.

Change-Id: Ib239a8901095a6eff980747f219c3aa585437dae
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-02-08 18:11:33 +08:00
Putin Lee
230ab0bd6c arm64: dts: rockchip: px30: add SCLK_RGA_CORE for rk_rga.
Change-Id: Ib183606bbd1a4ac2c9669100a6634aca45bcfb5e
Signed-off-by: Putin Lee <putin.li@rock-chips.com>
2018-02-08 15:31:57 +08:00
Zhang Yunlong
6b1070e646 camera: rockchip: cif: support multi camera config
fix gpio_desc request fail when multi cameras defined in dts.

Change-Id: I058ea1284ef86fcea621197367e426f018853936
Signed-off-by: Zhang Yunlong <dalon.zhang@rock-chips.com>
2018-02-08 14:57:10 +08:00
YouMin Chen
56dfe1fdbe arm64: dts: rockchip: add px30 ddr relate node
Change-Id: I33119ba0250c6c9fe78d124bf92a94a52f9442bf
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-02-08 14:56:22 +08:00
YouMin Chen
3f9d4749de PM / devfreq: event: add support for px30 dfi
Change-Id: Ib6808d961b65d993fea05ab15d648d814d14a4a2
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-02-08 14:53:27 +08:00
YouMin Chen
8865f61ad2 PM / devfreq: rockchip_dmc: add support for px30
Change-Id: I225088ce179f9b9cd62fce256b87bccb591fd2b2
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-02-08 14:52:32 +08:00
YouMin Chen
326d6f59d1 clk: rockchip: px30: Add SCLK_DDRCLK for dmc
Change-Id: I03d6c18829f8895c28bbaef883e187304c48f9aa
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-02-08 14:52:26 +08:00
Huibin Hong
53d9e933bc fiq_debugger: rockchip: deal with this_cpu and current_cpu are different
If this cpu is not the same as current cpu, it means we don't use
current cpu any more, and this cpu handles uart interrupt. So it
is unnecessary to set uart interrupt to this cpu again.

Change-Id: Ia454af96ee766dcbc8b22339652a4aa7eb229568
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-02-08 14:29:02 +08:00
Zorro Liu
92d992f480 arm64: dts: rockchip: modified sensor layout of rk3326-evb-lp3-v10 board
Change-Id: Ib8fbddaf02f0e3d77f230e6ff44f0613ff12d822
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-02-08 14:22:43 +08:00
Zhou weixin
70d0347a0b arm64: dts: rockchip: enable vip for rk3326 863 board
Change-Id: Ied60270696bc0dfd0dc41937c1e24b289e6063f5
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-08 14:22:20 +08:00
Zhong Yichong
2c20095fea arm64: dts: rockchip: px30: add vip iommu node reference to vip node
Change-Id: Ic2772881a47aeb25ff68e2a39f3895e40db70a42
Signed-off-by: Zhong Yichong <zyc@rock-chips.com>
2018-02-08 14:21:28 +08:00
Sugar Zhang
65c32d2028 arm64: dts: rockchip: px30: add default pinctrl for i2s, pdm
Change-Id: I5cf7436e65c04a30cc3ef4c89ee49e1e76ef0527
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-02-08 14:20:41 +08:00
Finley Xiao
8ee4287ff7 clk: rockchip: px30: Make pclk_top_pre critical
Change-Id: I86081f6dbd85ab36e0e83b5b22fdd7b686a2cf9d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-08 14:10:58 +08:00
Caesar Wang
e2e86394f6 arm64: rockchip_linux_config: enable the cdn DP
Change-Id: I2b9812be9a33b31e7b9e9531f5c1acd2c8dc53a2
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-02-08 13:42:26 +08:00
Caesar Wang
628c1aeb34 arm64: dts: rockchip: enable cdn DP for rk3399 sapphire
As we had posted the DP firmeware to /lib/firmware/rockchip,
so you need check this path in your rootfs first, if enable the DP.

Change-Id: Id24a42edc9d6cd0b0de0a2dfefe2727df3965b67
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-02-08 13:42:20 +08:00
Rocky Hao
f417571488 PM / devfreq: rockchip_dmc: record opp rate instead of real clock rate
opp rate is used to calc power in thermal framework, so we record this rate
instead of real clock rate.

Change-Id: Ic51a8c36be8d63fcf765e6d49930d1d437a2e502
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-02-08 09:47:01 +08:00
Rocky Hao
ae5b1c4df1 arm: dts: rockchip: add dmc thermal control for rk322x
add power model for dmc and add dmc as a cooling device in thermal
control

Change-Id: Ibc5f8ec97b43d4fcf9ff817582711b924d2a7ef0
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-02-08 09:46:38 +08:00
Finley Xiao
3aa3d78ce1 PM / devfreq: rockchip_dmc: Disable auto-freq if events is disabled
Change-Id: Ia39dfc884feea8cb6c29a7ed293bb567aca15b83
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-08 09:46:14 +08:00
Liang Chen
069bbc18e7 arm: dts: enable dmc for board rk3229-evb-android
Change-Id: I9abf24d165e236d1895efc04336982c2ce81c013
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-08 09:45:27 +08:00
Liang Chen
d826c69c4d arm: dts: add dmc support for rk322x
Change-Id: Ibf72cb8d2e26490386212d564309f5b85692105a
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-08 09:45:10 +08:00
Liang Chen
f06ee6308f PM / devfreq: rockchip_dmc: add support for rk3228
Change-Id: I3943716a66b3c0849d815b7f69cc0bbd843d7e4e
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-08 09:37:30 +08:00
Liang Chen
adbf52abda clk: rockchip: rk3228: add clk_ddrc for devfreq of ddr
Change-Id: I3771e2ef68ab3fa8ad1b7d61a84c7181c693c60f
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-08 09:35:17 +08:00
Zhou weixin
b48da90f72 arm64: dts: rockchip: add wifi power control for rk3326-863-lp3-v10
Change-Id: Ic5dd468ade0c165c14d80530f3bba43979c785a0
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-08 09:33:19 +08:00
Zhou weixin
deacb7ed8d arm64: dts: rockchip: px30: Correct sdio irq number and add iomux
Change-Id: Id61aece26f7c9e612a332ed8d0342693a4cc3b6a
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-02-08 09:30:20 +08:00
Liang Chen
491f6e8e93 arm64: dts: rockchip: add pstore for px30-android
Change-Id: I2e12f234244eb45e24d1f38841eef7017ae8cfd4
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-08 09:26:06 +08:00
Sandy Huang
a442d86da8 drm/rockchip: px30 vop: not support ymirror and add channel config
Change-Id: Ia89b6d5fde3b191b82e81c1399f82689267a629a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-02-08 09:25:43 +08:00
Tao Huang
8590206686 mfd/fusb302: fix compile warning
drivers/mfd/fusb302.c:1164:3: warning: memset used with length
equal to number of elements without multiplication by element
size [-Wmemset-elt-size]

Change-Id: I33ac6408bc4cee656c7f18948d418527619b3d6b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-02-08 09:24:58 +08:00
Tao Huang
8d2d0b6a51 Merge tag 'lsk-v4.4-18.02-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
LSK 18.02 v4.4-android

* tag 'lsk-v4.4-18.02-android': (131 commits)
  Linux 4.4.114
  nfsd: auth: Fix gid sorting when rootsquash enabled
  net: tcp: close sock if net namespace is exiting
  flow_dissector: properly cap thoff field
  ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY
  net: Allow neigh contructor functions ability to modify the primary_key
  vmxnet3: repair memory leak
  sctp: return error if the asoc has been peeled off in sctp_wait_for_sndbuf
  sctp: do not allow the v4 socket to bind a v4mapped v6 address
  r8169: fix memory corruption on retrieval of hardware statistics.
  pppoe: take ->needed_headroom of lower device into account on xmit
  net: qdisc_pkt_len_init() should be more robust
  tcp: __tcp_hdrlen() helper
  net: igmp: fix source address check for IGMPv3 reports
  lan78xx: Fix failure in USB Full Speed
  ipv6: ip6_make_skb() needs to clear cork.base.dst
  ipv6: fix udpv6 sendmsg crash caused by too small MTU
  ipv6: Fix getsockopt() for sockets with default IPV6_AUTOFLOWLABEL
  dccp: don't restart ccid2_hc_tx_rto_expire() if sk in closed state
  hrtimer: Reset hrtimer cpu base proper on CPU hotplug
  ...
2018-02-07 20:59:20 +08:00
Finley Xiao
f6128506aa clk: rockchip: px30: Fix i2s out mclk
Change-Id: I1f90747c780c867e172168e8c877915477a66e59
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-07 19:47:28 +08:00
Tao Huang
dcc52ea50d video/rockchip/rk_fb: fix compile warning
drivers/video/rockchip/rk_fb.c:4002:4: warning: this else
clause does not guard... [-Wmisleading-indentation]

Change-Id: I4c75dea72a2ebde8f1271334f91d5fd890274017
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-02-07 19:25:00 +08:00
Tao Huang
6e1a9a5ca4 video/rockchip/lcdc/rk3368_lcdc: fix compile warning
drivers/video/rockchip/lcdc/rk3368_lcdc.c:2198:2: warning: this if
clause does not guard... [-Wmisleading-indentation]

Change-Id: I0cbd3ba10b891b67782b1a105eaac3d473e52527
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-02-07 19:24:35 +08:00
Tao Huang
c763c84a62 media/video/rk30_camera_oneframe: fix compile warning
drivers/media/video/rk30_camera_oneframe.c:2212:5: warning: this if
clause does not guard... [-Wmisleading-indentation]

Change-Id: Ie304d39082a84b322a15b8b74f5b24d9d394b4d7
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-02-07 19:20:38 +08:00
Tao Huang
02a3e3fc5e media/video/generic_sensor: fix compile warning
drivers/media/video/generic_sensor.c:865:5: warning: this if
clause does not guard... [-Wmisleading-indentation]

Change-Id: Ic34e59cb45b28864ccc15f5c641cd6aedbff4dab
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-02-07 19:06:04 +08:00
Tao Huang
27ba838b5e power/rk817_charger: fix compile warning
drivers/power/rk817_charger.c:735:2: warning: this else clause
does not guard... [-Wmisleading-indentation]

Change-Id: Ib65d2f54463c39d7fe9fd1dfb39a76035df05172
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-02-07 18:59:05 +08:00
Tao Huang
d97eb29a35 hid/hid-rkvr: fix compile warning
drivers/hid/hid-rkvr.c:780:3: warning: memcpy writing 9 bytes into
a region of size 1 overflows the destination [-Wstringop-overflow=]

Change-Id: If4859756f19cb692bcc3584ff707c135749e73e4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-02-07 18:46:00 +08:00
Rocky Hao
cdf1300d50 arm64: dts: rockchip: px30: add basic thermal config
Change-Id: I4febd05098d1adb1cf26e20fa4929d6c3a65541f
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-02-07 17:57:29 +08:00
Wyon Bi
8645f241e2 arm64: dts: rockchip: rk3326-evb-lp3-v10: add samsung,lsl070nl01 lvds panel
Change-Id: I491f42a1f4bcef37220225de42e6b5e32d7849cd
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-02-07 17:56:42 +08:00
Wyon Bi
b7dc6245a7 drm/rockchip: lvds: Add support for PX30
Fixes: 35cd525521 ("drm/rockchip: lvds: Add support for PX30")
Change-Id: Ib71efbb6a063694d755df287568e0d14d6074238
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-02-07 17:56:42 +08:00
Wyon Bi
7300f293eb arm64: dts: rockchip: px30: correct reg address for lvds node
Change-Id: I40365c31fe801f29c5cb2ffa57b478d1fe63b2b0
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-02-07 17:56:42 +08:00
Zorro Liu
fb0bdec10f arm64: dts: rockchip: modify sensor layout value of rk3326-863-lp3-v10 board
Change-Id: Ida4cf4b314c34a5daf7706d74913505945584b1c
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-02-07 15:56:25 +08:00
Liang Chen
f283252018 clk: rockchip: px30: make clk_gpu_divnp5 critical
If disable clk_gpu_divnp5, we will get error below:

[    3.699114] rockchip-pm-domain ff000000.power-management:power-controller: failed to get ack on domain
 'pd_gpu', val=0x43c443c4
[    3.700579] W : [File] : drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c; [Line] : 134; [Fu
nc] : kbase_platform_rk_init(); power-off-delay-ms not available.
[    3.700880] Unhandled fault: synchronous external abort (0x96000010) at 0xffffff8009620000
[    3.700897] Internal error: : 96000010 [#1] PREEMPT SMP
[    3.703090] Modules linked in: bifrost_kbase(+)
[    3.703524] CPU: 0 PID: 1 Comm: init Not tainted 4.4.112 #578
[    3.704034] Hardware name: Rockchip rk3326 evb board (DT)
[    3.704515] task: ffffffc00a308000 task.stack: ffffffc00a310000
[    3.705362] PC is at kbase_reg_read+0xd0/0x1c8 [bifrost_kbase]
[    3.706173] LR is at kbase_backend_gpuprops_get+0x24/0x20c [bifrost_kbase]

Change-Id: I481cdaa60b5174ae6763e11fb42f79ed9208c120
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-02-07 15:33:17 +08:00
Sandy Huang
78e60f5ad5 drm/rockchip: px30 vop: correct for alpha config
Change-Id: Ifc9741392e3b3fc2996917655e84535039e5ca00
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-02-07 14:09:49 +08:00
Wyon Bi
b1c013a231 phy/rockchip: mipi-dphy: Fix pclk handing
Change-Id: I6f57995cb65bdeb0aa750387107b8c4ba2080293
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-02-07 12:15:00 +08:00
Zhangbin Tong
712e48b64a arm64: dts: rockchip: rk3368-r88: enable dmc and dfi
Change-Id: I87f9c30778d4b58d4447abb89e01bc59b00b6ad0
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-02-07 12:04:17 +08:00
Xinhuang Li
1cfda2f55e clk: rockchip: rk3228: Add clock id for pclk_acodecphy
Change-Id: I289f2c2681e187eaed0cda1561544581409ffd07
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-02-07 12:03:35 +08:00
Zheng Yang
08ec13e4d0 drm: rockchip: dw-hdmi: fix 10bit not work when booting up with uboot logo
Default value of hdmi->colordepth is defined by input color mode,
so there is no need to set value again when color depth property
is created.

Change-Id: I2e242fabdaadc0c3b41e48f806cbded5f619c455
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2018-02-07 12:02:59 +08:00
huangjc
6abfe1d617 drm: bridge: synopsys: Fix hdmi can't display in android
Change-Id: I2f3ee8176761b5227c30df25c569e4c34ae773e2
Signed-off-by: Jiancai Huang <huangjc@rock-chips.com>
2018-02-07 12:02:45 +08:00
Wyon Bi
1aa2618e86 drm/rockchip: dsi: support dual-link mode
Display Pipeline:

1) dual-channel mode

              --> dsi0 --> dphy_tx0 -->
             /                 !       \
vopl/vopb -->              dphy_pll     --> panel
             \                 !       /
              --> dsi1 --> dphy_tx1 -->

2) dual-link mode

vopb/vopl --> dsi0 --> dphy_tx0 --> panel0
                           !
                       dphy_pll
                           !
vopl/vopb --> dsi1 --> dphy_tx1 --> panel1

Change-Id: Iddbea22f121959e4afa969d74549d8fb66ab09f1
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-02-07 12:02:27 +08:00