Commit Graph

1080381 Commits

Author SHA1 Message Date
Zefa Chen
684fcdf113 media: i2c: sc530ai change mipi data rate to 936Mbps/lane and vblank up to 6ms
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If172f3b0036efb1ab437d04f05d80360c464a8ad
2023-08-14 14:39:58 +08:00
Elaine Zhang
7a72bc05dc clk: rockchip: rk3588: fix up the frac pll calculation
rk3588 frac pll:
FFVCO = ((m + k / 65536) * FFIN) / p
FFOUT = ((m + k / 65536) * FFIN) / (p * 2s)
k is the original code, but the K[15:0] is complement code
(6'b1000_0000_0000_0000 <= K[15:0] <= 16'b0111_1111_1111_1111),
need to be converted.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I107d31d910d260c83891d5b6e927f119761d6fba
2023-08-11 18:57:20 +08:00
Jianwei Zheng
d0e6f8a073 phy: rockchip: naneng-combphy: fix U3 RX long cable test failed for RK3528
1.Set slow slew rate control for PI
2.Set CDR phase path with 2x gain

Signed-off-by: Jianwei Zheng <jianwei.zheng@rock-chips.com>
Change-Id: I2d0811b0be7b1d4764ecd738d069b06e4da5eaa2
2023-08-11 18:29:16 +08:00
Sugar Zhang
b59d476403 ASoC: rockchip: i2s-tdm: Fix register access in probe
MUST: after pm_runtime_enable step, any register R/W
should be wrapped with pm_runtime_get_sync/put.

Another approach is to enable the regcache true to
avoid access HW registers.

Alternatively, performing the registers R/W before
pm_runtime_enable is also a good option.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I69dd66230cba636d2ccb31ec01a21be1a482a0e3
2023-08-11 18:18:02 +08:00
Sugar Zhang
f8a6ea7388 ASoC: rockchip: sai: Fix register access in probe
MUST: after pm_runtime_enable step, any register R/W
should be wrapped with pm_runtime_get_sync/put.

Another approach is to enable the regcache true to
avoid access HW registers.

Alternatively, performing the registers R/W before
pm_runtime_enable is also a good option.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ife9b1a0e6f75e714bfb6e7c0d472e4603fa8cd8f
2023-08-11 18:17:10 +08:00
Damon Ding
f9a676b76c arm64: dts: rockchip: rk3308: update property logo,kernel
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ie9fc628b49634e68207629b443331293486f13e7
2023-08-11 18:13:29 +08:00
Damon Ding
fcbe35b5ec pwm: rockchip: add a little delay to make sure conlock works
The conlock can help to update period and duty when pwm
is working. It takes 10 dclk cycles to make sure lock
works before unlocking.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Id750580b409a24e660d208e80417d4169def02ed
2023-08-11 18:12:20 +08:00
Algea Cao
d76dbd3976 drm/bridge: synopsys: dw-hdmi-qp: filter hdmi 2.1 resolution when enable-gpio is not configured
Change-Id: I84e6a7f295441c9a9b6ae2cdb897d88c81582480
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2023-08-11 18:08:26 +08:00
Chen Shunqing
aa26c9fbd9 drm/bridge/synopsys: dw-hdmi-qp: fix color error in DVI mode
1. Only RGB output in DVI mode.
2. Only HDMI1.4 is supported in DVI mode.

Change-Id: If905a939cdc6602761b2fc235fec7af88e78d307
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
2023-08-11 15:43:48 +08:00
LongChang Ma
55e0b705bc ARM: dts: rockchip: support dual sc301iot for rv1106-evb-dual-cam.dtsi
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: Ib53cd7bd6189099b737b6e916c02dbdedff4d5f7
2023-08-11 15:43:25 +08:00
Jianqun Xu
4324b23189 arm64: dts: rockchip: rk3588-vehicle-adsp-audio-s66: correct i2s3 iomux
This patch fixes the iomux error for i2s3 lrck and sclk pins.

