Commit Graph

1060661 Commits

Author SHA1 Message Date
Cai YiWei
7faaa53254 media: rockchip: isp: add cmsk config for isp30
Change-Id: Iad86abb3127973b3ac3d8f743f27ffe49466f3ee
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-10 21:14:00 +08:00
York Zheng
a46235c40e arm64: dts: rockchip: rk3588s evb4: modify hym8563 int pin
Signed-off-by: York Zheng <zyk@rock-chips.com>
Change-Id: Ifeb703c10f3374aa847983dac0ef6082811ef8c8
2021-11-10 17:49:00 +08:00
Shawn Lin
15279b0a44 mmc: dw_mmc-rockchip: Fix corner cases of tuning
We should avoid rolling the phases if 270 and 0 is both
fine in tuning. Otherwise it would chose a middle phase
laid later than 270 which isn't a good.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Fixes: 8d0e882790 ("mmc: dw_mmc-rockchip: Skip all phases bigger than 270 degrees")
Change-Id: I87bd3e957623d6a5fdf38226be65564e353b01b6
2021-11-10 17:00:31 +08:00
Shawn Lin
3f26edfb23 mmc: dw_mmc-rockchip: Restore slot's clock if it's updated
slot's clock is cached before calling ->set_ios for sub-driver.
If the clock is updated by sub-driver, it's better to restore
the cached slot's clock. Or we can see a unexpected clock as the
driver didn't know the slot's clock is updated and still use the
old clock to calculate divider. So we may see a lower clock. It
theory, it's won't be a problem because any rate lower than 400k
should be fine, and we even didn't start issuing any command during
the lower clock. But still it's right to update slot's clock to reflect
the correct clock and may fix some potential unknown problems.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I06581320547bb06c306da57e141d06f9206ea585
2021-11-10 17:00:31 +08:00
York Zheng
ca8c7fcedd arm64: dts: rockchip: rk3588s evb4: modify pwm config for backlight
Signed-off-by: York Zheng <zyk@rock-chips.com>
Change-Id: I4a4911f93e447d4aef5c83670c9eb0c4c8f79fc2
2021-11-10 16:59:08 +08:00
Alex Zhao
4bfa8f90b5 net: rfkill: add wifi and bt driver
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I1d399641587124d2291b5b49e5538e7e490a843a
2021-11-10 16:11:47 +08:00
Tao Huang
c0d53bb51b arm64: rockchip_gki.config: Enable CONFIG_RFKILL_RK
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I58f0f461c4aee4c0ee52ff0c41ad1273a4f33eff
2021-11-10 16:11:47 +08:00
Tao Huang
f6019fde40 arm64: rockchip_defconfig: Enable CONFIG_RFKILL_RK
default y on 4.19.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2fb7ee043876d49fe7e04bcd838a930e699ff3e1
2021-11-10 16:11:47 +08:00
Zhen Chen
4520fd6283 arm64: dts: rockchip: rk3588s: add GPU dts node
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: Ifc8a1a95f5f0fd69e8a3013bb1c7f0deafd2133e
2021-11-10 16:05:08 +08:00
Finley Xiao
a29de32cbd arm64: dts: rockchip: rk3588-evb: Add supply regulators for cpu
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ibc20902abe90a3d5c25f3fc4cb3be180e860403c
2021-11-10 15:18:51 +08:00
Finley Xiao
ff06dedbc1 arm64: dts: rockchip: rk806: Add labels for mem regulator
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ie2fc66b387b05d00a5570de76a5832cf7aab96f1
2021-11-10 15:18:33 +08:00
Andy Yan
4001b028fd arm64: dts: rockchip: Assign plane-mask for rk3588&rk3588s evb
This is a 8K(vp0+vp1) + 4K(vp2) + 2K(vp3) plane-mask.
This will be used before u-boot logo is ready.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ibbac678ec0e1023073e8d44854990bf6027118b3
2021-11-10 14:57:32 +08:00
Elaine Zhang
71aa5ad918 clk: rockchip: clk link use clk_pm_runtime
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ib29c9f91947d9c7940e18cfec8341444c2bc5bf3
2021-11-10 14:49:20 +08:00
Zhen Chen
44a562051e MALI: bifrost: enlarge BASE_MAX_NR_CLOCKS_REGULATORS to 3
rk3588 actually has 3 clocks and 2 regulators to manage.

Change-Id: Ie0322fcce0f020fed7e51008e6fba34fe1350f49
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2021-11-10 14:39:48 +08:00
shengfei Xu
85cb498d78 arm64: dts: rockchip: rk3588s: fix the pinctrl for spi2
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I8956362ef9bac016cb61f0d86d0dea9ad625a2bc
2021-11-10 10:38:54 +08:00
Shawn Lin
5e6eb66674 PCI: rockchip: dw: Restore DBI COMMAND register
It isn't sticky when link goes down for whatever reason.
If devices want to reset the modules by puting link into D3
state or whatever, we should restore it the. Otherwise devices
cannot access RC's resource even if the link is recovered.

