Commit Graph

1060365 Commits

Author SHA1 Message Date
Wu Liangqing
bc795307a7 arm64: dts: rockchip: add rk3588/rk3588s evb Board
Change-Id: I32134b86f3b8219e7422e8367073d34d424e6811
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-10-13 15:58:33 +08:00
Kever Yang
0b985f2930 irqchip/gic-v3-its: force to config its tables as no-inner-cache in rk3588
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc
2021-10-13 10:57:10 +08:00
Herman Chen
6588d22c1d video: rockchip: mpp: Remove lock on session release
Move mpp_session_deinit out of the lock range.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I46c3aaeb96c67ed04630b0da0a71385546dd5e7c
2021-10-13 09:51:55 +08:00
Tao Huang
78d3a59474 arm64: rockchip_gki.config: Enable RK806
+CONFIG_MFD_RK806_SPI=m
+CONFIG_PINCTRL_RK806=m
+CONFIG_REGULATOR_RK806=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I39e31a0c4035ba1037389c8168e8cb5e0a7650a5
2021-10-12 14:50:23 +08:00
Tao Huang
48bd0779b6 arm64: rockchip_defconfig: Enable RK806
+CONFIG_PINCTRL_RK806=y
+CONFIG_MFD_RK806_SPI=y
+CONFIG_REGULATOR_RK806=y

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8e3d01dbdf4fe2dac050c29dee54e3b20379d931
2021-10-12 14:50:23 +08:00
shengfei Xu
94a2726fb4 mfd: rk806: Add RK806 support
The RK806 are a Power Management IC (PMIC) for multimedia
and handheld devices. They contains the following components:
- Regulators
- Pinctrl
- PowerKey

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Iee9c521d52c53752286238c93b39afb5eb32e9b2
2021-10-12 14:50:23 +08:00
Jon Lin
52b779b7f4 PCI: rockchip: dw: Initialize atu_base
Initialize the variable atu_base before using it.

