Commit Graph

1268216 Commits

Author SHA1 Message Date
Tao Huang
2e03e48e70 Merge commit 'd12fe16c94d5f2d41dec9a0beb5858243f35c85b'
* commit 'd12fe16c94d5f2d41dec9a0beb5858243f35c85b':
  clk: rockchip: px30: Make usb480m critical

Change-Id: Ieeb8eae19bfdab2dc6c259d38fe85959158114fa
2024-02-01 19:18:12 +08:00
Finley Xiao
d12fe16c94 clk: rockchip: px30: Make usb480m critical
Gpu 480M is from usb480m and the source clocks should be always on
if change gpu frequency after power off pd.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I1e02ca7d0408a42f65240cf0b33d11eaeb6f85b6
2024-02-01 16:51:59 +08:00
Tao Huang
62e90871a6 Merge commit '0d60f4f738ffc4b8241f4c71da0d03fda912f4d4'
* commit '0d60f4f738ffc4b8241f4c71da0d03fda912f4d4':
  media: rockchip: isp: fix isp32 mp buf cfg
  arm64: configs: add rk3308_rkpartybox.config

Change-Id: Ibfe3f181b22091c149fdb52735580a976ee9eb6d
2024-01-31 21:16:21 +08:00
Tao Huang
3acf95f328 Merge commit '28a7162d4726172747c41b2ec3b4c1b56434c41a'
* commit '28a7162d4726172747c41b2ec3b4c1b56434c41a':
  media: i2c: add sc831ai sensor driver

Change-Id: Iea914834d1e7a82b5b2b51f92e12d24118b7000d
2024-01-31 21:15:31 +08:00
Tao Huang
8180c92742 Merge commit '8ed148210d8d1d793f79093dbbbdcc87c2479179'
Merge made by the 'ours' strategy.

* commit '8ed148210d8d1d793f79093dbbbdcc87c2479179':
  drm/rockchip: lvds: register sub dev at rockchip lvds driver

Change-Id: Iedeb7bed05315b5c9c6472c166706cf41209f9c3
2024-01-31 21:13:16 +08:00
Cai YiWei
0d60f4f738 media: rockchip: isp: fix isp32 mp buf cfg
fix commit e601ffeb04 ("media: rockchip: isp: dvbm buf support from rockit")

Change-Id: I0ff6f7842cd7ac4dc75245bf72866d94f106f34c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-01-31 16:12:04 +08:00
Sandy Huang
801a58d3ae drm/rockchip: lvds: register sub dev at rockchip lvds driver
At lvds to other display output type product, the connector maybe
register at third party drivers, the sub dev register often be forgot,
so we add sub dev register at rockchip lvds driver.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: If075041df8ddb1b269c903d092a6263160eff1db
2024-01-30 19:34:09 +08:00
Tao Huang
78d7ac797f Merge commit '1ebaed6daf591978a341b8eeff4788b3d6dc6230'
* commit '1ebaed6daf591978a341b8eeff4788b3d6dc6230':
  drm/rockchip: rgb: register sub dev at rockchip rgb driver
  soc: rockchip: power-domain: Update gate mask for rk3562
  arm64: dts: rockchip: rk3588-vehicle-evb: add spi codec reset gpio
  drm/rockchip: vop2: clearly point out the plane unsupported format modifier
  arm64: dts: rockchip: rk3588-vehicle-evb: fix image reverse mipi_csi node
  arm64: dts: rockchip: rk3562-evb: fix image reverse mipi_csi node
  video: rockchip: vehicle: fix bugs of cif get csi_fmt_val
  ARM: rockchip: rv1106: sleep: use rtc as 32k source
  ARM: rockchip: rv1106_pm: improve the accuracy of recovering hptimer
  soc: rockchip: pm_config: initialize sleep_config to 0
  rtc: rockchip: support rtc suspend bypass
  drm/rockchip: vop2: dump encdoer name in summary info

