Commit Graph

1080236 Commits

Author SHA1 Message Date
Elaine Zhang
ca983d4093 rtc: rk808: fix the rtc alarm status clean
The rtc alarm status must be cleared after alarm 1s or after the alarm
is disabled.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I0874a24d1a3c0e7fd5e8462871d508392f7853cc
2023-07-17 14:43:59 +08:00
Frank Wang
39f343ce4f usb: gadget: uvc: fix error return in bulk mode
When UVC gadget as bulk mode connect to Linux (tested on Ubuntu 18.04),
it may occur twice set_alt for streaming interface, and the UVC state
is moved to "UVC_STATE_STREAMING" before process stream on event, so
amend to check the uvc state value to fix stream on error return.

Fixes: d471d7168a ("usb: gadget: uvc: fix NULL pointer dereference when usb hotplug")
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: Ib0d65c161d8680186ae26b2c8a0f6116b599c158
2023-07-17 14:31:33 +08:00
XiaoDong Huang
5620310d92 ARM: configs: rv1106-tee.config: enable ROCKCHIP_SIP
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I78248590c6afa51986852997da20bdef6280fc61
2023-07-17 14:26:04 +08:00
shengfei Xu
3453ca5487 firmware: rockchip_sip: support the MCU config
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Id92dd91cd410207d3858be84e5b64409eca1f976
2023-07-17 14:26:04 +08:00
Damon Ding
764c782d27 arm64: dts: rockchip: rk3562: modify the default drive strength of lcdc pins
According to the SI report, set default drive strength
as below:

clk      level_4
den      level_3
hsync    level_3
data0-23 level_3

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ie14bb84e485c87a6f153bf0b23e13adeb21dadca
2023-07-17 14:19:35 +08:00
Sandy Huang
e2852b6423 drm/rockchip: vop2: Fix plane parameter check error at interlace mode
At interlace mode, the adjusted_mode->crtc_vdisplay will be div2 from vdisplay,
but the userspace is still set as adjusted_mode->vdisplay.

Fixes: bfc49df515 ("drm/rockchip: vop3: plane display size check use crtc_* parameter is more correct")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I6765e5486dc4d15b0b34b75370280d48500ef4da
2023-07-10 11:08:50 +08:00
Jon Lin
328145662f mtd: spinand: skyhigh: The vendor requires the devices to be patched
1.Double OIP=0 after page 13H
2.The nand flash does not support 84H and 34H command

Change-Id: Ie805f42a36e1a864115988087bdc43592cc94ded
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-07 18:10:08 +08:00
Jon Lin
718ca57be2 mtd: spinand: foresee: Support new device F35UQA001G-WWT
Change-Id: Icf2f439e2d7e05be100c22f352ef1473a27b0d29
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-07 17:58:55 +08:00
Jon Lin
390c4a232c mtd: spinand: foresee: Support new device F35UQA002G-WWT
Change-Id: Iff7ba4b10e477e950e11c51f4d68b7783a71075c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-07 17:58:42 +08:00
Jon Lin
1f6698fe5d mtd: spinand: fmsh: Support new device FM25S01BI3
Change-Id: I8fdd0bdc4913c31031f2298f206ee6a6025031e1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-07 17:14:35 +08:00
Jon Lin
c931cf5e00 mtd: spinand: fmsh: Modify incorrect information despite not used
Change-Id: I69cfb5f18155c33f1d76c56d270642d5393869ef
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-07 17:14:27 +08:00
Guochun Huang
297258e678 drm/bridge: analogix_dp: add support split area prop
Change-Id: I8520ee076b08ca86ae40f1fddeac2c0314eef7d1
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-07-07 16:38:02 +08:00
Guochun Huang
4f58666813 drm/rockchip: dsi2: add support split area prop
Change-Id: Ia96f8f40d2703865808b5cdc4e84b30a81d7c974
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-07-07 16:38:02 +08:00
Guochun Huang
cf4fecc4dc drm/rockchip: analogix_dp: support split mode with other display interface
Change-Id: I1a7e5215259ad669a9e6fe9dd79246b16e45d82d
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-07-07 16:38:02 +08:00
Guochun Huang
a0d31a5520 drm/bridge: analogix_dp: support dual connector with other display interface
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ic86b7237d7d01031ca761d557389426051c58eee
2023-07-07 16:38:02 +08:00
Guochun Huang
442df8e89b drm/rockchip: dsi2: support split mode with other display interface
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I78623fe2be99022a2a4ea7a7d3ef27578e094432
2023-07-07 16:38:02 +08:00
Guochun Huang
649255c0e3 drm/rockchip: drv: Add crtc_clock convert in drm_mode_convert_to_{split,origin}_mode()
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ia8138dca964ef619f4b99d7f07b30441cb39dca9
2023-07-07 16:38:02 +08:00
Guochun Huang
6ef5aaf99e drm/bridge: analogix_dp: mv mode_set to bridge .atomic_pre_enable
Change-Id: I4cabcb05cb1d67df6280f601ec1c920cb42bb6ce
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-07-07 16:37:50 +08:00
Guochun Huang
8cfb460899 drm/rockchip: dsi2: mv mode set to encoder .atomic_enable
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: If792fa3ee9471668023f873e147a48eef3e5b5e7
2023-07-07 06:53:42 +00:00
Yu Qiaowei
e74b58e2c6 video: rockchip: rga3: add support for more Porter-Duff blend mode
add support src-in/dst-in/src-out/dst-out/src-atop/dst-atop/xor/clear.

