Commit Graph

1073078 Commits

Author SHA1 Message Date
Alex Zhao
ed56e6902a net: wireless: rockchip_wlan: bcmdhd: disable DHD_PKTID_AUDIT_ENABLED
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I71f3a86d5a722739a03daef68c50e70de4968dd9
2022-11-22 17:55:48 +08:00
Wyon Bi
56f0ad9953 drm/bridge: analogix_dp: Fix bpp value in analogix_dp_bandwidth_ok()
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I38fc9c1d95966204c89afffe15ce551ae8c3f62f
2022-11-22 17:55:26 +08:00
Tao Huang
deb783324d Revert "input: touchscreen: gt1x: ignore pin of reset and support power invert"
This reverts commit 334791b0d3.

Reason for revert:
The following warning appears on rk3588-evb1-lp4-v10 when suspend:
[   31.636037][  T414] unbalanced disables for vcc3v3_lcd0_n
[   31.636166][  T414] WARNING: CPU: 2 PID: 414 at drivers/regulator/core.c:2768 _regulator_disable+0x2e8/0x2f4
[   31.636191][  T414] Modules linked in: bcmdhd dhd_static_buf
[   31.636256][  T414] CPU: 2 PID: 414 Comm: composer@2.1-se Not tainted 5.10.110 #116
[   31.636279][  T414] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[   31.636309][  T414] pstate: 60400009 (nZCv daif +PAN -UAO -TCO BTYPE=--)
[   31.636338][  T414] pc : _regulator_disable+0x2e8/0x2f4
[   31.636366][  T414] lr : _regulator_disable+0x2e8/0x2f4
...
[   31.636950][  T414] Call trace:
[   31.636980][  T414]  _regulator_disable+0x2e8/0x2f4
[   31.637009][  T414]  regulator_disable+0x40/0x84
[   31.637036][  T414]  panel_simple_unprepare+0x78/0xa4
[   31.637064][  T414]  drm_panel_unprepare+0x28/0x48
[   31.637094][  T414]  dw_mipi_dsi2_encoder_disable+0x70/0xbc
[   31.637123][  T414]  drm_atomic_helper_commit_modeset_disables+0x174/0x4d0
[   31.637154][  T414]  rockchip_drm_atomic_helper_commit_tail_rpm+0x44/0x184
[   31.637180][  T414]  commit_tail+0x110/0x200
[   31.637209][  T414]  drm_atomic_helper_commit+0x1f0/0x210
[   31.637238][  T414]  drm_atomic_commit+0x50/0x64
[   31.637268][  T414]  drm_mode_atomic_ioctl+0x620/0x744
[   31.637298][  T414]  drm_ioctl+0x24c/0x3b8
[   31.637328][  T414]  __arm64_sys_ioctl+0x94/0xd0
[   31.637359][  T414]  el0_svc_common+0xc0/0x23c
[   31.637388][  T414]  do_el0_svc+0x28/0x88
[   31.637417][  T414]  el0_svc+0x14/0x24
[   31.637446][  T414]  el0_sync_handler+0x88/0xec
[   31.637474][  T414]  el0_sync+0x1a8/0x1c0

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id27946e0ef3a6c320214c961b8e9b02978a15f6b
2022-11-22 17:43:26 +08:00
Jian Zheng
6a39dba2e5 ARM: configs: rv1106-cvr.config: based on rv1106-evb.config
Separate the config for the cvr product definition

Signed-off-by: Jian Zheng <zj@rock-chips.com>
Change-Id: I94040ee07992e694df6d307dead7febea78b84ec
2022-11-22 15:33:27 +08:00
Yu Qiaowei
4bf27cc8c8 ARM: dts: rockchip: rk3288-linux: fix rga to rockchip,rga2
Fix compatible of rga to "rockchip,rga2", and modify the clock names
to work fine with current driver.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Icd30ef8e090aceedbc680eb39c4a0c5b00869102
2022-11-22 15:17:43 +08:00
Zhen Chen
034aad5dd8 MALI: rockchip: upgrade bifrost DDK to g15p0-01eac0, from g13p0-01eac0
Note, the corresponding mali_csffw.bin for DDK g15 MUST be used.

