Commit Graph

1060638 Commits

Author SHA1 Message Date
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
Zefa Chen
139acca6dd media: i2c: imx258 sync from kernel 4.19
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I89a0f9472bbe475c9da368b09eaad0cd00fc69c6
2021-11-05 18:12:43 +08:00
Zefa Chen
9b16ff2988 include: uapi/linux/rk-camera-module.h otp support pdaf
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4bcd2d1ff866059821ef1ddc7248530cd37a9062
2021-11-05 17:57:42 +08:00
Zhenke Fan
3463b91879 include: uapi/linux/rk-camera-module.h modify the rkmodule_lsc_inf
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I89403b779bcd6191e6fe76e1412275ad1752d414
2021-11-05 17:57:29 +08:00
Finley Xiao
14f5c70c6e soc: rockchip_system_monitor: Fix missing regulator_put if early_min_volt=0
Fixes: d58bcc8c2b ("soc: rockchip_system_monitor: Add support to limit volt during system startup")
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I3ca0aa2b6563c5be9fddd9fee04145ce8e15c32c
2021-11-05 14:52:33 +08:00
Yifeng Zhao
001f34ffe4 arm64: dts: rockchip: rk3588: add sata nodes for evbs
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I4391a3c9517897297b1e574c2235e13c7491e9f6
2021-11-05 14:33:18 +08:00
Jon Lin
7e864ae394 arm64: dts: rockchip: rk3588-evb: Enable PCIe phy
Change-Id: I213a206446cb4298bcf722094415742bf957ab08
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-11-05 14:23:26 +08:00
Jon Lin
be2891ed31 mtd: torturetest: Support random pattern
insmod /oem/mtd_torturetest.ko dev=5 check=0 cycles_count=10 random_pattern=1

Change-Id: I8919da8241e7d3af6925aa7a377027e0c3d7d7f8
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-11-05 11:59:27 +08:00
Elaine Zhang
d3a274cb5e Revert "clk: rockchip: rk3588: export clk_gmac id"
This reverts commit de8a7dc11e.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I10be8115666498baf872a40fc9c72964744f3243
2021-11-05 11:32:52 +08:00
David Wu
d6cb203817 arm64: dts: rockchip: Remove CLK_GMAC clock for RK3588
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I4585aeb43071883d11d49b344e391d5bb7de7d41
2021-11-05 11:32:52 +08:00
David Wu
e7c0f2bf29 net: ethernet: stmmac: dwmac-rk: Fix GMAC clock setting for RK3588
Put the clock configuration of GMAC into the gmac driver and implement
corresponding functions.

Fixes: 2627dcd2c9e9("net: ethernet: stmmac: dwmac-rk: Add gmac support for rk3588")
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: If9bd639db31f44602af56dc20b81688ba67702c2
2021-11-05 11:32:52 +08:00
Guochun Huang
cc761c9b6a arm64: dts: rockchip: add rk3588/rk3588s evb mipi panel info
rk3588-evb1: dsi0->dphy->1080p_panel && dsi1->dphy->1080p_panel;
rk3588-evb2: dsi1->dphy->1080p_panel;
rk3588-evb3: dsi0->dphy->1080p_panel && dsi1->cphy->cphy_panel;
rk3588-evb4: dsi0->dphy->1080p_panel;
rk3588-evb5: dsi0->dcphy->test_connector && dsi1->dcphy->test_connector;
rk3588s-evb1: dsi0->dphy->1080p_panel && dsi1->dphy->cmd_no_dsc_panel;
rk3588s-evb2: dsi0->cphy->cphy_panel & dsi1->dphy->1080p_panel;
rk3588s-evb3: dsi0->dcphy->test_connector && dsi1->dcphy->test_connector;
rk3588s-evb4: dsi0->dphy->1080p_panel && dsi1->dphy->cmd_dsc_panel;

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I4c03d8c351a605e643e4c61d3e388db09d1fa8be
2021-11-05 09:49:07 +08:00
Andy Yan
1eaccc255a drm/rockchip: vop2: Add dual channel configuration
HDMI/eDP/DP on RK3588 also support dual channel mode
like mipi dsi.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I06454d3c64bc6a283d180c57fac6e8464ff6ca19
2021-11-05 09:24:24 +08:00
Jon Lin
4c0ef01e44 spi: rockchip-test: Remove useless test code
1.It's to follow the concrete spi develop guild instead of these
rough introduction.
2.Remove useless filesystem operation

