Commit Graph

1060386 Commits

Author SHA1 Message Date
Wyon Bi
3b0c20212b mfd: Add rk628 mfd driver
Change-Id: Ibf4334f82f91237bff6a04b24bb390391a5c8130
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-10-18 14:59:34 +08:00
Joseph Chen
1df11488e9 mfd: rk808: support power off system in syscore shutdown
For PMIC that power off supplies by write register via i2c bus,
it's better to do power off at syscore shutdown.

Because when run to kernel's "pm_power_off" call, i2c may has
been stopped or PMIC may not be able to get i2c transfer while
there are too many devices are competiting.

This patch effects on PMIC: RK808/RK818/RK816, not including RK805
which power off system by pull up pmic sleep pin in ATF.

The i2c maybe stopped before pm_power_off() is called, which
results in the PMIC power off failure issue.
Moving PMIC power off operation to syscore shutdown is better.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib43827ebd49059719b8899f90a696b6c32a6ddd1
2021-10-18 14:47:06 +08:00
Tao Huang
270d97f40e drm/rockchip: vop2: make vop2_clk_init() static
Fix the following gcc warning:

drivers/gpu/drm/rockchip/rockchip_vop2_clk.c:304:5: warning:
no previous prototype for 'vop2_clk_init' [-Wmissing-prototypes]

Fixes: 95b6a39dab ("drm/rockchip: vop2: Add support for rk3588")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ifc892f473a50a9e408e09648c7a6539ffda24039
2021-10-18 14:13:22 +08:00
Wyon Bi
6d06306c63 drm/rockchip: analogix_dp: Add of-alias id support
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: If7f2a6672c5450e0f2cfdd7c387f7fa045d54ba2
2021-10-18 11:20:58 +08:00
Wyon Bi
7e6860ead0 drm/rockchip: analogix_dp: Use formalized struct definition for grf field
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Iddfa5af6e8bfabb58b312661e3fb267008f27045
2021-10-18 11:20:58 +08:00
Jon Lin
0d9e33dc55 drivers: rkflash: Recheck the cache only the spinand devices in need
The operation of reading back flash cache after programing is not
universal. At present, only ESMT devices are found to have this anomaly.

Change-Id: I3ec21eebc4aa7b8a259129ed2c036e1168553f27
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-15 19:45:14 +08:00
Sandy Huang
4281b208cb drm/rockchip: vop: add BCSH support function
Change-Id: I17bcd5a07b93b3c68aa892606f886bcd3a7673a0
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-10-15 16:45:51 +08:00
Andy Yan
95b6a39dab drm/rockchip: vop2: Add support for rk3588
RK3588 VOP:
4 Video Ports.
4 Cluster Windows.
4 Esmart Windows.

Can drive HDMI/eDP/DP/MIPI/BT1120/BT656 interface.

Support drive HDMI/DP 8k output in splice mode.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I37df329fcab729cd7fa1de47c4d5faf232bb265f
2021-10-15 16:39:03 +08:00
Ding Wei
472cb33488 video: rockchip: mpp: Use spinlock for queue->running_lock
reason: mpp_iommu_handle is called by irq for iommu, thus it cannot
use mutex which might case sleep, thus use spinlock instead.