Change-Id: I7f0c0e546b6a32febdcf8370f84ee9d6f9b92933
2024-01-30 19:19:02 +08:00
Xiao Ya peng
68e806406c arm64: configs: add rk3308_rkpartybox.config
Change-Id: I99a98e338466abfaf98e80b52b36f4772676d420
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
2024-01-30 19:03:50 +08:00
Lan Honglin
28a7162d47 media: i2c: add sc831ai sensor driver
Change-Id: Ia2ceeb8fcc7f15f9b610583714e3dc03b5e3c8ce
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
2024-01-30 19:02:08 +08:00
Sandy Huang
8ed148210d drm/rockchip: lvds: register sub dev at rockchip lvds driver
At lvds to other display output type product, the connector maybe
register at third party drivers, the sub dev register often be forgot, so we add
sub dev register at rockchip lvds driver.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: If075041df8ddb1b269c903d092a6263160eff1db
2024-01-30 18:53:01 +08:00
Sandy Huang
1ebaed6daf drm/rockchip: rgb: register sub dev at rockchip rgb driver
At rgb to other display output type product, the connector maybe register at
third party drivers, the sub dev register often be forgot, so we add sub
dev register at rockchip rgb driver.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I3baa051712ac30b63dffa9658df470c12bcb91dc
2024-01-30 18:52:53 +08:00
Finley Xiao
91ce62dbce soc: rockchip: power-domain: Update gate mask for rk3562
The vepu biu clk depends on vi biu clk, add vi gate mask for pd vepu.
The rga biu clk depends on vo biu clk, add vo gate mask for pd rga.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ieaa62a053369e570eb0a11d132fa472c6bd246f4
2024-01-30 18:41:30 +08:00
Jun Zeng
17a33dcac2 arm64: dts: rockchip: rk3588-vehicle-evb: add spi codec reset gpio
Change-Id: Ib6d9fbebe978a3393fa42d1d4d441fa1bbb9f599
Signed-off-by: Jun Zeng <jun.zeng@rock-chips.com>
2024-01-30 18:37:32 +08:00
Sandy Huang
3bc6e98dcc drm/rockchip: vop2: clearly point out the plane unsupported format modifier
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I2d247f6ae1f63225629dfc6641bce5525cfb8b20
2024-01-30 18:36:39 +08:00
Jianwei Fan
192370b955 arm64: dts: rockchip: rk3588-vehicle-evb: fix image reverse mipi_csi node
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Ie14481f72268d0e91446cb489003503713c28e14
2024-01-30 18:35:23 +08:00
Jianwei Fan
e4bcfb45de arm64: dts: rockchip: rk3562-evb: fix image reverse mipi_csi node
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I5364d50a99b4388b34631f6a3c43565c6878522c
2024-01-30 18:34:54 +08:00
Jianwei Fan
5f64a92db2 video: rockchip: vehicle: fix bugs of cif get csi_fmt_val
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I802fc6a48a2a2177c919f1a09223136e26834c8c
2024-01-30 18:34:25 +08:00
XiaoDong Huang
6685f6f7f9 ARM: rockchip: rv1106: sleep: use rtc as 32k source
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I32db2b499f4eabfee1acb2b8a7feb0d85e10456b
2024-01-30 18:31:42 +08:00
XiaoDong Huang
21f57eaf2d ARM: rockchip: rv1106_pm: improve the accuracy of recovering hptimer
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I5ccc5f5fba0f7696fc2c0563ed715b78b5adf451
2024-01-30 18:31:42 +08:00
XiaoDong Huang
0196404b4f soc: rockchip: pm_config: initialize sleep_config to 0
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I95697411f67492f1e83f07010248f4cab487d6ed
2024-01-30 18:31:42 +08:00
Elaine Zhang
f45da24df9 rtc: rockchip: support rtc suspend bypass
If rtc 32k used as time for deep sleep, the rtc suspend
func bypass do nothing.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I020182bd06ee68da387a141eb55a86f6bb3a0c5b
2024-01-30 18:31:42 +08:00
Ye Zhang
7133e80b3c Mali: midgard: Add support for static power consumption calculation
Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com>
Change-Id: Ic5685241bd7dbe7b5869a623ce25640af7017840
2024-01-30 17:45:35 +08:00
Ye Zhang
084acd7ca3 arm64: dts: rockchip: rk3399: Add dynamic-power-coefficient property for gpu
Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com>
Change-Id: I2b7a70c05b2426b0bab1a67adef8c186bb26f3ab
2024-01-30 17:45:26 +08:00
Simon Xue
77fc3bec80 debugfs: cma: fix bitmap_hex
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Change-Id: I6193bcd72a4761b2e30bb8445c0e7ed1ffe00bf6
2024-01-30 17:41:19 +08:00
Elaine Zhang
c99648df60 clk: rockchip: add new pll type pll_rk3588_ddr
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ia38a7b5d95a9d5b4c4f27c1adaa310ba4308afbd
2024-01-30 17:40:33 +08:00
Zhen Chen
096f12b891 Mali: midgard: replace add_mm_counter() with kbasep_add_mm_counter()
The purpose is to eliminate direct references to add_mm_counter().
add_mm_counter() makes use of mm_trace_rss_stat().
While, Android 14.0 GKI prohibits driver modules from referencing mm_trace_rss_stat().