Change-Id: Ie5b5a0b7f6ab03961658b4217c9db2cada0edb93
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-09 18:54:07 +08:00
Jon Lin
2e21c589a5 r8169: add new device ID support
It's found a new r8169 ethernet card with a device ID of
0x0000 read from its config header which wasn't in the
ID tables of r8169. Add it in order to probe this card.

Change-Id: I27c542a10cc571a6e1a4e7a8af62ce560b8b1fc4
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-11-09 18:44:02 +08:00
Tao Huang
06540af0a9 arm64: dts: rockchip: rk3588-android: Enable clk/pd always_on
Debug only.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iafaa335e9cbb68ed03ab97d59d740068224bf27c
2021-11-09 18:34:21 +08:00
Algea Cao
4bfe307edf drm/rockchip: dw_hdmi: Add next hdr sink data property
Add property to transfer next hdr sink data to userspace.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I926ec6553bdb0b1730a7ca578f46f36926860ebd
2021-11-09 18:32:27 +08:00
Algea Cao
31d7cfd41e drm/rockchip: drv: Parse edid next hdr info in rockchip driver
To be compatible with GKI, we parse the edid next hdr information
in rockchup-drm driver.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Id6fd8f2d8429b07472c6562c223ae84262952e8d
2021-11-09 18:32:27 +08:00
Algea Cao
60d1c80f6b drm/rockchip: dw_hdmi: Add get edid dsc info interface
To support the rk3588 dsc function, add get edid dsc
info interface.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I33cc4b60183484e7cd15b519cec4c32d7be53deb
2021-11-09 18:32:27 +08:00
Algea Cao
0c087e3910 drm/rockchip: drv: Parse edid dsc info in rockchip driver
To be compatible with GKI, we parse the edid dsc information
in rockchup-drm driver.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I2f2cc9e9fe8578865975e1631450dbbc723ce08e
2021-11-09 18:32:27 +08:00
Algea Cao
e766169b1d arm64: dts: rockchip: Enable rk3588s/rk3588 evb hdmitx
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I38ad6b202cb3455e7d06247f08ea74317f6d93d0
2021-11-09 17:49:11 +08:00
Algea Cao
2f860f2e07 arm64: dts: rockchip: rk3588: Add hdmi1 node
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I4b767b88444641f75d3ed5a676524a8930c0bda9
2021-11-09 17:45:53 +08:00
Algea Cao
cbeddf3300 arm64: dts: rockchip: rk3588s: Add hdmi0 node
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Icd526df71c979fb517484294784bdcc6321db746
2021-11-09 17:43:32 +08:00
Algea Cao
a791135553 arm64: dts: rockchip: Enable rk3588s/rk3588 evb vop
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ie4f47461f3c135a21da17f2af5fda7df4dc0d91f
2021-11-09 17:43:04 +08:00
Andy Yan
5f5b655409 drm/rockchip: vop2: Forbid X Mirror in splice mode
Rotate90/270 and X Mirror are unsupported.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I1656f602a20a38074b2777b349b7d77f1c7316b6
2021-11-09 17:25:03 +08:00
Andy Yan
03b6bb941d drm/rockchip: vop2: No need to check act_width on rk3588
VOP has a limitation of act_width on rk3568:

(1) The act_width should align as 4 pixel at afbc mode
(2) can't handle a act_width % 16 = 1