Change-Id: I0065ab2bd51c9ddfb7f6ed749d1a99601b802260
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2023-08-11 11:03:55 +08:00
Lin Jianhua
8c9c0c25d5 arm64/configs: add rk3308bs_mipi_display.config for support mipi display
Change-Id: I0ab04c742134f96ba16587b8b9cf0684ba2de56b
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
2023-08-11 08:24:45 +08:00
Shunhua Lan
d449b25d6b arm64: dts: rockchip: rk3399-evb: use multicodecs instead simple card
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: Idb6c8165afcbe8264a7b12a00c8e0f790a61210b
2023-08-10 18:26:56 +08:00
Zefa Chen
f327669a8c media: rockchip: vicap: fixes create dummuy buffer fail with size 0
Some sensor drivers do not implement enum_frame_interval function, will cause this error

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I63b8a52230b043d5c9ff29db9cb36faed02a7e8f
2023-08-10 16:56:31 +08:00
Chen Shunqing
0a62148e37 drm/bridge/synopsys: dw-hdmi-qp: Add support for external bridge
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: Ie6fe2e63f24a9c5656af7b7cd0f17ca484a099df
2023-08-10 16:47:53 +08:00
Wang Panzhenzhuan
bea46d648b video: rockchip: vehicle: remove vehicle dev when exit
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I7e64cc679b40f341601fc0085d1c548b99932913
2023-08-10 16:47:19 +08:00
Shawn Lin
02ee7a133e PCIe: dw: rockchip: rework compliance test settings
There are three types of compliance mode test requirement right
now, consolidate them together:
[1] SMA tool: rockchip,compliance-mode = <0 ANY_VALUE_FROM_0_TO_10>;
[2] Soldered board: rockchip,compliance-mode = <mode preset>;
    mode: 1->Gen1  2->Gen2  3->Gen3
    preset: 0->p0 1->p1 2->p2 .... etc.
[3] lookback: same as SMA tool case

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I180b4881d827e3c2f0fc22f0bab4ca165be44c19
2023-08-10 16:46:34 +08:00
Wang Panzhenzhuan
7d42e40890 drm/rockchip: direct_show: add cached buf cpu access begin & end
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I195bdf4594d0d260dae516a0f8544b0da4f08840
2023-08-10 09:50:32 +08:00
Cai YiWei
fcd4ffc474 media: rockchip: isp: add api get isp work mode for rockit
Change-Id: I279283df68deb3118f3971138d23c13d952de76d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-08-10 09:17:57 +08:00
Jianwei Fan
0a477570d3 media: i2c: rk628: fix 5V detect event report
Change-Id: I35303abc9376c45233b06319bd618e394874ae71
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-08-10 09:14:45 +08:00
Cai YiWei
7849498ea2 media: rockchip: isp: fix refer to sram info for multi sensor
Change-Id: I7be5763b7e54f320223ba8049e1795056e6f8917
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-08-09 16:27:33 +08:00
Cai YiWei
9566e631a7 media: rockchip: isp: fix stream init pause state
Change-Id: Ic35cc1036108e8fe0d5e75881fd976aeefab714c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-08-09 16:27:24 +08:00
Jon Lin
4774d90260 mtd: spinand: xtx: Fix XT26G11C ecc status ops
Change-Id: Iaaeb9b3959a9ecf7fa2f33484dd04a35740d8a2e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-08-09 16:22:37 +08:00
Elaine Zhang
582cfd38c1 net: can: rockchip: support rk3568 can v2
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I0d977d3c95e29b5f05e5e2c1681bdf2ad951e70a
2023-08-09 16:09:59 +08:00
Guochun Huang
46449e5334 drm/rockchip: dsi: set vop2 standby before command mode in rk3566/rk3568
Change-Id: I49bd967dfb6c561a7c187cb075ff0192f6caf69a
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-08-09 06:34:11 +00:00
Zefa Chen
ec69911288 phy: rockchip: csi2-dphy: fixes hw_dev num error for rk3562
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I8c2c6f392ea05264a5b173d22dea525ba86e5a20
2023-08-09 11:08:39 +08:00
Yandong Lin
4ae0e6cdb3 video: rockchip: mpp: fix share reset_group do not take effect
Some device share one pd, but reset control are different.
It should share a reset_group to ensure that one device can
not do reset while anothor is running.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I53527a053d0835085522396e2d9ee649d78325a5
2023-08-08 15:05:06 +08:00
Caesar Wang
7b61a88574 arm64: dts: rockchip: update rk3399-sapphire-excavator-lp4-linux.dts
1/ The backlight is for the eDP panel and it has the connector on the
   excavator baseboard.