Call trace:
[   71.047958 ] Call trace:
[   71.047974 ]  dump_backtrace+0x0/0x160
[   71.047988 ]  show_stack+0x14/0x1c
[   71.048003 ]  dump_stack+0xd0/0x120
[   71.048018 ]  ___might_sleep+0x1f4/0x204
[   71.048032 ]  __might_sleep+0x4c/0x80
[   71.048045 ]  __mutex_lock_common+0x60/0x1028
[   71.048057 ]  mutex_lock_nested+0x28/0x30
[   71.048073 ]  mpp_iommu_handle+0x44/0x1c8
[   71.048088 ]  report_iommu_fault+0x3c/0x198
[   71.048102 ]  rk_iommu_irq+0x2a4/0x3bc
[   71.048117 ]  __handle_irq_event_percpu+0x114/0x3c4
[   71.048131 ]  handle_irq_event+0x5c/0xd0
[   71.048143 ]  handle_fasteoi_irq+0x124/0x220
[   71.048156 ]  __handle_domain_irq+0x9c/0xf4
[   71.048169 ]  gic_handle_irq+0x108/0x180
[   71.048181 ]  el1_irq+0xec/0x1a0
[   71.048194 ]  _raw_spin_unlock_irqrestore+0x3c/0x78
[   71.048209 ]  vop2_crtc_atomic_flush+0x1c78/0x202c
[   71.048223 ]  drm_atomic_helper_commit_planes+0x1a4/0x210
[   71.048238 ]  rockchip_atomic_commit_complete+0x1a4/0x390
[   71.048252 ]  rockchip_drm_atomic_commit+0x22c/0x24c
[   71.048266 ]  drm_mode_atomic_ioctl+0xa18/0xddc
[   71.048280 ]  drm_ioctl+0x2d8/0x46c
[   71.048296 ]  do_vfs_ioctl+0x4dc/0x794
[   71.048308 ]  __arm64_sys_ioctl+0x70/0x98
[   71.048322 ]  el0_svc_common+0xa0/0x18c
[   71.048335 ]  el0_svc_handler+0x28/0x60
[   71.048348 ]  el0_svc+0x8/0xc

Change-Id: Ie8e79995ec4bebf4ccbb509a57306541de861754
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-10-15 15:50:06 +08:00
Algea Cao
7fbb80db46 drm/rockchip: dw_hdmi: Allow rk3399 hdmi output yuv420
Fixes: 4035588f0f ("drm/rockchip: dw-hdmi: Add ycbcr_420_allowed to hdmi plat data")
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: If88f499ff15ba599e6749eb94d86ba9b2c234b48
2021-10-14 18:48:43 +08:00
Yakir Yang
1ac95182fa arm64: dts: rockchip: add HDMI DDC pinctrl for RK3399 HDMI
Default to enable the HDMI DDC internal module.

Change-Id: I14e4e3f0b5abb37eb0bb4451e2fcf48bceb3e3b2
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
2021-10-14 18:46:13 +08:00
Guochun Huang
b4a8234b53 drm/bridge: dw-mipi-dsi: make video and cmd mode option
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I6be01c00ddfd10d49aef3f44cb07406f679007ad
2021-10-14 15:40:39 +08:00
Jon Lin
4f59a48ae3 spi: rockchip_sfc: Select ROCKCHIP_MTD_VENDOR_STORAGE
Enable the corresponding vendor driver

Change-Id: Ica177c2d3abc92c560c4c86b9a6f23cffc85e6c1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-10-14 15:40:04 +08:00
Wu Liang feng
cf58b928de usb: dwc3: fix PM resume error for rockchip platforms
We enable PM runtime auto suspend on rockchip platforms
(e.g. RK3399), it allows the DWC3 controller to enter
runtime suspend if usb cable detached. So if the dwc3
is already in PM runtime suspend, we don't need to do
anything in dwc3_suspend() and dwc3_resume() which
duplicated the same operations as dwc3_runtime_suspend()
and dwc3_runtime_resume().

This patch can help to avoid kernel panic if accessing
the DWC3 registers in dwc3_resume() when the DWC3 is in
PM runtime suspend and it's power domain is power off.

Kernel panic - not syncing: Asynchronous SError Interrupt
CPU: 1 PID: 707 Comm: Binder:236_2 Not tainted 5.10.43 #270
Hardware name: Rockchip RK3566 RK817 TABLET LP4X Board (DT)
Call trace:
 dump_backtrace+0x0/0x1c0
 show_stack+0x18/0x24
 dump_stack_lvl+0xc8/0x104
 dump_stack+0x18/0x5c
 panic+0x14c/0x390
 test_taint+0x0/0x30
 arm64_serror_panic+0x74/0x80
 do_serror+0xd8/0xf8
 el1_error+0x94/0x118
 el1_abort+0x3c/0x60
 el1_sync_handler+0x48/0x84
 el1_sync+0x8c/0x140
 dwc3_phy_setup+0x24/0x50c
 dwc3_core_init+0x50/0xf40
 dwc3_core_init_for_resume+0x64/0x274
 dwc3_resume_common+0x3c/0x274
 dwc3_resume+0x28/0x64
 dpm_resume+0x134/0x568