Change-Id: Ia2d82e49ea5a8b7477350a0c60c5c1b00e21bc2b
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-07-07 14:20:19 +08:00
Yu Qiaowei
038764c6c9 video: rockchip: rga3: remove old alpha config parameter
Change-Id: Idde78fa5ab7cd6cc341538814f4b7bbfc51e1c90
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-07-07 14:20:19 +08:00
Yu Qiaowei
95eb7b7b3f video: rockchip: rga3: Modify the log printing of alpha config
Change-Id: I789463d1a20869b7f265193e1b31fc7005354ebc
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-07-07 14:20:19 +08:00
Yu Qiaowei
b9708581c2 video: rockchip: rga3: remove the magic number in rga3 alpha config
Change-Id: I8367ff38ce7d33df31a84f1cccd1926a1a912ab2
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-07-07 14:20:19 +08:00
Yu Qiaowei
a82c6b3355 video: rockchip: rga3: remove the magic number in rga2 alpha config
Change-Id: I4d52001a3ba036883b474ea68414526ee1567827
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-07-07 14:20:19 +08:00
Yu Qiaowei
c02f302451 video: rockchip: rga3: print request_id and core_id when timeout
Change-Id: I019ba59fb2ccb579bcf858a599dbe78390780ac1
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-07-07 14:20:19 +08:00
Yandong Lin
122528de46 video: rockchip: mpp: vepu2: fix multicore dispatch err
Fix 2 issue:
1.The array_index_nospec will clamp the index within the range of
  [0, size).If no core is idle, it still return core_id = 0 that will
  cause core 0 dispatch to work.

2.Disable a core dose not take effect.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I939b0eee16fcec495b8cfe87aff3cb3e59044e5e
2023-07-07 14:14:17 +08:00
Yifeng Zhao
8bbf01958d ata: ahci: re-enabled FBS after issued software reset
The FBS feature may not be re-enabled if an error occurred
during soft reset. If the host supports FBS, this patch will
re-enable FBS at the end of soft reset.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I821bf5362c6be8ddf142823ad6b6268c797bcded
2023-07-07 14:12:13 +08:00
Caesar Wang
9cc8c48e1e ARM: configs: rockchip_linux_defconfig: disable CONFIG_DM_VERITY
1/ disable CONFIG_DM_VERITY

On Linux OS, it is not necessary to enable CONFIG_DM_VERITY by default,
only required if secureboot or security related functions are enabled.

2/ adjusting the config order

make ARCH=arm menuconfig, then make ARCH=arm savedefconfig
to check.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: If0c11c32bf3ea42a36fa7fa12fbd9cc4a464e200
2023-07-07 14:10:48 +08:00
Cai YiWei
c6188f5a41 media: rockchip: isp: no set clk if assigned-clock-rates in dts
Change-Id: I354adf062d05bbe62525370efd8ad43dce3347b4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-07-06 20:27:12 +08:00
Sandy Huang
99976d5c8b drm/rockchip: dsi2: Delete unused prop: USER_SPLIT_MODE
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: If5607a7175e556dc515f7755d5132cc86150c443
2023-07-06 20:25:13 +08:00
Sandy Huang
37812ccba9 drm/rockchip: dw_hdmi: Delete unused prop: USER_SPLIT_MODE
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I806390230b06d28ba7691df455460114d34fa0c5
2023-07-06 20:25:13 +08:00
Sandy Huang
079bbda800 drm/rockchip: vop2: rk3588 add support dual connector split mode
example:
    VP2 -> DSI0 -> LCD(show left  half image)
        -> eDP1 -> LCD(show right half image)

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ifdfb837a2b9cba198c8637a275125e25b9922f2c
2023-07-06 20:25:13 +08:00
Sandy Huang
54313858e8 drm/rockchip: drv: add split_area to identification left or right panel
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I1786ba74fb8a89684880df88de26a238042da654
2023-07-06 20:25:13 +08:00
Alex Zhao
3b030cda11 arm64: dts: rockchip: rk3399-evb: add WIFI,poweren_gpio for wifi
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I3f76cc6c3eeda80ba197c71667e6d59516d86dd3
2023-07-06 10:52:26 +08:00
Jon Lin
9ce72fd947 mtd: spinand: gigadevice: Sync with upstream
from commit: 5b7261b mtd: spinand: winbond: Add support for Winbond W35N01JW SPI NAND flash

