Commit Graph

1060684 Commits

Author SHA1 Message Date
Jianqun Xu
3df95bb0b9 pinctrl: rockchip: fix rk3588 iomux setting
Fixes: 7c357cd7cf ("pinctrl: rockchip: add rk3588 support")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: If81e84796da50627497044184d11e5d15784d7e1
2021-11-11 20:13:17 +08:00
Huibin Hong
01f8963021 arm64: dts: rockchip: rk3588-linux: add debug and cspmu node
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I5b07ac30bb887edd36a7805bacfa7e1a47649665
2021-11-11 19:42:12 +08:00
Huibin Hong
763c97523d arm64: dts: rockchip: rk3588-android: add debug and cspmu node
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: If8102c4f08a0fe4f578129b040212c88cad314e0
2021-11-11 19:40:48 +08:00
William Wu
603ce88ca3 HACK: arm64: dts: rockchip: rk3588-evb: set max-speed to hs for usb3
This patch sets the maximum speed to high speed for
USB 3.0 OTG on rk3588 and rk3588s evbs. It's used to
support USB 2.0 ADB during bring up stage.

In the future, if the USB 3.0 PHY driver is ready, we
can revert this patch.

Change-Id: I654894a894e38c39104dc6efe0446867f6894b7b
Signed-off-by: William Wu <william.wu@rock-chips.com>
2021-11-11 18:17:19 +08:00
Tao Huang
04264f596c arm64: dts: rockchip: rk3588-linux: Remove debug node
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I91e24e7c4c5240956a175b3683dd3c4e187bc028
2021-11-11 18:03:23 +08:00
Tao Huang
f27234ade9 arm64: dts: rockchip: rk3588-linux: Enable clk/pd always on
Debug only.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id45fc1641fd07998ea8498c6e18013a6c54af5dd
2021-11-11 18:03:23 +08:00
Tao Huang
fb7d7606a1 clk: rockchip: Temporarily fix for rk3588 pll
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I15819f3611556e140ec80126b990408edf260c18
2021-11-11 17:18:31 +08:00
Tao Huang
e0e8de4a77 arm64: dts: rockchip: rk3588: Disable set PLL_CPLL
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1e6d9e26ad56da0e328bf1fb4b8656e5acf7248d
2021-11-11 17:17:45 +08:00
Tao Huang
a0a7792bbe arm64: dts: rockchip: rk3588-android: Remove debug node
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4c4a312c22b362605dc9362cdeddb71ef38c4637
2021-11-11 17:16:52 +08:00
Tao Huang
92ce906652 arm64: dts: rockchip: Temporarily disable its for rk3588
Debug only.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaad2a7279d65e2f14966050777c989041c925c76
2021-11-11 16:55:11 +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
Shunhua Lan
86d67c794f ASoC: codecs: es8323: add hp-con-gpio control and extcon notifier for headset detect
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I1d0314ce8185df38ff138f2f2d0d3b0f0fae3707
2021-11-11 14:20:11 +08:00
Jianqun Xu
73158f4b0f pinctrl: rockchip: fix rk3588 pull type to 1V8_ONLY
Fixes: 7c357cd7cf ("pinctrl: rockchip: add rk3588 support")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ie59a981ed040185014d5f05c1beae6955ca49bfe
2021-11-11 14:04:28 +08:00
Wangqiang Guo
7f61b3481d input: touchscreen: support ELAN TP_5515
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: Ic266d2b3ec1697bc2a56c5cbb9c116ecc7251e7d
2021-11-11 13:08:33 +08:00
Guochun Huang
89f783f024 drm: rockchip: introduce dw-mipi-dsi2
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I1865ea38e7b9431ad06282b16300a45989ca065f
2021-11-11 09:46:23 +08:00
Guochun Huang
d7e3e6de15 drm/rockchip: Add dw-mipi-dsi2 driver
Change-Id: Ib5e6a8eedd8d49b568057550571b4c5685110df9
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-11-11 09:46:23 +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
Cai YiWei
1a1a1d4ea8 arm64: dts: rockchip: rk3588s: Add isp unite node
Change-Id: I72ba08632bbec2bb81394bf9eacd0b3136751c81
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-10 21:15:13 +08:00
Cai YiWei
37aa6cff08 media: rockchip: isp: add dual isp unite config
Change-Id: I8b98811f063f260d33c2759277389eb49ba3a0c3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-10 21:14:00 +08:00
Cai YiWei
fdf9827947 media: rockchip: isp: fbc support crop
Change-Id: Idd2ddb7412870bfe7174f414463e03878eb8944f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-10 21:14:00 +08:00
Cai YiWei
221b6fccd9 media: rockchip: isp: sync dhaz params for dual isp unite
Change-Id: I917a6cfdce36ab41d59f61c1f56de972af249982
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-10 21:14:00 +08:00
Cai YiWei
e8b2b58cee media: rockchip: isp: params and stats for dual isp unite
Change-Id: I8d950102877ea37423baced71b1fec50aa9a92f6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-10 21:14:00 +08:00
Cai YiWei
da2794bb29 media: rockchip: isp: dual isp unite process image
Change-Id: Ia85adab95cce029ea0967c00bd7d0d51863d7d76
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-10 21:14:00 +08:00
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