Commit Graph

1060613 Commits

Author SHA1 Message Date
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
Finley Xiao
ad7e570f0d soc: rockchip: power-domain: Add support to keep domains power on
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I95d57c6652197ebf33ab1e134cba0b0c9eeddc13
2021-11-03 19:01:11 +08:00
Finley Xiao
57db7e6ba5 soc: rockchip: power-domain: Add support to repair memory when power up
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I14e8f85491f6522c073b3a1cd9a8a163c3df935e
2021-11-03 19:00:38 +08:00
Andy Yan
932f203d92 drm/rockchip: vop2: Enable DataStream mode when mipi dsi work at cmd mode
RK3588 VOP should enable DataStream mode when mipi dsi
work at cmd mode, this is different from rk356x.

Change-Id: I770f98dd78d12e4b1a6411f0b1ffb9572dda62a4
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-11-03 19:00:01 +08:00
Sugar Zhang
111ac9e86d arm64: dts: rockchip: rk3568-evb: Fix dai property for rk809 codec
Actually, rk809 codec has two dais, so, should be "#sound-dai-cells = <1>"

Fix warning:

arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi:205.4-31:
Warning (sound_dai_property): /rk809-sound/simple-audio-card,codec:sound-dai:
property size (4) too small for cell size 1

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I641a33a5fe0cad21efb65e4e20655d0968373100
2021-11-03 18:57:17 +08:00
Sugar Zhang
aafa66673b ASoC: rockchip: i2s: Fix unbalanced hclk handle in error paths
Fix warning:

rockchip_i2s_probe() warn: 'i2s->hclk' not released on lines: 719,724,731.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ic3aeb86a2880aae0d004030b802aec187b74b6c6
2021-11-03 18:56:04 +08:00
Cai YiWei
2403d7d54e arm64: dts: rockchip: rk3588s: Add isp node
Change-Id: I7f1066ff131d52e69c8005aed8e3f2005ca799c6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-03 18:21:22 +08:00
Cai YiWei
38be10b6ae media: rockchip: isp: add rk3588 config
Change-Id: I2e449e6941c923b15d11496c68f1b0153950f723
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-03 18:08:33 +08:00
Cai YiWei
e2182606ea media: rockchip: isp: bridge v30 connect to ispp
Change-Id: I4dc870e46127133639d131194276da91da3ac023
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-03 18:08:33 +08:00
Cai YiWei
b5157fe547 media: rockchip: isp: vicap direct to isp3.0
Change-Id: I12ca0c29e44956bee806a020a4a1821daaa019e2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-03 18:08:33 +08:00
Cai YiWei
8b9c3e10f2 media: rockchip: isp: params and stats for isp3.0
Change-Id: Ie3cf39d9551b920e022f9024fee5a82a81acb966
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-03 18:08:33 +08:00
Cai YiWei
69903e865a media: rockchip: isp: add isp3.0
Change-Id: If0e54563f83332f5a84844c180af56e82a403e3c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-03 18:08:33 +08:00
Cai YiWei
0c424187cd media: rockchip: isp: adjust params common api
Change-Id: I5d2961496ec445bea3c3592050d9ef0bd35778c1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-03 18:08:33 +08:00
Kever Yang
3978c4c643 arm64: dts: rockchip: rk3588: update power domain for pcie3
PCIE3.0 x4 and x2 controller is in RK3588_PD_PCIE.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: Ic062c42824d70fa0a33959afda6fa1225b6c65bf
2021-11-03 18:05:51 +08:00
Shawn Lin
ceeb8033a9 arm64: dts: rockchip: rk3588s: Add pd for sdmmc and sdio
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ia400b5b986246c09f3fb41e5d62f0d6267f907e7
2021-11-03 18:03:44 +08:00
Finley Xiao
e226d1cdbc arm64: dts: rockchip: rk3588s: Add pm_qos for power domain
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I77cf5aae31e93f89ffca48fde51840b42bd78f06
2021-11-03 16:17:48 +08:00
Tao Huang
fe5ae0783d arm64: rockchip_gki.config: remove CONFIG_MALI_BIFROST_DEVFREQ
default y now.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If0fd702ef65c9242def492209c45e472c896c591
2021-11-03 14:29:06 +08:00
Jon Lin
12eed805a7 arm64: dts: rockchip: Add PCIe definition for rk3588 evb
Change-Id: I79c3eb85a6600aefcdd174b2b0b9d35c95b5b789
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-11-03 14:09:34 +08:00
Ding Wei
78162b4b90 video: rockchip: mpp: mpp_iommu_refresh via rockchip_iommu funcs
reason:
1. might_sleep is called by pm_runtime_xx, thus, it cannot covered by
   rcu_read_lock/unlock which is atomic context.