Change-Id: Iabca09af99d7b94150c847653faf0275228b7144
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-06 10:37:24 +08:00
Cai YiWei
12191bb9bd media: rockchip: isp: sync isp stream_on end then to start working
Change-Id: Ic3256dd8a8af8e1d6432d400b7a98ea7a3857d6a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-07-06 10:36:51 +08:00
Luo Wei
601c236ec0 arm64: dts: rockchip: rk3588-vehicle: fix gmac pinctrl-name error
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I542bd51d414da77811a6c94d3739e29499c7215b
2023-07-06 10:36:23 +08:00
Jon Lin
f893305c91 mtd: spinand: dosilicon: Modify redundant ECC status bits
Change-Id: I80d37af0ecec18744bf6b3e1a8ef5b101330cce5
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-06 10:34:09 +08:00
Jon Lin
18390c37e3 phy: rockchip: naneng-combphy: Fix swing from 250mV to 650mV for rk3562 pcie
Fixes: 13639746fa ("phy: rockchip: naneng-combphy: Fix swing to 650mv under 100M refclk for rk3562")

Change-Id: If9bf594ec4183d4be62dd1f9edb24ecd30915f78
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-06 09:36:31 +08:00
Jon Lin
e52c72d489 PCI: rockchip: dw_ep: Fix wrong return value check
Fixes: c3f038c2dc ("PCI: rockchip: dw_ep: Delaying the link training after hot reset")
Change-Id: I9e14995caecce709d93d33b9e2b568a5eae91273
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-05 19:08:57 +08:00
Sandy Huang
971385101b Revert "arm64: dts: rockchip: Assign VOP_ACLK to 750MHZ for rk3588-linux.dtsi"
Assign VOP_ACLK to 750MHZ at rk3588s.dtsi, so reverts this commit 7836b77050.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I1dd48012246eb4d52d748bf489128fcf2885c30f
2023-07-05 18:00:08 +08:00
Sandy Huang
d20de9394c arm64: dts: rockchip: rk3588: assigned VOP_ACLK to 750MHZ
Assigned RK3588 VOP_ACLK as 750MHZ by default to support 8k output and improve
VOP performance.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ia4c75a9f04c655e4b26867bc87023812cdc7f82f
2023-07-05 18:00:08 +08:00
Sugar Zhang
2c39e5b72a arm64: configs: rockchip_defconfig: Enable TDM_MULTI_LANES
The I2S-TDM on Rockchip SoCs only support one data lane for tx and one
data lane for rx, but the codec devices may requires a normal tdm work
with more than one data lane.

Enable the TDM_MULTI_LANES to allow driver works under a higher sample
rate and with more data lanes.

More detail, see the driver patch comment.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Idbeeb00d4903e49fb3c0c3dfbb16b55125fe2da7
2023-07-05 15:44:27 +08:00
Jon Lin
e61f29a758 mtd: spinand: jsc: Fix the error method for judging flash ECC
The former method makes ECC effective value decreased from 4 to 1.

Change-Id: I069e62432bb339356070f5228fc7d65daca7b696
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-05 15:38:13 +08:00
Jon Lin
b66c344c7b mtd: spinand: unim: Fix the error method for judging flash ECC
The former method makes ECC effective value decreased from 4 to 1.

Change-Id: Ie5f37e291166661def40db015eac63c003719785
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-07-05 15:38:13 +08:00
Sugar Zhang
cb1aa9dde3 arm64: dts: rockchip: rk3588: Add pinctrl-idle/clk for PDM
pinctrl-default/idle/clk must be paired in the same iomux group.

DON'T USE pdm1m0-default with pdm1m1-idle

Ref: commit: 0d9748600792 ("ASoC: rockchip: pdm: Fix clk glitch on runtime PM")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Iea86fc5a16eaec8b39c31708228732b49ccda5d7
2023-07-05 11:03:43 +08:00
Sugar Zhang
91a11122a7 ASoC: rockchip: pdm: Fix unbalanced clk reference
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ib43aea6590349cddc5b9d8104e723de9e8697f86
2023-07-05 11:01:58 +08:00
Sugar Zhang
1f8e86a5ea ASoC: rockchip: pdm: Fix clk glitch on runtime PM
For controller which is managed by PD (power-domain),
when PD off, the controller is reset to the default
status, and the FRAC-DIV is a fixed value(1/20).

Once the mclk is enabled, there are some high freq cycle
leak, to fix this issue, we use the pinctrl-idle to
block these cycles until the config has been come back
to the normal state.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I4e34129277cffa7bc443b6addfb1e26b70bf546e
2023-07-05 11:01:42 +08:00
Elon Zhang
7d639c6705 ARM: configs: rv1106-tee.config: enable CONFIG_TEE and CONFIG_OPTEE
Signed-off-by: Elon Zhang <zhangzj@rock-chips.com>
Change-Id: I90d1ecc306cb0a15d34e837067ec7454193fe111
2023-07-05 10:49:37 +08:00
Zhihuan He
ac35846c24 arm64: dts: rockchip: px30s: reduce LP4 overshoot when ODT off
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: Ibf4ea2c6be203635fd5d4de37ebdd5c9c8aaf352
2023-07-05 09:57:23 +08:00