The implementation of kbasep_add_mm_counter() here is derived from bifrost DDK g21.

Change-Id: I619e4ecb164e87dcab8f101bae179f316d57360c
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2024-01-30 16:07:46 +08:00
Tao Huang
a89c2337a6 Merge commit '0b97d73d8e712e12e7fdea55e59bc0a21bf50b4c'
* commit '0b97d73d8e712e12e7fdea55e59bc0a21bf50b4c':
  video: rockchip: rga3: fix the wrong check of resolution in RGA3 rotating
  video: rockchip: rga3: Add debug log when assign cores
  media: rockchip: isp: dvbm buf support from rockit
  media: rockchip: isp: support multiple wrap
  media: rockchip: isp: fix isp stop to read stats buf
  ASoC: rockchip: trcm: Fix sleeping function called in atomic context
  ARM: dts: rockchip: Add core dtsi for RV1106G3

Change-Id: I699210591b363274d44466b9f34f45bae6a38eab
2024-01-30 11:46:56 +08:00
Tao Huang
59a0fc31ee Merge commit '5ffae8fffc291148e0b2472aaaa8ef7eb4959cba'
Merge made by the 'ours' strategy.

* commit '5ffae8fffc291148e0b2472aaaa8ef7eb4959cba': (29 commits)
  FROMGIT: PM / devfreq: Synchronize devfreq_monitor_[start/stop]
  UPSTREAM: dm verity: don't perform FEC for failed readahead IO
  UPSTREAM: netfilter: nft_set_pipapo: skip inactive elements during set walk
  UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
  UPSTREAM: x86/sev: Check for user-space IOIO pointing to kernel space
  UPSTREAM: x86/sev: Check IOBM for IOIO exceptions from user-space
  UPSTREAM: nvmet-tcp: Fix a possible UAF in queue intialization setup
  FROMLIST: binder: fix memory leaks of spam and pending work
  ANDROID: Snapshot Mainline's version of checkpatch.pl
  ANDROID: scsi: ufs: vendor check response and recovery addition
  ANDROID: scsi: ufs: add perf heuristic design
  ANDROID: ABI: Update symbol list for Mediatek
  ANDROID: Add vendor hook for ufs perf heuristic and error recovery
  UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid
  UPSTREAM: ufs: core: wlun send SSU timeout recovery
  ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override
  ANDROID: fix up rpmsg_device ABI break
  ANDROID: fix up platform_device ABI break
  UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
  UPSTREAM: rpmsg: glink: Release driver_override
  ...

Change-Id: I6a5428ef1851cf6ecd279791f92aed786ee96b38
2024-01-30 11:46:00 +08:00
Tao Huang
3c05736aa3 Merge commit '3d9e7100637001159451fc7421209106987fe1d0'
* commit '3d9e7100637001159451fc7421209106987fe1d0':
  mtd: spinand: Winbond: Support new device W25N01JWZEIG
  media: i2c: sc4336 adapt sleep_wakeup
  media: rockchip: vicap fixes the probability of stream data loss after tool nodes capture raw data

Change-Id: I9541ed8bacbd39618a7395ed5240b344adceabf0
2024-01-30 11:44:36 +08:00
Tao Huang
b6fc67c82d Merge commit '55370d45a76aad0f446163ae1ef528015bd1b136'
Merge made by the 'ours' strategy.

* commit '55370d45a76aad0f446163ae1ef528015bd1b136':
  media: rockchip: isp: add rkisp_buf_dbg

Change-Id: I5fae9385d6ee41a03423a5e5a2102e7ac1af86d0
2024-01-30 11:44:20 +08:00
Cai YiWei
4f8051bc47 media: rockchip: isp: add rkisp_buf_dbg
buf queue to set u64 data and buf done to check it.