VOP on rk3588 has no such limitation.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I56f2ff32ac384bff81b6b911cd10ef599e5f44c3
2021-11-09 17:24:30 +08:00
Andy Yan
fd1e752b58 drm/rockchip: vop2: Check for YUV2RGB for writeback
YUV2RGB is not supported by wb.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ib0ed42029522b3a16ea2fc09c7f2ca09ad4e121e
2021-11-09 17:23:40 +08:00
Andy Yan
ad5e232220 drm/rockchip: vop2: Enable mipi dual channel mode
We should set both VP->DUAL_CHANNEL_CTRL.dual_channel_en
and DSP_INTERFACE_EN.mipi_dual_channel_en when drive
a dual channel mipi dsi on rk3588, this is different
from rk356x.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I784f9556903126bae52b3063eb23fbf0a0193739
2021-11-09 17:23:04 +08:00
Jianqun Xu
675ff1b10a arm64: dts: rockchip: rk3588/rk3588s: fix pinctrl
Change-Id: I8291c7c89c1aa2a530536ddcbb349ea540ee7296
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-11-09 17:21:05 +08:00
Finley Xiao
66ddcf3103 arm64: dts: rockchip: rk3588s: Add clocks for cpu
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Id9a1bfac2c1c8033afd378b429eb95dc62a0fb8e
2021-11-09 17:19:59 +08:00
Huibin Hong
b60fc71441 arm64: dts: rockchip: fix uart2 console configuration on rk3588-linux.dtsi
1. Set earlycon base address 0xfeb50000
2. Set fiq_debugger interrupts id 423

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Ia875782dd417b3d2202794293eb76bf0b59e5b13
2021-11-09 16:43:17 +08:00
Huibin Hong
6b993d226c arm64: dts: rockchip: fix uart2 console configuration on rk3588-android.dtsi
1. Set earlycon base address 0xfeb50000
2. Set fiq_debugger interrupts id 423

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I4069d5ec5e6633c903a5e84f099c982d87c4ca36
2021-11-09 16:43:17 +08:00
Sandy Huang
91142983e6 drm/rockchip: debugfs: fix dump yuv format size error
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ibec7e083c38d2b8d151f285848133e7e72310095
2021-11-09 16:20:40 +08:00
Elaine Zhang
9fd1dbb405 clk: gate: add clk_always_on for debug
use:
bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 clk_gate.always_on=y";

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Iff38f71b31bf1de4b5e18bdaefd695d60cd2e124
2021-11-09 14:23:08 +08:00
Andy Yan
cddd9bf436 drm/rockchip: vop2: Add check for two win mode
When cluster work at two win mode:
act_w + xoffset % 16 <= 2048

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I1326b02ede58b9a96960ad0d262cb1665bd29525
2021-11-08 15:55:02 +08:00
Jianqun Xu
a75da01111 arm64: dts: rockchip: rk3588/rk3588s: fix pinctrl
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I15b93a9ab1bbd40fe35e1b4ed94e84ad41c2cc28
2021-11-08 15:53:47 +08:00
Steven Liu
a042d6a178 arm64: dts: rockchip: rk3588/rk3588s: fix uart default pinctrl
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ie85ec29b02d311490ccd06862ec2e2ea162ac874
2021-11-08 15:53:47 +08:00
Andy Yan
265d675c1a drm/rockchip: vop2: Add VOP_GRF and SYS_GRF support
Some clk invert(dclk invert) control in SYS_GRF
Some interface enable(hdmi/edp enable) control in VOP_GRF
hdmi_vsync/hsync_pol control in VO1_GRF

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ia3972c9d207c9385b4512c96ea8e2d66e8fa03d5
2021-11-08 14:35:37 +08:00
William Wu
bfe47a132f Revert "usb: dwc2: hcd: do not disable non-split periodic channels"
This reverts commit debf378724.
The patch a82c7abdf8 ("usb: dwc2: hcd: Fix host channel halt flow")
can fix the issue.

Change-Id: I9a014c42cf942cab22480b5faab13c802e7fd47e
Signed-off-by: William Wu <william.wu@rock-chips.com>
2021-11-08 10:07:00 +08:00
William Wu
fbc682769e usb: dwc2: hcd: Fix channel halt for isoc and int transfer
The parameters g_dma and g_dma_desc is used for gadget,
so let's use host_dma and dma_desc_enable instead of them.
And it needs to update the chan->halt_status for non-split
periodic channels rather than return immediately, otherwise,
the software will not release the channel when the channel
halt interrupt is triggered next time.

In addition, it only needs to wait for the core generates
a channel halted if halt_status is DWC2_HC_XFER_URB_DEQUEUE.

Fixes: a82c7abdf8 ("usb: dwc2: hcd: Fix host channel halt flow")
Change-Id: I455444af020ff751406295f21133ff6a950c04dd
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2021-11-08 10:06:48 +08:00
Zefa Chen
b4757ba1f9 media: i2c: imx464 support 2lane mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If7a3302084e25168130f6bef8d5c72ca77f177ff
2021-11-07 18:06:58 +08:00
Zefa Chen
9aa1b6cb5d include: uapi/linux/rk-camera-module.h add exposure sync control
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2429ea5ced06cd799795ca3edd8d3a7894015565
2021-11-07 18:06:27 +08:00
Zefa Chen
928dde65f2 media: i2c: add sensor driver ov50c40
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ief7b0881a93d3c4fa4c61bc50e9379e2f1f4d983
2021-11-07 17:44:06 +08:00
Zefa Chen
bfbfac1045 media: i2c: otp_eeprom: support rkmodule otp
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie7aafce68bac9066b6df3610839a040b94be30f1
2021-11-06 18:46:11 +08:00
Zefa Chen
4a0b595e2a media: i2c: imx464 support get channel info by ioctl
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia0b7d27618e5e6cbe9b9e2f6b663d5a975fe89e2
2021-11-05 18:41:01 +08:00
Zefa Chen
7832719356 media: i2c: add camera driver imx464
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iae18497edac0c4fdd24bd2f74a5348aa5271f4e4
2021-11-05 18:40:11 +08:00
Zhenke Fan
add07bf1a2 media: i2c: otp_eeprom: add sensor otp eeprom driver
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: If08548c4613289c15947428c8468e7fb3769c60e
2021-11-05 18:29:38 +08:00
Zefa Chen
5c9a0d04e7 include: uapi/linux/rk-camera-module.h modify otp struct
1. modify af inf
2. add module info

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I455e649c1ffe471e1b5239d95ae929ad85113248
2021-11-05 18:13:10 +08:00