2/ remove cdn_dp

Fixes: 5a2a93f1ee ("arm64: dts: rockchip: move backlight from rk3399 sapphire to excavator")

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I4de565a2658b9a26f7b4155fce03db875703fa0d
2023-08-04 18:12:19 +08:00
Damon Ding
8cfd518aab ARM: dts: rockchip: fix timing configs of panel k350c4516t for rv1103/rv1106 evb
1. Modify mcu-timing configs according to panel datasheet.
2. Modify clock-frequency config sync with mcu-timing
   configs.
3. Add more comments for panel initialization sequence.
4. Add 10ms delay before sending initialization sequence
   to make sure the reset gpio output a low pulse.
5. Remove unused parameter reset-value.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ib0b5266de5612aa369be89c1c8edf1f4a5025c3f
2023-08-04 16:46:21 +08:00
Damon Ding
dd2b9adc1a drm/rockchip: rgb: add mcu_max_dclk_rate for mode_valid check
The max dclk rate of rgb interface is limited by lcdc
io rate, and that of mcu interface is limited by vop
input rate.

In addition, modify the check of mcu panel, and replace
the flag is_mcu_panel by np_mcu_panel.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I329715aff21f67baf0187cb06b31ffb65f2e9517
2023-08-04 16:45:41 +08:00
Damon Ding
ea3b81ee34 drm/rockchip: drv: fix the dclk calculation of mcu interface
dclk = htotal * vtotal * frame-rate * cycles-per-pixel * pix-total

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I6b78463dc8290f562cfe44040d6b6030d652213d
2023-08-04 16:31:30 +08:00
Elaine Zhang
8405687e7c rtc: rockchip: fix up the rtc compensation value
rtc compensation value needs to be converted to a bcd code.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ic24a5ba0c31c42b804d1efa65702e680bae26630
2023-08-04 15:39:20 +08:00
Shiqin Chen
84a85ea4a6 arm64: dts: rockchip: rk3568-toybrick-sd0: change gmac1 txdelay
Signed-off-by: Shiqin Chen <chensq@rock-chips.com>
Change-Id: I8fbaf468dc41b4da91345a089c0fcd3eb560a6b4
2023-08-04 15:17:44 +08:00
Shawn Lin
2a8db47d13 mmc: dw_mmc: Add some safe delay for releasing power leak
Add some delay for some broken card which need long time to
release the remain power leak. 200ms is very safe, no need to
bother device tree property, as it depends on card not board.

Fixes: 60c9e5240f ("mmc: dw_mmc: Add normal and idle pinctrl control")
Change-Id: I5437945cd860674be860d246200e15eed9d91e03
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
2023-08-04 14:50:39 +08:00
Yandong Lin
54ff36c469 video: rockchip: mpp: fix irq on poweroff for rkvdec2_link
rkvdec2_link_power_off():
    power_enabled = 0 -> disable irq -> power off

rkvdec2_link_irq():
    if power_enabled == 0 -> return and not clear irq

there is a corner case:
   1. after power_enabled flag set to 0 and before disable irq
   2. irq coming
   3. irq return and not clear irq
   4. repeat step 2

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I284bf40acb19e0c48cf04e526a534fec6383eb11
2023-08-04 14:50:04 +08:00
Yandong Lin
1173b14159 video: rockchip: mpp: fix reset_group protected range
In some platform, there are some devices share PD.
If one device is doing pmu idle request to cru reset and
at this time cpu want to read/write reg for the device will crash.

So use the reset_group to prevent the case.

There is a issue that reset_group protected range not enough,
so fix it.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ide32966f7cff842e4611213d26901617fd57bc14
2023-08-04 14:36:41 +08:00
Shunhua Lan
9bef8f31ad arm64: configs: rockchip_defconfig: Enable RT5651 for rk3399 excavator evb
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I09cdf40fdeac8dccc13c3a4b3ec4d3b58c2c35e3
2023-08-04 10:06:30 +08:00
Chen Shunqing
0cb0d5f1ec media: rockchip: hdmirx: fix CTS HF2-86 test fail
If sample_flat field is set to 1, there can't be any sound.