Change-Id: Ic30634fa6247d62bf96f506c64d13b89e16b02e6
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2022-11-22 14:13:04 +08:00
Yu Qiaowei
96e93dba44 video: rockchip: rga3: fix misconfiguration of updating lut table mode
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I120b57fcb2c190a3e9cba7cb49ecbb0035e498ea
2022-11-21 17:47:26 +08:00
Yu Qiaowei
f13dae5b9c video: rockchip: rga3: iommu device uses slave mode
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I1ab682d3ee687ae13ba4d7c252d1d9ec25875efd
2022-11-21 17:47:25 +08:00
Lin Jinhan
84d08ffd32 media: i2c: add gc1084 support
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Idecacd6d217659a908de09517d10db02dd438478
2022-11-21 16:30:10 +08:00
Jian Zheng
68f953fab3 ARM: dts: rockchip: rv1106g-evb-v11-cvr: do not include rv1106-evb-ext-rgb-v10.dtsi
Due to the reuse of pins on the evb board,
wifi enable requires that rgb be temporarily turned off

Signed-off-by: Jian Zheng <zj@rock-chips.com>
Change-Id: I7f19d8d6ea80faee66dc1c44bb06b9e0d1507edf
2022-11-21 15:00:38 +08:00
David Wu
720d1c7da4 arm64: dts: rockchip: rk3568: Add xpcs_eee clk for gmac xpcs
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Iba2c79b343273751ea87f30be8f257a2539447c2
2022-11-21 14:21:51 +08:00
David Wu
13c8f4001f ethernet: stmmac: dwmac: Enable xpcs_eee clock for sgmii mode
If xpcs_eee clock was not enabled, the sgmii mode cannot work
after suspend/resume.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: If187b8e3344553f2e7062c677b1a851a761b5a18
2022-11-21 14:21:51 +08:00
Steve French
e361a115eb UPSTREAM: cifs: lease key is uninitialized in smb1 paths
It is cleaner to set lease key to zero in the places where leases are not
supported (smb1 can not return lease keys so the field was uninitialized).

Addresses-Coverity: 1513994 ("Uninitialized scalar variable")
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Steve French <stfrench@microsoft.com>
(cherry picked from commit 625b60d4f9)
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I0cef58f5169c3e2b2fbe427f2340c277174a2be0
2022-11-21 14:16:22 +08:00
Jianlong Wang
ad1c79a5b7 ARM: dts: rockchip: rk312x-linux: enable mpp_srv node
Change-Id: Ic226f8ccdb8cdb803fad3c6e450aeb9d0115ea82
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2022-11-21 14:13:53 +08:00
Steve French
38a4540cd6 BACKPORT: cifs: fix SMB1 error path in cifs_get_file_info_unix
We were trying to fill in uninitialized file attributes in the error case.

Addresses-Coverity: 139689 ("Uninitialized variables")
Signed-off-by: Steve French <stfrench@microsoft.com>
(cherry picked from commit e39df24169)
Change-Id: Id02f0a50c2ba3505bb8f5538f489e451c9423c0b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-21 11:35:58 +08:00
Wang Panzhenzhuan
ae4ab91e5e media: i2c: s5kjn1: fix low probability mipi error issue
1. add delays in setting to fix probability wrong reg writed.
2. add register setting readback check support.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: If74df1f175d09e63c33b47a63c321c024f70c6f2
2022-11-21 10:04:39 +08:00
David Wu
fe04d8bac2 ARM: dts: rockchip: rk3036: Change the property for emmc/sdio/sdmmc nodes
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I332b505d937eb97a26400ff9882b3d58401a00bf
2022-11-21 10:02:35 +08:00
Jason Zhu
7fdefc3445 ARM: dts: rockchip: rv1106: delete unused clk info of acodec
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Iadd90b902ca73b576ba6c1d8c6013dc6d9375709
2022-11-19 15:48:43 +08:00
Jason Zhu
59f45fdccd ASoC: codecs: rv1106_codec: use interface set_sysclk to set clk
Instead of setting clk by node mclk_cpu.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ib54d219d4f0ad488722524aac7effb4b019d1b7e
2022-11-19 15:48:43 +08:00
wlq
276bad482b arm64: dts: rockchip: px30: disabled uart dma
Change-Id: I1a1343459c0a67393d22be3101cd8d269a2f26f0
Signed-off-by: Wuliangqing <wlq@rock-chips.com>
2022-11-19 15:45:53 +08:00
Finley Xiao
57b8f4d774 clk: rockchip: rk3036: leave apll for core, mac and lcdc only
In order not to affect other clocks, remove the apll from the
parent list of other clocks and only core, mac and lcdc can
select apll as parent.

