baiywt
38b0a66a10
Merge linux-5.10-gen-rkr6
2024-01-19 18:35:00 +08:00
Sugar Zhang
c3d3a14f49
arm64: dts: rockchip: rk3588: Use mclkout_i2sx for devices
...
replace.sh
#!/bin/sh
grep -lr "$1" | xargs sed -i "s/$1/$2/g"
e.g.
./replace.sh "cru I2S1_8CH_MCLKOUT" "mclkout_i2s1"
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I742c35e23a54facb90cde8f9d0d2b935be69152b
2023-02-21 14:59:32 +08:00
Andy Yan
09d66b0809
arm64: dts: rockchip: rk3588-evb1: Enable hdmi logo
...
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I0709a3d963df792ddefe4524cf2d044d7cdef2d7
2022-12-19 14:21:33 +08:00
Shunhua Lan
99edbfa6ee
arm64: dts: rockchip: rk3588-evb: use rockchip,hdmi as hdmirx audio machine driver
...
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I4b71a030a4880805eb3c62ecf3038c74f0494f77
2022-11-11 11:33:56 +08:00
Liang Chen
0d01ed0d12
arm64: dts: rockchip: rk3588: set pcfg_pull_up for touch int pin
...
This patch can save 0.6mA for PMUIO2(3V3).
Tested on RK3588_EVB1_LP4_V10 platform.
Change-Id: If9298b7de5859e8bfd28baf3e1022b71efd78218
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-09-30 10:33:55 +08:00
Shaohan Yao
b5386fc767
arm64: dts: rockchip: rk3588-evb: Enable pwm fan
...
Signed-off-by: Shaohan Yao <shaohan.yao@rock-chips.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5413438ed4d94e358c4ad0826371520cf78e037e
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2022-09-29 14:17:20 +08:00
Dingxian Wen
1ee5d90938
arm64: dts: rockchip: rk3588: modify hdmirx pinctrl
...
add hdmim1_rx pinctrl group, set hdmirx detect pin to pull up.
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I637d5d432d5879ed69077f00907667102e83153d
2022-06-21 16:36:07 +08:00
Dingxian Wen
f7a599ce64
arm64: dts: rockchip: modify hdmirx cma memory to 128MB for rk3588 boards
...
cma memory reserved for hdmirx reduced to 128MB
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I80d909c5bba1769cf34a649e8482a905375c2512
2022-06-21 14:18:01 +08:00
Shunhua Lan
fe1fe371dc
arm64: dts: rockchip: rk3588-evbs: enable dp0 sound card
...
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: Id1a8d26def060de71078621635de7c70bc7cd6c1
2022-05-21 16:30:18 +08:00
Dingxian Wen
3e6fe49ea6
arm64: dts: rockchip: rk3588-evb1-lp4: enable hdmirx_ctrler
...
Enable hdmirx_ctrler and reserve cma memory for hdmi-in application
Change-Id: I033bcea55e03e168a73fb607c17d92468b6f2c34
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-01-20 10:56:08 +08:00
William Wu
a3baf95262
arm64: dts: rockchip: add typec-vbus-det property for rk3588 boards
...
Add new property "rockchip,typec-vbus-det" for the RK3588 and
RK3588S boards which support Type-C interface and the vbus det
pin is always pulled up.
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I0cc1bc339238f41b0dc05c374fa69bf3daeeb42a
2022-01-10 14:30:34 +08:00
Alex Zhao
0b819948e4
arm64: dts: rockchip: rk3588 boards: add rockchip,skip-scan-in-resume for pcie wifi
...
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I8423da5f963264a815be5b3f22f0e69596ac07e6
2022-01-10 14:12:49 +08:00
Weixin Zhou
e0a08d9c40
arm64: dts: rockchip: rk3588 boards: add wakeup-source for rtc hym8563
...
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I84ff00c0089309418c884a5716db40adec48546d
2022-01-07 10:02:16 +08:00
Shunhua Lan
7b0beb7092
arm64: dts: rockchip: rk3588-evb: add hdmiin soundcard
...
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I0e1856d3a4d6231da9560c8c913d6760f4a10f2e
2021-12-31 10:53:59 +08:00
Jon Lin
ec2de31ea9
arm64: dts: rockchip: rk3588: Make PCIe phy power supply always on
...
Without dynamic adjustment, it is managed by secondary standby.
Change-Id: I425108495ffdc827231d77c79cebaeededeb9150
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-12-22 15:47:07 +08:00
Guochun Huang
69622cf227
arm64: dts: rockchip: add route_dsi0/1 for rk3588 evb
...
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ic4c04cc5229a6b7363f690fa84998f3658ca3fd2
2021-12-21 19:10:33 +08:00
XiaoTan Luo
d8c83dc4e3
arm64: dts: rockchip: rk3588-evb1-lp4: change es8388 sound card name
...
pulseaudio ucm2 config can not handle the character "," or long name,
so change it.
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I79cfc70089227cceb9d792c171551f1d95eb6ded
2021-12-20 14:27:31 +08:00
Damon Ding
99e6d9420b
arm64: dts: rockchip: rk3588: enable route_dsi for evb
...
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I98465f2f5c1a1ba8b52f848f475e3ad078f2565a
2021-12-16 15:52:02 +08:00
XiaoTan Luo
524cac67f9
arm64: dts: rockchip: rk3588-evb1-lp4: add headset play/pause key
...
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: Iaf7f179f19175d2956de2975b8893993ed9c30ba
2021-12-13 15:51:45 +08:00
Zefa Chen
c1c7e5ac5e
arm64: dts: rockchip: fixed vcc_mipidcphy0 name error for rk3588 evb1
...
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3f3a6e65e74c828fc7a32c294e642222816b9ba0
2021-12-09 15:56:27 +08:00
XiaoTan Luo
e81323a683
arm64: dts: rockchip: rk3588-evb1-lp4: use "multicodecs" instead of "simple-audio-card"
...
Used to support jack detection events
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: Ie24eb93fbff9e2dcee12bb6de1ac96dd3e131fb5
2021-12-09 15:20:47 +08:00
Wangqiang Guo
74a94db2e7
arm64: dts: rockchip: rk3588-evb/rk3588s-evb: gt1x add power-supply
...
Fix enter suspend/resume error
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I08335c818ef3b49fb15a782db105bfee333d3e91
2021-12-02 09:39:38 +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
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
Longjian Lin
69d513e082
arm64: dts: rockchip: rk3588-evb1-lp4: add bt pinctrl
...
Signed-off-by: Longjian Lin <llj@rock-chips.com>
Change-Id: Ic9267574527bfd28ba8cd7218617b963314bb6ef
2021-11-25 15:19:50 +08:00
David Wu
dfc1ca96ca
arm64: dts: rockchip: Fix tx delayline for rk3588-evb1 and rk3588-evb2
...
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Icd2bf56f8aa06fd379ad37a8eb65ff36d53ad52d
2021-11-25 15:04:34 +08:00
shengfei Xu
7534ec9a51
arm64: dts: rockchip: rk806: bind the rk806 to the rk3588
...
rename "rk806-double.dtsi" to "rk3588-rk806-daul.dtsi"
rename "rk806-single.dtsi" to "rk3588-rk806-single.dtsi"
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I0f2de1d32a0cd2ed6d551dca7cdf7ebb6eb6d990
2021-11-23 11:09:30 +08:00
Wyon Bi
bb6015af1d
arm64: dts: rockchip: rk3588-evb1-lp4: Fix dp2vga display
...
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ib764a9cc64d38e1e3d1e66da03796c31d324391e
2021-11-18 20:09:57 +08:00
Zefa Chen
471459e6d7
arm64: dts: rockchip: rk3588 evb1 add camera power node
...
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I73d676f478dd2a826817142371beac10d47aec7c
2021-11-18 16:07:18 +08:00
Kever Yang
a3a5483632
arm64: dts: rockchip: rk3588-evb: Add pcie3-phymode setting
...
rk3588 boards may have different pcie3-phymode, default as below id not
set:
rockchip,pcie30-phymode = <PHY_MODE_PCIE_AGGREGATION>;
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: If158eb47f679d0c7b184b6bd64262d0f764b97f3
2021-11-17 16:08:30 +08:00
Frank Wang
b1368b8774
arm64: dts: rk3588: revert peripheral dr_mode for usbotg0
...
Restore usbotg0 dr_mode to "otg" that Type-C controller can switch the
mode via "role_switch" callback for RK3588 EVB1, EVB3 and EVB4.
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I6e7d83acb468d50e31ffdfdee6adcd7c5330d776
2021-11-17 14:15:43 +08:00
Algea Cao
9849816257
arm64: dts: rockchip: Add rk3588s/rk3588 evb hdmi2.1/hdmi2.0 switch gpio
...
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I5f2ff51c634e690539e8468d34ee96f61576463d
2021-11-16 21:38:41 +08:00
Zhang Yubing
266df05c62
arm64: dts: rockchip: add rk3588/rk3588s evb dp phy info
...
rk3588-evb1: dp0-->usbdp_phy0-->Typec-C
dp1-->usbdp_phy1-->VGA:
dp lane0-->phy lane2
dp lane1-->phy lane3
rk3588-evb2: dp0-->usbdp_phy0-->DP:
dp lane0-->phy lane2
dp lane1-->phy lane3
dp1-->usbdp_phy1-->VGA:
dp lane0-->phy lane2
dp lane1-->phy lane3
rk3588-evb3: dp0-->usbdp_phy0-->Typec-C
dp1-->usbdp_phy1-->DP:
dp lane0-->phy lane2
dp lane1-->phy lane3
rk3588-evb4: dp0-->usbdp_phy0-->Typec-C
rk3588s-evb1: dp0-->usbdp_phy0-->Typec-C
rk3588s-evb2: dp0-->usbdp_phy0-->DP:
dp lane0-->phy lane0
dp lane1-->phy lane1
dp lane2-->phy lane2
dp lane3-->phy lane3
rk3588s-evb3: dp0-->usbdp_phy0-->Typec-C
rk3588s-evb4: dp0-->usbdp_phy0-->Typec-C
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I765f7920815e2a61f3bf8f60aca1cd0c8b234305
2021-11-16 18:50:33 +08:00
Shunhua Lan
3e819876dd
arm64: dts: rockchip: rk3588 board: modify configs for sound cards and headset
...
1. set hp-det pin pcfg_pull_none all evbs
2. enable headset for rk3588s-tablets
3. add "everest,es8323" string to es8388 compatible property for rk3588s-tablets
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I85ae0bc78c2058d38ed768da7233d86cdb0c301f
2021-11-16 17:09:20 +08:00
Bin Yang
bcfc68937f
arm64: dts: rockchip: add WIFI/BT/Ethernet for rk3588 evb1
...
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
Change-Id: Iba936e1cc5a91f6a92f6a2c6f950be580fec7c1a
2021-11-16 11:35:31 +08:00
Sugar Zhang
11e33efe53
arm64: dts: rockchip: rk3588-evb: Add hdmi sound for evb
...
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ia8f538a1dc8c18aa9bcc7adb4fe9d182e2eb19eb
2021-11-13 15:42:35 +08:00
Jianqun Xu
26b748082e
arm64: dts: rockchip: rk3588-evb: fix vcc3v3_lcd0_n node
...
Remove a regulator-fixed node without gpio enable pin from evb dtsi,
move them to next level board dt file.
The vcc3v3_lcd0_n regulator is a software virtual regulator for camera
module to push high/low level from a gpio but through regulator
enable/disable.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I1f587fe1ca0ef9d31c6cba5362c1912b7208f293
2021-11-12 20:45:14 +08:00
Wangqiang Guo
2baf8fc47d
arm64: dts: rockchip: rk3588-evb: move touch pinctrl to rk3588-evbx.dtsi
...
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I91fb070f4bd09a47db4967ca2bb458179c31f459
2021-11-12 16:14:22 +08:00
David Wu
8cdc87137f
arm64: dts: rockchip: Add gmac0 node for rk3588-evb1
...
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I34f0723dc4b91ed5d13c7f2925da24b56776e217
2021-11-12 16:10:12 +08:00
Sugar Zhang
314a46420e
arm64: dts: rockchip: rk3588-evb: Fix config for es8388 sound
...
Fixes: ea6ea2ba87 ("arm64: dts: rockchip: adjust sound cards for rk3588-evbx and rk3588s-evbx")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I7acedc41e1a34820166ec752990693546dc99064
2021-11-11 22:06:54 +08:00
Shunhua Lan
84d94d76d4
arm64: dts: rockchip: rk3588-evb: add hp-con gpio and fix hp-det pin for sound card
...
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I0facbe75a554e52eac4bbaa4bebbf8eb5370b42e
2021-11-11 14:26:33 +08:00
Sugar Zhang
ade52cc9ed
arm64: dts: rockchip: rk3588-evb: Add mclk-fs for es8388 sound
...
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I8912b36e91e935e36a3af773090452b3223d37ee
2021-11-10 21:18:00 +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
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
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
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
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