Change-Id: I63e734f51b05274251d8a88a664eee768568eb7b
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
2021-10-14 15:34:12 +08:00
Marian-Cristian Rotariu
1257643ab1 UPSTREAM: usb: dwc3: ep0: fix NULL pointer exception
There is no validation of the index from dwc3_wIndex_to_dep() and we might
be referring a non-existing ep and trigger a NULL pointer exception. In
certain configurations we might use fewer eps and the index might wrongly
indicate a larger ep index than existing.

By adding this validation from the patch we can actually report a wrong
index back to the caller.

In our usecase we are using a composite device on an older kernel, but
upstream might use this fix also. Unfortunately, I cannot describe the
hardware for others to reproduce the issue as it is a proprietary
implementation.

[   82.958261] Unable to handle kernel NULL pointer dereference at virtual address 00000000000000a4
[   82.966891] Mem abort info:
[   82.969663]   ESR = 0x96000006
[   82.972703]   Exception class = DABT (current EL), IL = 32 bits
[   82.978603]   SET = 0, FnV = 0
[   82.981642]   EA = 0, S1PTW = 0
[   82.984765] Data abort info:
[   82.987631]   ISV = 0, ISS = 0x00000006
[   82.991449]   CM = 0, WnR = 0
[   82.994409] user pgtable: 4k pages, 39-bit VAs, pgdp = 00000000c6210ccc
[   83.000999] [00000000000000a4] pgd=0000000053aa5003, pud=0000000053aa5003, pmd=0000000000000000
[   83.009685] Internal error: Oops: 96000006 [#1] PREEMPT SMP
[   83.026433] Process irq/62-dwc3 (pid: 303, stack limit = 0x000000003985154c)
[   83.033470] CPU: 0 PID: 303 Comm: irq/62-dwc3 Not tainted 4.19.124 #1
[   83.044836] pstate: 60000085 (nZCv daIf -PAN -UAO)
[   83.049628] pc : dwc3_ep0_handle_feature+0x414/0x43c
[   83.054558] lr : dwc3_ep0_interrupt+0x3b4/0xc94

...

[   83.141788] Call trace:
[   83.144227]  dwc3_ep0_handle_feature+0x414/0x43c
[   83.148823]  dwc3_ep0_interrupt+0x3b4/0xc94
[   83.181546] ---[ end trace aac6b5267d84c32f ]---

Change-Id: Iad43f5d46dfd81cabac976f7a65410ecc8a4fcd4
Signed-off-by: Marian-Cristian Rotariu <marian.c.rotariu@gmail.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210608162650.58426-1-marian.c.rotariu@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit d00889080a)
2021-10-14 15:34:12 +08:00
Zefa Chen
2dd7f5f53f media: rockchip: cif fix issue for CONFIG_ROCKCHIP_IOMMU=n
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6914ac32bcef7c56eabe6bef9b9acce68615cbc7
2021-10-14 11:02:24 +08:00
Yiqing Zeng
8164b072b3 media: rockchip: cif: fix pm runtime error
at a high frame rate (120fps), the fast switch test has a higher probability of the following errors:
Failed to get runtime pm, -22

Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I6d9fdd86cc69368ba340ab7e43d2b6030a72ce8c
2021-10-14 11:02:17 +08:00
Zefa Chen
816f07cba2 media: rockchip: when cif triggers a reset, redefine the timer after reset
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3dd12ba2d5f1a6d5a4f77e70b756aba9eaaea98f
2021-10-14 11:02:12 +08:00
Zefa Chen
c3cf62a20e media: rockchip: cif optimized buf rotation
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2e188e2709e20a31eb060ee752de31653eab99df
2021-10-14 10:57:44 +08:00
Zefa Chen
f1de907051 media: rockchip: cif: mipi csi2 do cru reset when stop
to avoid interruption signal after stop

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1a4e896c38a9c24b6d3d4ded93aaa5b75800c68d
2021-10-14 10:57:40 +08:00
Zefa Chen
9021727915 media: rockchip: cif fixed frame sequence bug in HDR mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6d1837bb6dd4ae2cbae397fb3a4cce404e5d3909
2021-10-14 10:23:48 +08:00
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