Change-Id: I58b995f8ccf69c6564f74b5823f618a186030d70
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2022-11-19 15:44:53 +08:00
David Wu
8b37dde38e ARM: dts: rockchip: rk3036: Keep the pwm pins default pull state
In order to ensure the accuracy of PWM voltage regulation, keep
the pull state of PWM consistent with the default; The pull state
has little effect on other case such as output mode.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I4d4813a9426e45a1c3f3690603b63c57addcdb73
2022-11-19 15:42:23 +08:00
Steven Liu
99f754dcaa Revert "ARM: dts: rockchip: Fix UART pull-ups on rk3036"
This reverts commit eb04688f6f.

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ifbc43c2b6ba476fcc3c50c71b21b05aee4dd91c4
2022-11-19 15:38:27 +08:00
Steven Liu
7a35e84b14 Revert "ARM: dts: rockchip: Fix UART pull-ups on rk3066a"
This reverts commit dd2f0befb2.

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I6efc99eea9740888fa0b7b311435c394381c7d9f
2022-11-19 15:38:27 +08:00
Steven Liu
f340fd1bf0 Revert "ARM: dts: rockchip: Fix UART pull-ups on rk312x"
This reverts commit 026248a29f.

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I71c65cee85fbe72b7bb6aefbf610cb2e6264ec3a
2022-11-19 15:38:27 +08:00
David Wu
54162171af net: phy: rk630phy: Add agc offset for initial flow
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ibea8e37f7cf6e462ef281981c2529b6126287b9f
2022-11-19 15:34:50 +08:00
XiaoDong Huang
9cc95efeb5 PM / devfreq: rockchip_bus: add support for rk3588
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: If03fa9331168187dabf6f97cc38354f0b560fc1c
2022-11-19 15:26:03 +08:00
XiaoDong Huang
8fedbbb946 PM / devfreq: rockchip_bus: support parse soc-bus-table
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I76ff30103cfa93289b9ecde0d95f42f960284e9b
2022-11-19 15:26:03 +08:00
Shuangjie Lin
1cde5fb12c driver: rknpu: Fix system interrupt signal cost rknpu wait error
Using wait_event_timeout() replace wait_event_interruptible_timeout().

Change-Id: I53481d25cb96a86a6262672bb65e9a2ed942164a
Signed-off-by: Shuangjie Lin <shuangjie.lin@rock-chips.com>
2022-11-19 15:00:55 +08:00
Yiqing Zeng
70de50acbb ARM: dts: rockchip: support ov13850/gc8034 for rk3288-evb-rk808-linux
Change-Id: I84c7e782a99270a29de0976b97784ccc73b35bad
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
2022-11-19 14:39:21 +08:00
Yiqing Zeng
14a26d6f6b ARM: configs: rockchip_linux_defconfig: add gc8034 config
CONFIG_VIDEO_GC8034=y

Change-Id: I44c5cf192936f668a9b3c9322136781070435e48
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
2022-11-19 13:19:22 +08:00
Yiqing Zeng
7cfaa4a10f ARM: configs: rockchip_linux_defconfig: enable rkisp1 config
CONFIG_VIDEO_ROCKCHIP_RKISP1=y

Change-Id: I11f913c8f04efd2eb53fb63d5ebe24c0e072d915
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
2022-11-19 12:05:08 +08:00
Jianqun Xu
e733a7a8b3 clk: rockchip: fix to SIP_V2 for rk3288
Fixes: d2b92a90ea ("clk: rockchip: support setting ddr clock via SCPI and SIP Version 2 APIs")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I7521443f50dbe3049fd8a08c769a74f5e364334a
2022-11-19 11:59:55 +08:00
Jianqun Xu
a6a8f8d0a3 clk: rockchip: rk3288 set aclk_peri_niu as critical
Fixes: 938e2f2261 ("clk: rockchip: drop use of rockchip_clk_protect_critical()")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I65b4dd2f380d30d7638212234ff23dc17e2d4349
2022-11-19 11:55:47 +08:00
Sugar Zhang
70e4176f1c ARM: dts: rockchip: rk3288-evb: split i2s mclk pinctrl from i2s bus
because currently mclk is handled by codec side, so the
associated pinctrl should be handled by codec too.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: If9c2d2fdedbc2673b2fe0e6738ed8fb54c98a0ba
2022-11-19 11:50:52 +08:00
Sugar Zhang
cdea157c04 ARM: dts: rockchip: rk3288: split i2s mclk pinctrl from i2s bus
because currently mclk is handled by codec side, so the
associated pinctrl should be handled by codec too.

Change-Id: I0611b7a291351a20f72b5124c501dc79d92787d6
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-19 11:50:13 +08:00
Lin Jinhan
8c99ad8b0f ARM: dts: rockchip: rk3288-linux: Enable rng node
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I581f17e04b20493c979b275b1b8624a0af7809c9
2022-11-19 11:44:49 +08:00
Lin Jinhan
d3593fabde ARM: dts: rockchip: rk3288: add rng node
rng node is compflict with crypto node, so default disable
rng node and crypto node.