Change-Id: If8e2e1d2b2f782a84dbbfb08b70c497ad23fec4b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-01-30 11:40:15 +08:00
Tao Huang
113391d880 Merge commit '14646892b75b969eefd1e0afbfa0c88ed4f31e9c'
* commit '14646892b75b969eefd1e0afbfa0c88ed4f31e9c':
  media: rockchip: isp: fix isp32 buf no update to hw
  media: rockchip: isp: fix isp stop to enable isp ctrl

Change-Id: I9ac03f5d0a2f6c89473bbf82df4207fdc1dc679e
2024-01-30 11:37:40 +08:00
Zhang Yubing
517ffd6317 drm/rockchip: vop2: dump encdoer name in summary info
In most rockchip display interface driver, only one connector
attach to a encoder. it can be sured which econder is used
by the connector name.

For DP MST, a DP MST connector will attach to many DP MST
encoders, and more than one DP MST connector can attach
to a DP MST encoder. A DP MST encoder's possible crtc can
also more than one. So in this case, which DP MST encoder
is used can't be get by the crct name or connector name.
A encoder name is necessary for DP MST encoder.

Change-Id: I57026b25d63cde8f72a6e34dc56e073559659821
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2024-01-30 10:46:37 +08:00
Yu Qiaowei
0b97d73d8e video: rockchip: rga3: fix the wrong check of resolution in RGA3 rotating
Change-Id: If135f3cbb80f30e0a7de18ce293b188318603fde
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2024-01-30 10:13:23 +08:00
Yu Qiaowei
14e857ea06 video: rockchip: rga3: Add debug log when assign cores
Change-Id: I9e601fa14da96224acb68ced88ac4580b32b6822
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2024-01-30 10:13:23 +08:00
Cai YiWei
e601ffeb04 media: rockchip: isp: dvbm buf support from rockit
Change-Id: Icacd6c500b8e21830c0b44914e2d742f42e8cf75
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-01-30 10:10:00 +08:00
Cai YiWei
dd09e02ea1 media: rockchip: isp: support multiple wrap
Change-Id: Ic0388b6ff7595799164d1872c1303da4107397f2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-01-30 10:10:00 +08:00
Cai YiWei
b84a03e24e media: rockchip: isp: fix isp stop to read stats buf
Change-Id: Ieea391acda2ae44dfa0b26d063a057aec7162521
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-01-30 10:10:00 +08:00
Sugar Zhang
bc09999632 ASoC: rockchip: trcm: Fix sleeping function called in atomic context
BUG: sleeping function called from invalid context at include/linux/dmaengine.h:1158
in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 824, name: HwBinder:714_2
CPU: 3 PID: 824 Comm: HwBinder:714_2 Tainted: G        W         5.10.198 #1023
Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
Call trace:
 dump_backtrace+0x0/0x1dc
 show_stack+0x18/0x24
 dump_stack_lvl+0xe4/0x12c
 dump_stack+0x18/0x3c
 ___might_sleep+0x110/0x120
 __might_sleep+0x50/0x88
 dmaengine_trcm_trigger+0x9c/0x2c4
 snd_soc_pcm_component_trigger+0x70/0xd8
 soc_pcm_trigger+0x90/0xb0
 snd_pcm_stop+0xa0/0x140
 snd_pcm_release_substream+0x8c/0x194
 snd_pcm_release+0x40/0xa0
 __fput+0xf0/0x260
 ____fput+0x10/0x1c
 task_work_run+0x98/0xf8
 do_notify_resume+0x120/0x21c
 work_pending+0xc/0x730

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I368e3497287f497c7838c18ac28a967a802dd49b
2024-01-30 10:06:37 +08:00
Sandy Huang
b3906054ef drm/rockchip: drv: use color_encoding and color_range instead of private COLOR_SPACE
The old method to description color space and range is borrowing V4L2
defined, It's difficult to understand, so we change to DRM defined
property.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I7eacc60dfda912b9becae1ce026cdb82eebef7f8
2024-01-29 11:32:19 +08:00
yuyz
d15d637348 ARM: dts: rockchip: Add core dtsi for RV1106G3
Signed-off-by: yuyz <yuyz@rock-chips.com>
Change-Id: Ic6d78f2abb6cb73ecbf4045250aa235e49e267da
2024-01-29 11:29:42 +08:00
Tao Huang
5ffae8fffc Merge tag 'ASB-2024-01-05_12-5.10' of https://android.googlesource.com/kernel/common
https://source.android.com/docs/security/bulletin/2024-01-01