Change-Id: Icc4df9c3401f16d838141440f206d41ac7c385f7
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-09 16:50:56 +08:00
Wyon Bi
011c042f60 arm64: dts: rockchip: rk3588: Add edp1 node
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I0b2f854d5a283a18c96bf77242cf119cb42800cf
2021-10-09 15:07:45 +08:00
Wyon Bi
1ba6338e22 arm64: dts: rockchip: rk3588s: Add edp0 node
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ie3bf343524a958bb78842941bcb47f9e3cbe2262
2021-10-09 15:07:28 +08:00
William Wu
721f665968 arm64: dts: rockchip: dis u1 and u2 state for rk3588s dwc3 device
According the commit 729dcffd1e ("usb: dwc3: gadget: Add
support for disabling U1 and U2 entries"), it's necessary
to disable the U1 and U2 low power state to improve USB 3.0
performance for mass storage gadget and uvc gadget.

In addition, it can help to avoid the dwc3 wakeup failed
from U1 or U2 state when connect to the Host USB 3.0 interface.

android_work: sent uevent USB_STATE=CONNECTED
dwc3 fcc00000.dwc3: failed to send remote wakeup
dwc3 fcc00000.dwc3: wakeup failed --> -22
WARNING: CPU: 0 PID: 427 at drivers/usb/dwc3/gadget.c:319 dwc3_send_gadget_ep_cmd+0x198/0x93c
...
Call trace:
 dwc3_send_gadget_ep_cmd+0x198/0x93c
 dwc3_ep0_complete_status+0xe8/0x294
 dwc3_ep0_interrupt+0x2ac/0x3d4
 dwc3_process_event_entry+0x7c/0x610
 dwc3_process_event_buf+0x6c/0x374
 dwc3_thread_interrupt+0x38/0x64
 irq_thread_fn+0x34/0x88
 irq_thread+0x1a4/0x248
 kthread+0x13c/0x344
 ret_from_fork+0x10/0x30
dwc3 fcc00000.dwc3: failed to send remote wakeup
android_work: sent uevent USB_STATE=CONFIGURED

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I5993a3fceb79d59d276f6b909b17592fb36b6760
2021-10-09 14:56:12 +08:00
William Wu
892400358c arm64: dts: rockchip: dis u1 and u2 state for rk3568 dwc3 device
According the commit 729dcffd1e ("usb: dwc3: gadget: Add
support for disabling U1 and U2 entries"), it's necessary
to disable the U1 and U2 low power state to improve USB 3.0
performance for mass storage gadget and uvc gadget.

In addition, it can help to avoid the dwc3 wakeup failed
from U1 or U2 state when connect to the Host USB 3.0 interface.

android_work: sent uevent USB_STATE=CONNECTED
dwc3 fcc00000.dwc3: failed to send remote wakeup
dwc3 fcc00000.dwc3: wakeup failed --> -22
WARNING: CPU: 0 PID: 427 at drivers/usb/dwc3/gadget.c:319 dwc3_send_gadget_ep_cmd+0x198/0x93c
...
Call trace:
 dwc3_send_gadget_ep_cmd+0x198/0x93c
 dwc3_ep0_complete_status+0xe8/0x294
 dwc3_ep0_interrupt+0x2ac/0x3d4
 dwc3_process_event_entry+0x7c/0x610
 dwc3_process_event_buf+0x6c/0x374
 dwc3_thread_interrupt+0x38/0x64
 irq_thread_fn+0x34/0x88
 irq_thread+0x1a4/0x248
 kthread+0x13c/0x344
 ret_from_fork+0x10/0x30
dwc3 fcc00000.dwc3: failed to send remote wakeup
android_work: sent uevent USB_STATE=CONFIGURED

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I7887c782a0320abe768079b098eab17ee846dcf6
2021-10-09 14:55:56 +08:00
William Wu
bda4084ed7 arm64: dts: rockchip: dis u1 and u2 state for rk3399 dwc3 device
According the commit 729dcffd1e ("usb: dwc3: gadget: Add
support for disabling U1 and U2 entries"), it's necessary
to disable the U1 and U2 low power state to improve USB 3.0
performance for mass storage gadget and uvc gadget.

In addition, it can help to avoid the dwc3 wakeup failed
from U1 or U2 state when connect to the Host USB 3.0 interface.

android_work: sent uevent USB_STATE=CONNECTED
dwc3 fcc00000.dwc3: failed to send remote wakeup
dwc3 fcc00000.dwc3: wakeup failed --> -22
WARNING: CPU: 0 PID: 427 at drivers/usb/dwc3/gadget.c:319 dwc3_send_gadget_ep_cmd+0x198/0x93c
...
Call trace:
 dwc3_send_gadget_ep_cmd+0x198/0x93c
 dwc3_ep0_complete_status+0xe8/0x294
 dwc3_ep0_interrupt+0x2ac/0x3d4
 dwc3_process_event_entry+0x7c/0x610
 dwc3_process_event_buf+0x6c/0x374
 dwc3_thread_interrupt+0x38/0x64
 irq_thread_fn+0x34/0x88
 irq_thread+0x1a4/0x248
 kthread+0x13c/0x344
 ret_from_fork+0x10/0x30
dwc3 fcc00000.dwc3: failed to send remote wakeup
android_work: sent uevent USB_STATE=CONFIGURED

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ic63ee7852fbe1bcb3563b6dec455c0aee53522f1
2021-10-09 14:55:42 +08:00
Tao Huang
b2fcc4af16 arm64: rockchip_gki.config: Disable CONFIG_CIFS
GKI do not support CIFS.
See https://android-review.googlesource.com/c/kernel/common/+/1790207

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I0aa50859802924fbbd9f83579eba49b775107035
2021-10-09 10:45:26 +08:00
Tao Huang
7cc25edbc3 arm64: rockchip_gki.config: Disable unused CONFIG_SLIP
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie0d09bc7550578cf189bebc5e321cb623404aae1
2021-10-09 10:35:14 +08:00
Tao Huang
5e1502c5ba arm64: rockchip_defconfig: Disable unused CONFIG_SLIP
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1f5739cfdbac51c2d1981f306242396eb20c0edd
2021-09-30 19:24:39 +08:00
Wang Panzhenzhuan
109691985a meida: i2c: nvp6158: cherry-pick from kernel-4.19 and adapt to
kernel-5.10

  media: i2c: add nvp6158 sensor driver from NEXTCHIP Inc
  Change-Id: I9f58e128889db55333e90e75144687ce9cc6d40f

  media: i2c: nvp6158: add v4l2 interface
  Change-Id: I7932353657f5a75f2787647c7b4f31c6c9dbde44

  media: i2c: nvp6158: add workqueue & more resolution support
  Change-Id: I6c7b762cacefe7de473a63cb275e1861c9ef096b

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I9f58e128889db55333e90e75144687ce9cc6d40f
2021-09-30 16:49:16 +08:00
Tao Huang
ee64273f65 arm64: rockchip_gki.config: Enable type-c modules
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_HUSB311=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I122d88d84c45b1f9c47a59066aa96ad52106d6e6
2021-09-30 16:46:43 +08:00
Tao Huang
734cb353d8 arm64: rockchip_gki.config: Enable CONFIG_TOUCHSCREEN_GSL3673
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If01e5c33cbfcfc62b7c0162eaa0a29573f18c047
2021-09-30 16:46:32 +08:00
Frank Wang
073de4f1bc arm64: rockchip_defconfig: select type-c support
Select Type-C related configs for Rockchip SoCs.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I301d6538998a56788d88ab860e4270122783c918
2021-09-30 16:19:26 +08:00
Frank Wang
3b31748297 usb: typec: tcpm: add regulator ctrl for husb311
This adds optional vbus control for husb311 Type-C controller.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: Idebff3cee16b10a9df4fa90b75d01b6a2223a5a4
2021-09-30 16:19:06 +08:00
Wang Jie
798f98df25 usb: typec: tcpm: add husb311 driver
At present, there is no requirement for PD3.0 PPS function,
the driver has not verified this function.

Change-Id: Ib78bf1f96f806cca4a20567db2a7cbaf0fba01af
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2021-09-30 16:18:56 +08:00
Frank Wang
364e3ea6ca dt-bindings: usb: add husb311 type-c controller document
Add device tree binding document for Hynetek husb311 Type-C chip driver.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: Ibe54b039ee773c5a99d5f7688d0695999fb45611
2021-09-30 16:18:42 +08:00
Wang Panzhenzhuan
35318c5708 media: i2c: nvp6324: fix compile error
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: If7d53e4c6667c09a8db90dca571599f12a2088ce
2021-09-30 14:46:55 +08:00
Sandy Huang
bd3ab87c3e drm/rockchip: vop: add CRTC feature interaction with userspace
move alpha scale to crtc feature and add hdr10/dolby hdr info to
feature to interaction with userspace, and remove alpha_scale_prop from
rockchip_drm_drv.c

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ic56c7a53c890702ce4a70167ea9926aa32b29fa7
2021-09-30 10:11:49 +08:00
Sandy Huang
2bc4f70d30 drm/rockchip: vop2: add CRTC feature interaction with userspace
move alpha scale to crtc feature and add hdr10/dolby hdr info to feature
to interaction with userspace.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I492647a22b41bf43c3127bd56b2ed0b3b95284a2
2021-09-30 10:11:49 +08:00
Sandy Huang
a14c198318 drm/bridge: sii902x: add YUV422 input support
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I0b6cc2a12206eb1cdc9f6c292856196c94b85d90
2021-09-30 10:11:49 +08:00
Sandy Huang
a52fb7412a drm/rockchip: drv: add register rockchip rgb driver
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I6dd9d78f6c3899917650a04fc21a10e4a31d9193
2021-09-30 10:11:49 +08:00
Sandy Huang
fb49e5eef8 drm/rockchip: rgb: sync with develop-4.19
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ic6945e12dd65e52cd631117721724e4a466f4dd4
2021-09-30 10:11:49 +08:00
Andy Yan
1a24bcdd02 drm/rockchip: vop2: Reset used_layers to 0
used_layers should reset to 0 before count
port_mux.

And also fix the follow warning:
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:2538:26: warning: Value
stored to 'vp' during its initialization is never read
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:2537:21: warning: Value
stored to 'layer' during its initialization is never read

Fixes: e013d2544c ("drm/rockchip: vop2: Assign plane for vp by
plane_mask")

Change-Id: I56b1576070392b7b262ef65b19cf14d1bfde0586
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-09-29 17:59:49 +08:00
Sandy Huang
da9fc4361f drm/rockchip: lvds: add loader protect
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I3fbbad4dfc5be934acf997d26e7c83e168b6af67
2021-09-29 15:19:13 +08:00
Wang Panzhenzhuan
be007aa434 media: i2c: nvp6324: update driver to match newest rkcif code
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ieed09f47bddcbd55b8d6bab98a002a1997bf6353
2021-09-29 11:14:18 +08:00
Wangqiang Guo
b7a3954400 input: touchscreen: Add support for gsl3673
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I950d827f97cbcaa019ce59b028f7effb5008587a
2021-09-28 14:22:43 +08:00
Wyon Bi
536c175f76 arm64: dts: rockchip: Add rk3566-evb2-lp4x-v10-edp.dts
Change-Id: Id56ca263872b42643a66dd063d541968436c4ca6
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-09-28 09:45:53 +08:00
Wyon Bi
0693dbf46c arm64: dts: rockchip: rk3568: Fix graph node unit address error
arch/arm64/boot/dts/rockchip/rk3568.dtsi:1905.18-1920.6: Warning
(graph_port): /hdmi@fe0a0000/ports/port: graph node unit address error,
expected "0"

Fixes: 1c82b603e3 ("arm64: dts: rockchip: rk3568: Add display subsystem dt node")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Id74c8d74f62885b445a91143038dbc1a07ab9881
2021-09-28 09:44:42 +08:00
Wyon Bi
2ab2d84fc0 drm/panel: simple: Add 'panel-timing' support
Fixes: dd03e97b25 ("drm/panel: simple: Get panel-desc data from DT")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: If018e3dc650def01708bcc0e2672af9506c858c5
2021-09-28 09:13:32 +08:00
Cai YiWei
9b386f8693 media: rockchip: isp: fix warn of v4l_enum_fmt
WARNING: CPU: 0 PID: 391 at drivers/media/v4l2-core/v4l2-ioctl.c:1476 v4l_enum_fmt+0x20c8/0x2114

Change-Id: I5343a5c727f3f57aa9f430dedc130cb409b4d022
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-27 18:42:19 +08:00
Sandy Huang
b41d964692 drm/rockchip: vop2: externd rockchip_drm_crtc from drm_crtc
externd rockchip_drm_crtc from drm_crtc, so we can add more private
parameter for dump buffer function.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I9e0450cafe9d184ac4d9daad03749ade1302f249
2021-09-27 18:35:37 +08:00
Sandy Huang
681930bf2d drm/rockchip: vop: externd rockchip_drm_crtc from drm_crtc
externd rockchip_drm_crtc from drm_crtc, so we can add more private
parameter for dump buffer function.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I56ca9c08d7d2bb19de544d56c9bc883d5b880da1
2021-09-27 18:12:42 +08:00
Sandy Huang
c7098c10c2 drm/rockchip: add a debug node to dump buf from userspace
dump path: /data/
debug node: /d/dri/0/ff900000.vop/vop_dump/dump
dump cmd:
    echo dump    > dump to dump one frame
    echo dumpon  > dump to start vop keep dumping
    echo dumpoff > dump to stop keep dumping
    echo dumpn   > dump n is the number of dump times

Change-Id: Id5fefa428db1b5669ceae418cd8bddfa52e52f61
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-09-27 18:11:38 +08:00
Andy Yan
e013d2544c drm/rockchip: vop2: Assign plane for vp by plane_mask
Change-Id: I6cbd87a5c4ecab7a54f30f0a6bfdd8721f86cce9
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-09-27 18:09:28 +08:00
Algea Cao
054249037d drm/bridge: synopsys: dw-hdmi: Fix display err when system boot set hdmi properties
Linux system will set hdmi properties when system boot
When some properties such as quant_range was set, dw_hdmi_setup()
will be called. HDMI status may not be config correctly. So if HDMI
is not properly initialized, don't call dw_hdmi_setup() when
these properties was set.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I6956e50161a4a5bd579f7174c73977d2e33da0c5
2021-09-27 17:29:24 +08:00
Simon Xue
6ff86d87fd iio: adc: rockchip_saradc: fix interrupt issue
Saradc interrupt status may exist forever if read saradc
when system suspending which disable clock that finally
lead to interrupt system dead. Add mutex in suspend to
avoid this issue.

Change-Id: I6a83e4bd79db90a79985685b5e94df2209b5ae81
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-09-27 17:25:06 +08:00
Steven Liu
dcc20720d0 serial: 8250: fix 8250_dwlib.c gki error
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I49c2797bd0c9ac4d7461910555a4a371d407cbd2
2021-09-27 16:53:51 +08:00
Tao Huang
8d1c43f7b4 video: rockchip: mpp: Turn sub device driver Kconfig option into bool
Only one rk_vcodec ko.

Fixes: 5b15717952 ("video: rockchip: mpp: new video codec driver")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I58408cbee1edf11d29b4917aca2eeaef563ed8ce
2021-09-27 14:35:38 +08:00
Tao Huang
a085c0009e arm64: rockchip_gki.config: All mpp sub config as bool
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I45d9d48bcbf7aedf93d51c1edb4ea4eb4bcaca17
2021-09-27 14:33:06 +08:00
Tao Huang
f9686c89d4 arm64: rockchip_gki.config: Enable CONFIG_SW_SYNC as module
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib00f8f20c47f8b6814d5782ea6d68f7e28b22a4d
2021-09-26 15:48:46 +08:00
Sandy Huang
70e8a5ecc4 dma-buf/sw_sync: build sw-sync as module for gki
Fixes: da8f900b52 ("dma-buf/sw_sync: sw_sync register as misc devices")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: If012d5f85b261690cb172b7b61b98212406f6a3d
2021-09-26 15:46:54 +08:00
Wyon Bi
ff9626ac6c mfd: Drop unused rk610/rk616 driver
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I76c73d0c565b04261a099373c7a9200d6058b8ec
2021-09-26 14:26:14 +08:00
Jon Lin
c35d2e69de arm64: dts: rockchip: rk3588s: Add num-cs property to spi
Change-Id: I62470b378ac631c37debac45001c2ae59ec26377
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-26 14:23:20 +08:00
Jon Lin
7703ddf608 arm64: dts: rockchip: rk3568: Add num-cs property to spi
Change-Id: Ie5986d2995d21cb4bcfddd43ca4866de53b75c66
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-26 14:23:20 +08:00