Change-Id: I0c0904720cd01bc1383f4722e9febf152e7c89e0
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-11-05 09:18:34 +08:00
Jon Lin
2690841f52 mtd: readtest: Support setting cycle test
insmod /oem/mtd_readtest.ko dev=3 cycles_count=10

Change-Id: Ib2e72c51f776fb39be1229d3e9a0180c10a2bed5
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-11-04 19:04:43 +08:00
Sugar Zhang
e3eeb98a0e arm64: dts: rockchip: rk3588-evb: Add dsm/spdif sound node
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id6092de38839391cdf006b3d633de04699777ffe
2021-11-04 19:01:05 +08:00
Jon Lin
69240e727b arm64: dts: rockchip: rk3588s: Add pcie nodes
RK3588s evb supports pcie;
evb2 does not have pcie.
Note that the pin name in schematic is named by PHY;
and here is the map for phy and controller on rk3588s:
pcie2x1l0 - Not exist in rk3588s
pcie2x1l1 - PCIE20_2(PHY MUX_2)
pcie2x1l2 - PCIE20_0(PHY MUX_0)

Change-Id: Ibf4a66f79c377155d1c23d5f99a63306f9556432
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-11-04 18:11:57 +08:00
Jason Song
b84f6a099c arm64: dts: rockchip: add rk3588s tablet board.
Signed-off-by: Jason Song <sxj@rock-chips.com>
Change-Id: Ib3455b9452807b7ba843e7df7322feb79f026df2
2021-11-04 16:58:52 +08:00
Tao Huang
6c42979994 arm64: dts: rockchip: Add fiq_debugger label on rk3588-linux.dtsi
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie85d156616989b6fc3990015b6c7ea672214431a
2021-11-04 16:58:52 +08:00
Tao Huang
225dc53a8a arm64: dts: rockchip: Add fiq_debugger label on rk3588-android.dtsi
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I0c7d4f9db7157d939d42becfa073c91215178cc5
2021-11-04 16:58:52 +08:00
Jianwei Fan
c03082ee6e media: i2c: tc35874x: adapt the driver to kernel-5.10
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I1eca2b49113a0ce55d8bbd76301a1bf884a9dd13
2021-11-03 21:08:48 +08:00
Finley Xiao
3807120290 cpufreq: rockchip: Add multiple regulators support
On RK3588 platform, there are two voltage inputs for each cluster,
VDD_LOGIC and VDD_MEM are supplied by two regulators. when scaling
voltage inputs of the cluster, the voltages of two regulator inputs
need to be controlled by software under the SoC specific limitation:
	VDD_MEM: 675mV ~ 950mV
	VDD_LOGIC: 550mV ~ 950mV
	VDD_MEM - VDD_LOGIC <= 400mV
	VDD_LOGIC - VDD_MEM <= 150mV
So when scaling up voltage, change the voltage of VDD_MEM before
VDD_LOGIC, and when scaling down voltage, change the voltage of
VDD_LOGIC before VDD_MEM.

Change-Id: I1a603335e0fd98b1b70e4d0ccbcad10d33cc8a8a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-11-03 20:51:54 +08:00
Tao Huang
f030a519cd arm64: rockchip_gki.config: Enable CONFIG_SND_SOC_ES8323
Enable CONFIG_SND_SOC_ES8323 for rk3588 evb.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic91839a43cc59caa9af1c5aeecba313442eb7e09
2021-11-03 19:44:13 +08:00
Sugar Zhang
1aa16af0d1 arm64: rockchip_defconfig: Enable CONFIG_SND_SOC_ES8323
This patch enable CONFIG_SND_SOC_ES8323 default for rk3588 evb boards.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I2f617a1da0e4a1998e70eab7b207250d9533082b
2021-11-03 19:44:13 +08:00