Change-Id: I9a28108a5667f88c15d5cc9916d927115cdb8918
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-19 11:44:03 +08:00
Jianqun Xu
0a4c984ad0 ARM: dts: rockchip: rk3288: fix 'gpu_thermal' to 'gpu-thermal'
The midgard reports a error about the thermal zone as following:

[    6.242958] midgard ffa30000.gpu: GPU identified as 0x0750 r1p0 status 0
[    6.249761] midgard ffa30000.gpu: Protected mode not available
[    6.255837] midgard ffa30000.gpu: l=-2147483648 h=2147483647 hyst=0 l_limit=0 h_limit=0 h_table=0
[    6.264833] Error -19 getting thermal zone 'gpu-thermal', not yet ready?
[    6.271551] midgard ffa30000.gpu: recalculation of power model mali-simple-power-model returned error -517
[    6.281210] midgard ffa30000.gpu: IPA initialization failed
[    6.281333] devfreq ffa30000.gpu: Couldn't update frequency transition information.
[    6.294566] midgard ffa30000.gpu: Continuing without devfreq
[    6.300568] midgard ffa30000.gpu: Probed as mali0

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I6ff5a0bd5679e7b7c3b657c475b0a788eb03f24a
2022-11-19 11:41:54 +08:00
Liang Chen
25e9b5b53a ARM: dts: rockchip: delete gpu 100MHz for rk3288
100MHz will hurt performance when app startup.

Change-Id: Ia55a5f53b101559b9d6b94ca98609f7072df6d86
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-11-19 11:41:22 +08:00
Finley Xiao
89c19af784 ARM: dts: rockchip: rk3288: Add performance configuration for gpu
Change-Id: Iac51c59395c3111d267b50aea69a2704442def1b
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-19 11:40:39 +08:00
Jianqun Xu
723f0eabf6 ARM: dts: rockchip: rk3288-evb add support for GSL3673
GSL3673 is a touchscreen device, let support it.

Change-Id: I4bf302c395491ca49a1874c8984caa0b49cfb326
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-19 11:38:08 +08:00
Jacob Chen
641b252347 ARM: dts: rockchip: rk3288-evb enable high speed on sdcard
Change-Id: Idd855fb565dde2e47891f6676175c6573c245fcd
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-19 11:37:43 +08:00
Jianqun Xu
6e89c6ee15 ARM: dts: rockchip: rk3288-evb disable uart 1/3/4
Uart3 has been iomux to gpio, for vcc_3g regulator, which is designed
on rk3288 evb main board.

Disable unused uarts to fix gpio request blame during system booting.

Change-Id: I2eb79ae63a6f226255c12fc3da9ba95ec4219d32
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-19 11:36:35 +08:00
Nickey Yang
13155994fc ARM: dts: rockchip: rk3288-evb support AP6335 wifi and bt
This patch add and enable AP6335 wifi node for rk3288-evb

Change-Id: I49e7f6a67130a105579627d30db55010967da57a
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-19 11:35:29 +08:00
Jianqun Xu
dcb9d29dbf ARM: dts: rockchip: rk3288-evb add rockchip-relinquish-port quirk for ehci
This adds force abnormal ohci relinquish port owner
and back to ehci on rk3288 SoC.

Change-Id: I33be55c08762be7e8a239f741a8c8dbb28522306
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-19 11:34:27 +08:00
Jianqun Xu
bc82ddeea8 ARM: dts: rockchip: rk3288: add alias for dsi0 and dsi1
Fixes: 69870f9db0 ("ARM: dts: rockchip: rk3288: fix display related nodes")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ie929fa6ef965bf69ad1e0b4eb383535352068f84
2022-11-19 11:33:18 +08:00
Jianing Ren
674536165c ARM: dts: rockchip: rk3288: Add otg-bvalid interrupt
Change-Id: Id652b5ba4c16f8a53cc5bee9cd50fecfacff45c1
Signed-off-by: Jianing Ren <jianing.ren@rock-chips.com>
2022-11-19 11:32:31 +08:00
Finley Xiao
3673d0a600 ARM: dts: rockchip: rk3288: Assigned i2s_src parent to GPLL
The default parent of i2s_src is 200MHz CPLL, it doesn't meet
the constraint of fractional divider that denominator must be
20 times larger than numerator.

Change-Id: I986525ca7a92cb5883facd1b6e89079398302856
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-19 11:31:12 +08:00
Frank Wang
bcb9689220 ARM: dts: rockchip: rk3288: Add utmi clock for ehci and ohci
This change adds USB-PHY output clock reference for EHCI and OHCI.

Change-Id: I39e91fed99756a86c83fe9332587c6630a5e5853
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-11-18 11:24:44 +08:00