Change-Id: I56ad87d1165fe7d1cc993f9522c4e6d50c253b80
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
2023-08-03 16:48:13 +08:00
yuefu.su
b406f355a2 media: i2c: update sc230ai again map
Signed-off-by: yuefu.su <yuefu.su@rock-chips.com>
Change-Id: I6c5928d5bbb73a9d32a809f6750160a8730c0100
2023-08-03 16:46:04 +08:00
Lin Jinhan
203965847c crypto: rockchip: utils: optimize alignment criteria
There is no length alignment requirement for the last scatterlist.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I9625bce9379cef4c1a8507ba523f5f303d60c9e6
2023-08-03 11:56:23 +08:00
Lin Jinhan
43f141406e crypto: rockchip: Fixed the timeout timer being triggered incorrectly
If the time required for a single data calculation exceeds 3 seconds,
timeout occurs.The timeout timer should be reset after the CRYPTO irq
interrupt is triggered.

Change-Id: I21516ba57bfc8eef3b22624e4ed95523d000cee2
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2023-08-03 11:45:59 +08:00
Guochun Huang
c19bda6df3 phy/rockchip: samsung-hdptx: make deskew fifo works on shared pointer
the deskew fifo works on its own pointers may cause inter-lane skew
to exceed the vesa standard, this poses a risk of errors in dp sink
parsing MSA packet which inserted in data stream

Change-Id: Ia3bdfaed8696c8f7f21f39f0b55d18b1dce7761f
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-08-02 15:05:08 +08:00
Zhihuan He
ed5a9690cf arm64: dts: rockchip: px30: delete dmc 528MHz and en 666MHz ODT
For a more stable system, delete the 528MHz frequency and open
the 666MHz frequency ODT.

Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: I0354c6dde8f39a9b41878446475ee3acbe1be729
2023-08-01 10:21:40 +08:00
Ziyuan Xu
8ea19e3343 soc: rockchip: tb_service: fixes the register haven't been handle
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I3af3e5fd3b4725448363a1d8419dc4b9854f6cc6
2023-07-31 20:19:39 +08:00
Zhang Yubing
23299c62a5 drm/rockchip: drv: fix the config csc data issue
Fixes: 6bd92608df ("drm/rockchip: drv: get acm and csc info when boot")

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I0dd41b229fce0c85bd3df03f03b4b40da06ef53a
2023-07-31 18:14:37 +08:00
Liang Chen
60dc45eb33 soc: rockchip: cpuinfo: Add support for rk3528a
Change-Id: I62baecdb5a5d10329dbe7c36fdae9a6df15ccc57
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-07-31 18:12:53 +08:00
Algea Cao
6926979cb0 drm/rockchip: dw_hdmi: Fix crash caused by hotplug in uboot
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Id22025a2b464e68ac3683587eb808975439096df
2023-07-31 14:53:20 +08:00
Zhang Yubing
bf9c5670ae drm/rockchip: vop2: report vividhdr feature by property
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I2d680b2066050ca2eeba0947936cc43a8855cbb1
2023-07-31 11:47:49 +08:00
XiaoDong Huang
6d2677915d soc: rockchip: pm_config: support mcu-sleep-config
We configure "mcu sleep parameters" based on
shared memory and atags.
Refer to the following example to configure dts:

rockchip_suspend: rockchip-suspend {
	...

	rockchip-mcu-sleep-cfg {
		...

		mcu-cec-wakeup {
			rockchip,tag = <RK_ATAG_MCU_SLP_CEC>;
			rockchip,params =
				<0x0 0x1 0x2 0x3>;
		};

		...

		mcu-uart-wakeup {
			rockchip,tag = <RK_ATAG_MCU_SLP_UART>;
			rockchip,params =
				<0x3 0x2 0x1 0x0>;
		};

		...
	};

	...
};

Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I9cb9107334c8ae91add2d4055cfb48cf46bc3e73
2023-07-28 15:52:32 +08:00
Tony Xie
db0e436dec arm64: dts: rockchip: rk3308b-amp: support config amp os irqs
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: I03ebaca4483c0c4d7be3e42a06774ec87cb8475e
2023-07-28 15:20:46 +08:00