* tag 'ASB-2024-01-05_12-5.10': (29 commits)
  FROMGIT: PM / devfreq: Synchronize devfreq_monitor_[start/stop]
  UPSTREAM: dm verity: don't perform FEC for failed readahead IO
  UPSTREAM: netfilter: nft_set_pipapo: skip inactive elements during set walk
  UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
  UPSTREAM: x86/sev: Check for user-space IOIO pointing to kernel space
  UPSTREAM: x86/sev: Check IOBM for IOIO exceptions from user-space
  UPSTREAM: nvmet-tcp: Fix a possible UAF in queue intialization setup
  FROMLIST: binder: fix memory leaks of spam and pending work
  ANDROID: Snapshot Mainline's version of checkpatch.pl
  ANDROID: scsi: ufs: vendor check response and recovery addition
  ANDROID: scsi: ufs: add perf heuristic design
  ANDROID: ABI: Update symbol list for Mediatek
  ANDROID: Add vendor hook for ufs perf heuristic and error recovery
  UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid
  UPSTREAM: ufs: core: wlun send SSU timeout recovery
  ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override
  ANDROID: fix up rpmsg_device ABI break
  ANDROID: fix up platform_device ABI break
  UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
  UPSTREAM: rpmsg: glink: Release driver_override
  ...

Change-Id: I758558dcd135c3ed787c59b0a62a909c66016d80
2024-01-29 09:02:09 +08:00
Jon Lin
3d9e710063 mtd: spinand: Winbond: Support new device W25N01JWZEIG
Change-Id: I90b594403dbd71883da66f6e485959b48b505bda
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-01-26 18:00:36 +08:00
Lan Honglin
60a950bb3e media: i2c: sc4336 adapt sleep_wakeup
Change-Id: Ibf1b67d775b7546e74def818b0a0867251134444
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
2024-01-26 17:10:06 +08:00
Zefa Chen
cbbff875b4 media: rockchip: vicap fixes the probability of stream data loss after tool nodes capture raw data
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I80cc848151e329400db1bc6a89ef54083f11a937
2024-01-26 17:04:07 +08:00
Cai YiWei
55370d45a7 media: rockchip: isp: add rkisp_buf_dbg
buf queue to set u64 data and buf done to check it.

Change-Id: If8e2e1d2b2f782a84dbbfb08b70c497ad23fec4b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-01-26 17:01:56 +08:00
Cai YiWei
14646892b7 media: rockchip: isp: fix isp32 buf no update to hw
fix commit ea5b7f59a7 ("media: rockchip: isp: frame start to check and config next buf")

Change-Id: I166a5030ea4e9b666f7a0ceb6f2c4379e077bb36
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-01-26 17:01:56 +08:00
Cai YiWei
0975048a23 media: rockchip: isp: fix isp stop to enable isp ctrl
Change-Id: I818e4a1fe1297d522a5da0b8613cd37eb18ef840
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-01-26 17:01:56 +08:00
Tao Huang
2a9c1e1a64 Merge commit 'ef84fb2dc967e18e44e13c42e2ea3e85d8d7f2a0'
* commit 'ef84fb2dc967e18e44e13c42e2ea3e85d8d7f2a0':
  UPSTREAM: sched/fair: Use all little CPUs for CPU-bound workloads
  drm/rockchip: vop2: remove ARGB2101010 support from VOP2
  drm/rockchip: vop2: hdisplay must roundup 2/4 when calc pre_scan_dly
  media: rockchip: vicap get_channel_info add param of field to cover value from get_fmt
  media: i2c: rk628: add hdmirxphy debugfs
  media: rockchip: vicap increase wake up cnt for rv1126/rk3568 monitor mode
  media: i2c: maxim: remote: record the status of the serializer
  misc: rk628: Fix `warning: `rk628_pin_iomux_groups` defined but not used`
  misc: rk628: Fix the NULL in .suspend/.resume helper when working on hdmi tx mode.
  arm64: dts: rockchip: add pd_perihp support for rk3399 usb2

Change-Id: I74e34fdd098bb791609848cb634c204bc2b501cb
2024-01-25 20:31:06 +08:00