Commit Graph

1061232 Commits

Author SHA1 Message Date
Jianqun Xu
7bb2c21642 pinctrl: rockchip: sync difference with upstream version
Some difference made during driver upstream review, this patch sync the
driver with upstream version.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I0da05d04f54bfc8e83afa28692c658b0b4d2604b
2021-12-01 16:03:09 +08:00
Zefa Chen
0d7bc5495a media: rockchip: cif fixed error that may cause an error during the second run
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If00c67909da448c926110a9843cc41c6f4cb0c75
2021-12-01 15:39:03 +08:00
Elaine Zhang
e1271eecd2 net: can: rockchip: support can-2.0
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I8fee96d28118c635dcbaad79fa32c2397e1f1809
2021-12-01 15:35:06 +08:00
Elaine Zhang
1403265a5e dt-bindings: can: rockchip_canfd: add can-2.0
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I90cbee47de662f4a06bb94e531300dc9abc5b0b1
2021-12-01 15:32:25 +08:00
Elaine Zhang
3bfd4fb2eb arm64: dts: rockchip: rk3588: Fix can compatible
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I56b21d6bafab511a37e5e388f25266828e195125
2021-12-01 15:32:05 +08:00
Jianqun Xu
9b97628093 pinctrl: rockchip: fix rk3588 pinmux get
For GPIO0_B4 to GPIO0D7, the pinmux must read two registers.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ic8d70c0ee56ce8ae8890a708cea84868f3a04228
2021-12-01 15:14:04 +08:00
Guochun Huang
449408e884 phy: rockchip: mipi-dcphy: clk bias enable HS_VREG after lane enable
Change-Id: I81ce750821549e30f606f65fa85f853adb627ae3
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-12-01 15:09:04 +08:00
Zefa Chen
40c21f3337 include: rk_vcm_head: add t_div config
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iad35fbc12ec18d24198ee48be88dc9315ac9b312
2021-12-01 14:57:25 +08:00
Zefa Chen
342bda4075 include: rk_vcm_head.h fixed compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Icf9094d096347bae974718a9be31c5137ba127a3
2021-12-01 14:56:43 +08:00
Zefa Chen
821201ff6a media: rockchip: rkcif support get spd/ebd data type
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I74635dce94c54b3db79a750eb59e4533b8ccb090
2021-12-01 14:27:15 +08:00
Lin Jinhan
4c58956a5e crypto: rockchip: add DMA32 addressing range limits
Crypto only supports DMA32 address addressing and behaves
 abnormally on more than 4G DDR.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I5b6b5c9eb5f00698d25e47a778f358380f4121eb