2. it need use device_links_read_lock/unlock when meets
   dev->links.suppliers. however, device_links_read_lock/unlock are
   not export symbols.
thus use rockchip_iommu_disable/enable instead.

Change-Id: I545eced499533383f6cfbdf81e696064f42b6c3e
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-11-03 11:26:59 +08:00
Wu Liangqing
46dcc1502c arm64: dts: rockchip: rk3588-evb: add rtc hym8563
Change-Id: I7dd35f795d3abb20d38f202787cff385c4db6c6e
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-11-03 11:23:43 +08:00
Tao Huang
010d9df4b9 arm64: dts: rockchip: Adjust node name for rk3588 evb
rk_headset -> rk_headset: rk-headset
vbus5v0_typec: vbus-typec-regulator -> vbus5v0_typec: vbus5v0-typec
vcc5v0_host: vcc5v0-host-regulator -> vcc5v0_host: vcc5v0-host

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I888a2adc48efa33310f7c00d0fe90cb14a511801
2021-11-03 10:26:59 +08:00
Shunhua Lan
ea6ea2ba87 arm64: dts: rockchip: adjust sound cards for rk3588-evbx and rk3588s-evbx
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: Ibd874890ae7124b3337ce9817710c657bd1bc6ed
2021-11-03 09:42:19 +08:00
Finley Xiao
ff595b5c1a arm64: dts: rockchip: rk3588s: Fix dependence for some power domains
Because of the signal relationship, PD_VDPU should be power up if
PD_RKVDEC0 or PD_RKVDEC1 wants to work, PD_NVM should be power up if
PD_SDIO wants to work, PD_VOP should be power up if PD_VOP0 wants to
work.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I3b85124dcb979ee154acbc89082b83ed31cdf9ab
2021-11-02 20:23:26 +08:00
Tao Huang
d6c2b5d6e4 arm64: rockchip_defconfig: update by savedefconfig
-CONFIG_MALI_MEMORY_GROUP_MANAGER=y
-CONFIG_TOUCHSCREEN_GSLX6801=y
-CONFIG_TOUCHSCREEN_GSLX680_VR=y
-CONFIG_TOUCHSCREEN_GSL3673_800X1280=y
-CONFIG_TOUCHSCREEN_GSL3676=y
-CONFIG_TOUCHSCREEN_GT9XX=y
-CONFIG_TOUCHSCREEN_HYN_CST2XX=y
-CONFIG_TOUCHSCREEN_WACOM_W9013=y
-CONFIG_TOUCHSCREEN_FTS=y
-CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5=y
-CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_DEVICETREE_SUPPORT=y
-CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_I2C=y
-CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_DEVICE_ACCESS=y
-CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_LOADER=y
-CONFIG_DEVFREQ_THERMAL=y
-CONFIG_MALI_BIFROST_DEVFREQ=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_PM_DEVFREQ=y
-CONFIG_PHY_ROCKCHIP_INNO_MIPI_DPHY=y

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I744730358d42051459cadcb2d51e9f9aa037f3a2
2021-11-02 19:23:30 +08:00
Tao Huang
16b9f3e8e1 arm64: rockchip_gki.config: Enable CONFIG_PHY_ROCKCHIP_SAMSUNG_DCPHY
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia00b7ed9e0148d8456bab9d4efeab4c1962d5940
2021-11-02 18:59:28 +08:00
Tao Huang
d2c5e113e1 arm64: rockchip_defconfig: Enable CONFIG_PHY_ROCKCHIP_SAMSUNG_DCPHY
The driver is used by RK3588.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib421b9132cf88af90b81168771595b402d805866
2021-11-02 18:59:14 +08:00