2021-12-01 14:17:10 +08:00
Zefa Chen
adb2ff0444 arm64: dts: rockchip: rk3588 vicap dclk set to 600M
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib2edcf7968bc6fe67cca09de029bc8186f06463c
2021-12-01 11:27:55 +08:00
Andy Yan
167ea3e2e9 drm/rockchip: vop2: Fix dclk_out rate calculate error in YUV420 output mode
The K will be set 2 in YUV420 output mode, so we
don't need to handle YUV420 for DisplayPort.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I8f42536735e65c82705d58382f1db2b2994d741b
2021-12-01 11:27:23 +08:00
Andy Yan
27dc0c199b drm/rockchip: vop2: Fix hdmi_edp1_pixclk div width
Max div of hdmi_edp1_pixclk is 2.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Idb21a06a586f088f8a332435676a8bb031a384ca
2021-12-01 11:27:23 +08:00
Wu Liangqing
250a8af383 arm64: dts: rockchip: rk3588s-evb: sync with rk3588-evb
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: If6aaec4a52b28fe0e25c7ace20aa4611177a3e03
2021-12-01 10:20:26 +08:00
Weixin Zhou
59b695cf32 arm64: configs: rockchip_defconfig: Enable CONFIG_SENSORS_PWM_FAN
RK3588 EVB use this feature.

Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I4535dfe182f76ebf1441cebf5d48f02805e74450
2021-12-01 09:41:42 +08:00
Weixin Zhou
b874d148dc arm64: dts: rockchip: Add pwm-fan for rk3588 evb
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Ia0cf7c9ba9e53e427631a1068ebfc8fb315afb29
2021-12-01 09:40:02 +08:00
Shaoxing Chen
6e6c4d831e arm64: dts: rockchip: Enable hym8563 for rk3588s-evb4
1) Enable hym8563 clkout for WIFI/BT
    2) Remove spi2m2_cs1 for hym8563 interrupt gpio

Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
Change-Id: Id2f563115efab751f360d4d00df0b78b155c0bc1
2021-12-01 09:20:27 +08:00
Shaoxing Chen
9392c1c4b3 arm64: dts: rockchip: Add WIFI/BT node for rk3588s-evb4
Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
Change-Id: I77dda984658e828bce3472ff6a38170044e52080
2021-12-01 09:20:20 +08:00
Zefa Chen
f1d87b2a3d media: i2c: ov50c40 change pdaf otp data align to big endian
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I75a099e14c74adb7df13ff5971c702fb3537a4ce
2021-11-30 21:12:37 +08:00
Zefa Chen
1b717058b0 media: i2c: ov50c40 support get spd data type
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3debaf964b00b0ba8cc4545de1a9e81862d93dd7
2021-11-30 21:02:41 +08:00
Zefa Chen
f7b8afb8b4 include: uapi: rk-camera-module.h: struct channel_info add data type
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I64ca7e16e0048c88938ce4cc77e96c81d14b7601
2021-11-30 21:02:19 +08:00
Elaine Zhang
5119ab44df arm64: dts: rockchip: rk3588: Change the clk link registration sequence
Reduces clock registration time

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I9ff4218e23fe9dde42f7345fc0e4bcd6f42c5d73
2021-11-30 21:01:05 +08:00
Mark Huang
a8d82cff69 arm64: dts: rockchip: rk3588-nvr-demo: enable hdmi1 in vop0 and vop2
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: If5e9452505ccf9d97b81f7ab2b41604d931e2a03
2021-11-30 20:36:20 +08:00
Algea Cao
6680da5e1f drm/rockchip: dw_hdmi: Fix hdmitx0 hpd irq mute by hdmitx1 driver
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia4b4c977208f925c0f2c2fe6e763f3cd7ecc9db9
2021-11-30 19:40:05 +08:00
Jiajian Wu
d34e75ac1e drm/bridge: synopsys: Add hook_plugged_cb for dw-hdmi-qp reporting connector status
Signed-off-by: Jiajian Wu <jair.wu@rock-chips.com>
Change-Id: I3103df9f379dfe98a4eb54dc5d3ce9f407038d8c
2021-11-30 18:37:26 +08:00
Andy Yan
1966a3328a drm/rockchip: vop2: Report max_input of window as 4096x4320
Make hwc work correct when handle a 8K input source

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I77ee3c13f5c884fbdd9eec72b02998e10bbc3425
2021-11-30 18:37:19 +08:00
Shunqian Zheng
6953760a2a arm64: rockchip_linux_defconfig: enable imx415
IMX415 is supposed to be the default sensor on rk3588 evb boards.

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Change-Id: I4b2ea0f57c2510d46ea5c0b3416d536a2e7bc898
2021-11-30 18:32:14 +08:00
Cai YiWei
f5b1a62925 media: rockchip: isp: dynamic memory alloc for params and stats function
Change-Id: Iecc3391295e264ac6569c2ace257a023bfa3ed9e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-30 18:31:11 +08:00
Wang Jie
5869a2d49e arm64: dts: rockchip: rk3588s-tablet: fix Type-C0 vbus issue
Just as the commit 25e44a6ed98b("bq25700: register otg vbus regulator")
said that there will be some problems with the current vbus control,
and the patch has registered the otg vbus regulator in the charger ic
driver, then the otg vbus regulator can be referenced in the fusb302 node.

Change-Id: Id4c9f866a3d131eee6f732300ff642a7f5489672
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2021-11-30 18:27:12 +08:00
Frank Wang
7790a659ae phy: rockchip: usbdp: tuning ssc modulation rate
Set SSC Modulation rate to 31.2 KHz that can pass the compliance test
and have a better margin.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: Iaf82e4803a9ccb196d21d9a02a93293be0dd053e
2021-11-30 18:23:23 +08:00
Cai YiWei
5dc6645028 media: rockchip: isp: fix bay3d mi no update
Change-Id: I44cdb1fa3bbfcde374ce6747a3b5825b22373c10
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-30 17:24:12 +08:00
Wyon Bi
8d3c3e5d41 drm/rockchip: dw-dp: Improve link maintenance
- Only check link retrain in short hpd pulse
- Always do link train in modeset
- Fix link retrain condition
- Add sink count check

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ifed1d706dcda5ac79322271ec59c2f1a5a79262b
2021-11-30 15:58:44 +08:00
Wang Jie
25e44a6ed9 power: supply: bq25700: register otg vbus regulator
For Type-C PD driver using the tcpm framework and charger ic
(bq25700) output otg vbus solution. Because the dwc3 driver
cannot know whether the Type-C PD device sends DR_swap and
PR_swap messages, there are some problems with the charger ic
vbus control:
(1) rk3588s as sink, Type-C device sends DR_swap Message, u2phy driver
    will send enable otg vbus notification to charger ic driver;
(2) After the Type-C device sends PR_swap Message to realize the
    Sink->Source or Source->Sink switch, the charge ic driver cannot
    dynamically enable or disable the otg vbus;

Based on the above problems, an otg vbus regulator is registered in
the charge ic driver for use by the fusb302 (Type-C PD controller chip)
driver, the otg vbus control is transferred to the tcpm framework.

In some cases (for example, the hardware does not have a PD chip),
in order to be compatible with switching from a lower version kernel
(kenrel-4.4/4.19) to a higher version kernel(kernel-5.10), dts will not
be modified. the software registration of the otg vbus regulator fails,
the vbus extcon mechanism will be registered.

Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
Change-Id: I721abcb214795c0024e200b10ec3ab1d4a9b790a
2021-11-30 10:59:45 +08:00
Algea Cao
1d2c231dcc arm64: dts: rockchip: Enable hdmitx1 for rk3588 boards
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I4adeeffcd19dd841bcb179f645e811fd9bb64f42
2021-11-30 09:45:40 +08:00
Tao Huang
4fb351ca18 arm64: dts: rockchip: Rename rk3588-rk806-daul.dtsi to rk3588-rk806-dual.dtsi
Fixes: 7534ec9a51 ("arm64: dts: rockchip: rk806: bind the rk806 to the rk3588")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I01cd29ea965fc3a03e68a02f1a6a18ad5c44a73c
2021-11-29 20:40:02 +08:00
Algea Cao
92bdbf29ec drm/rockchip: dw_hdmi: Fix crash when rk3588 hdmitx1 hotplug
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia75e8cd7ce6f5862f0ae321d9d9265363f2cb533
2021-11-29 20:25:56 +08:00
Wangqiang Guo
31d4d991b7 power: supply: modify bq25703 input voltage calculate
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: Ie7c257b993b59b1a6c9fafa340d1c351e94c72ba
2021-11-29 19:36:12 +08:00
David Wu
3e76ff28cd net: ethernet: stmmac: Fix loopback at dwmac-ethtool for rk3588
slove following issues:
 - socket buffer is over;
 - store phyaddr;
 - get max delayline value for rk3588;
 - split mac setting and phy setting for loopback to fix flow;
 - add rgmii-rxid interface loopback;
 - enable mtl configuration for multi queue;
 - use phy softreset instead of hard reset.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I8da5a42948b34bf4a256a6f425c0ed98590ddea6
2021-11-29 19:17:12 +08:00
Wyon Bi
2db29d7f51 arm64: dts: rockchip: Remove assigned-clocks from vop node for rk3588 boards
Change-Id: I20d568eb199d34380a4b776742f111adcc3c35b3
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-11-29 18:49:17 +08:00
Wyon Bi
04ae4b0627 arm64: dts: rockchip: rk3588s: assign clock parents for dclk_vop2_src
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I31fb7d3af20479cbfe0f00169be30d56bfaa46ed
2021-11-29 18:48:11 +08:00
Wyon Bi
afd6026f71 drm/rockchip: vop2: Support set clock defaults for vp node
Parse and set assigned clocks configuration at the child node level.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I745090ebc2a3531c51557600fdb69867d7216684
2021-11-29 18:48:06 +08:00
Cai YiWei
8510082f3b media: rockchip: isp: fix rawawb with rawlsc no stats
Change-Id: Iccf0745e96532097b7ee8741e0cc9f6e5c4c8a4f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-29 18:38:57 +08:00
Elaine Zhang
dbd5f33301 clk: rockchip: rk3588: Change the clk registration sequence
Reduces clock registration time

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I9ee110dde6cfcae13fbec6604567c930b709d34b
2021-11-29 18:05:42 +08:00
Ding Wei
3b0208b0c2 video: rockchip: mpp: Fix hand writing error
Change-Id: Ie385fd808f667a09396c7280851ba27937f85343
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-11-29 16:47:31 +08:00
Andy Yan
dfcff113be drm/rockchip: vop2: Fix a left_src_w calc error in splice mode
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I8900bfd1018dfcd5b47d857007a1d888dbe6c039
2021-11-29 16:26:16 +08:00
ZiHan Huang
dcbe6022af arm64: dts: rockchip: add rk3588-evb1-lp4-v10-6x-linux.dts
rk3588 evb1 add six camera config of imx464

Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com>
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4adc4a7f9f8f04fad23d9cacf03d7fef48990f53
2021-11-29 16:24:48 +08:00
Cai YiWei
5b28972d97 media: rockchip: isp: fix fbc stop iommu page fault for isp30
Change-Id: I422e99c289c74b14525a21a198d37bbea8337eec
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-29 16:06:42 +08:00
Zheng Yang
ca885383eb drm/rockchip: dw-dp: support dynamic binding to different vp port
According to the application scenario, DP0/DP1 may be bind to the
same vp port, or different vp port. The corresponding bit in output_if
needs to be set or cleared correctly.

Change-Id: I880946d0c61a209d5a16ff7d2aada43f87a075c5
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2021-11-29 16:05:47 +08:00
Tao Huang
18a6cae4bb rk: scripts/mkimg: Support Create U-Boot FIT Image use ${BOOT_ITS}
Change-Id: Id878ebf13606f1be324b11d89cb803ec9ed6c209
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-11-29 15:17:46 +08:00