Merge made by the 'ours' strategy.
* commit 'eeaca8874ba3e1b1050851af26a343240a41dd84':
mtd: spi-nor-ids: support PY25Q128LA
Change-Id: I28b3d789c1a3d7249799c91f8de59e20bd55d931
* commit '7f0033da72d88ee351d2e0fc798c8912aa27a6e4':
drm/rockchip: vvop: fix a potential race condition when vvop_disable_vblank
drm/rockchip: vop2: Fix possible_crtcs error for cursor plane
media: i2c: maxim2c: driver version v2.00.01
drm/rockchip: vvop: add support to multiple CRTCs
drm/rockchip: dw-dp: fix warning Using an uninitialized value mode.head when calling drm_mode_copy
ARM: rockchip: rv1106: delete RV1106_GPIO0_A1_LOWPOWER
media: rockchip: vicap: fixes error when register multi dev
ARM: rockchip: rv1106: pull up gpio0_a4 for lower power
drm/rockchip/rk628: combtxphy: ref_clk should not be zero
drm/rockchip: dw_hdmi: Fix warning `Using an uninitialized value mode.head when calling drm_mode_copy`
crypto: rockchip: Fixed a warning found by static code scanner
drm/rockchip: vop: init mcu_frame_st as 0 in vop_mcu_mode()
Change-Id: If2ba1d4430f861070e583ce605a71061e4d76473
Merge made by the 'ours' strategy.
* commit 'df698fe006e7c20c17e6dd3c3a042da6f8bd0660':
clk: rockchip: avoid division by zero
Change-Id: Id8e76699a5c2cf216eaa0d54b4a0397f23403e2a
Merge made by the 'ours' strategy.
* commit 'c95ecab515064933a8186fadac06a0100e94cef0':
mmc: add timeout for write data and reset while recovery
Change-Id: Icb8f2a6fa38d6dba0347069ccd766f085b3e2afb
Some problematic TF cards may stop at busy state during
the data writing process, and the mmc controller needs
to add a timeout processing.
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I11b75910f99eb040fa364990049f5cfe74fccfbf
* commit 'c252d35d35d09a9be3b0fb9b216304f641d1e83e':
media: rockchip: vicap restore sequence of sof after resume
media: i2c: imx577: fix exp_def because exp must less than (vts - 22)
Change-Id: I6ad49593319eff382f6dcca794137400e46aceb3
Merge made by the 'ours' strategy.
* commit '4997ee78fe6800c5b4935efa50c8dcf242232297':
arm64: rockchip_linux_defconfig: Enable CONFIG_ARM64_USE_LSE_ATOMICS
Change-Id: I514ab0d412441623f73aaaa87dc66baf749a9221
CONFIG_ARM64_USE_LSE_ATOMICS is depends on CONFIG_JUMP_LABEL and
default y. So we should enable CONFIG_JUMP_LABEL.
Now we can use LSE to replace LL/SC on Cortex-A55/A76 for better performance.
Before:
text data bss dec hex filename
25991593 10672971 648872 37313436 2395b9c vmlinux
After:
text data bss dec hex filename
26620453 11072195 649976 38342624 2490fe0 vmlinux
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2900ff6f2fd8dae9f8afb0fc2da72c83de8ff63e
* commit '1d795ddee4f73b2739410f99c22280b00f452187':
soc: rockchip: cpuinfo: optimize error log
rtc: rockchip: fix the rtc suspend crash
soc: rockchip: fiq debugger: check "target_cpu" before switch cpu
clk/rockchip/regmap: rate should not be zero
mmc: dw_mmc: Fix DM 4GB TF card write data errors in RV1106
arm64: rk3308_linux_defconfig: enable Rockchip RPMsg
media: i2c: imx577: fix exposure control range according to datasheet
arm64: configs: rockchip_linux: change RPMSG config to RPMSG_MBOX
Change-Id: I77072f12b7734da6c0212a715633fee3ee574f65
* commit '6de3d51dcdf7e19c1484ac967943387e0621b4a5':
soc: rockchip: debug: don't enable Serror when panic
pstore/ram: don't register boot_log to minidump when it is off
power: supply: rk816/rk817/rk818 battery: avoid division by zero
video: rockchip: rga3: fix iommu device sync cache causing crash
video: rockchip: rga3: fix the error report of Coverity
soc: rockchip: rockchip_system_monitor: simplify include
media: uvcvideo: set system status to performance when stream on
ARM: configs: rv1106-wakeup.config: fix some sleep to slow down the process
clk: rockchip: rk3562: Fix clk_uart3_frac parent clk
media: i2c: maxim4c: driver version v2.05.00
media: i2c: sc230ai support master&slaver mode
media: rockchip: isp: add isp dgain for tb mem head
media: rockchip: isp: support for param run double
Change-Id: Ic11982e6ac7486b309860f7d7c4c746c9edfc76e
Merge made by the 'ours' strategy.
* commit 'e201a6c59def9fca39f85e1d7c521a041fb492e8': (5598 commits)
regulator: core: Ensure debugfs is fully initialized
BACKPORT: firmware_loader: Abort all upcoming firmware load request once reboot triggered
UPSTREAM: firmware_loader: Refactor kill_pending_fw_fallback_reqs()
ANDROID: GKI: Update symbols to symbol list
ANDROID: Add Interrupt Hook for madvise Compression
UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
BACKPORT: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove()
Revert "netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp"
Revert "net: bridge: use DEV_STATS_INC()"
Revert "configfs: fix a race in configfs_lookup()"
UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read
UPSTREAM: igb: set max size RX buffer when store bad packet is enabled
UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read
ANDROID: abi_gki_aarch64_qcom: Add wait_for_device_probe symbol
UPSTREAM: netfilter: xt_sctp: validate the flag_info count
UPSTREAM: netfilter: xt_u32: validate user space input
UPSTREAM: net/sched: Retire rsvp classifier
UPSTREAM: ipv4: fix null-deref in ipv4_link_failure
...
Change-Id: I6477f34553d9a65678f1e87fcfcb517ea2f93b75
* commit 'c575feaee97f3c3f0d29ec8e5e4948e08f56cd61':
Revert "usb: typec: typec_port_register_altmodes() depends on CONFIG_NO_GKI"
media: i2c: os02k10: fix setting exposure error
media: i2c: dw9800w: add ioctl set max logical pos
video: rockchip: rga3: prevent calling mmget()/mmput() in spin_lock
video: rockchip: rga3: refining time-consuming logs
video: rockchip: rga3: destroy internal_buffer when user exits
video: rockchip: rga3: signaled fecne after request commit failed
UPSTREAM: mmc: dw_mmc: Fix potential null pointer risk
drm/rockchip: rk628: vrefresh should not be zero
phy/rockchip: inno-dsidphy: fref and _prediv should not be zero
drm/rockchip: dsi2: sys_clk and pixel_clk should not be zero
drm/rockchip: dsi: the bpp should not be zero
media: rockchip: isp: fix build warning
soc: rockchip: rk_dmabuf_procfs: check return value of platform_device_register_full()
Change-Id: I82396eff6f509f835cf56a36c87ed76394339549
"/sys/kernel/tracing/events/power/gpu_work_period/*" required by Android 14.0 is implemented.
NOTE:
For RK3588, the mali_csffw.bin used with this driver MUST be from DDK g21p0-01eac0 correspondingly.
Change-Id: Ifab61806a6a350ba53c5dc0296d20628c28d633a
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
A very similar case on amdgpu_vkms:
commit 826c1e923b ("drm/amdgpu/vkms: relax timer deactivation by
hrtimer_try_to_cancel")
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I0692cd2c4ad3e3f090c0df040537995f99c2fcff
Before this commit, because the crtc is not initialized yet, if use the drm_crtc_mask(crtc) at
vop2_cursor_plane_init(), the cursor plane possible_crtcs will always be 1 for vp0.
After this commit, the plane possible_crtcs will be:
if (disable_win_move && vop2)
possible_crtcs = BIT(registered_num_crtcs);
else if (vop3)
possible_crtcs = win->possible_crtcs from reg_data;
else
possible_crtcs =(1 << vop2_data->nr_vps) - 1;//all crtc
Fixes: 1a6b7e170f1e ("drm/rockchip: vop3: add support rk3528")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I7d23aab328962c1a77f6d0c11c5f81731bdceb80
1.Add crtc property IS_VIRTUAL and SOC_ID. HWC needs
property IS_VIRTUAL to identify the virtual crtc,
and the property SOC_ID to confirm the platform.
2.Add support for resolutions:
1280x720 720x1280
1920x1080 1080x1920
2560x1440 1440x2560
3840x2160 2160x3840
4096x2160 2160x4096
with frame rate 30/60/90/120/144.
3.Fix the process of releasing resources in vvop_unbind().
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I5cbd8ce4cb0d55023fb36426ff3a79bf0ae25080
Always make GPIO0_A1 low-power when system sleep.
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I487aa4a5d0fa239a693b784d98ab53e9414c63db
If mcu_hold_mode is 1, set 1 to mcu_frame_st will
refresh one frame from ddr. So mcu_frame_st is needed
to be initialized as 0.
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I75d755826dbbdd229da3c3db15d4682dc2bd13a0
The phy clock is the same as the input clock of rk630, so
use this clock for configuration.
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ie5c0e58958a1fdd9e264d861295d64e4ccb483cb
Some problematic TF cards may stop at busy state during
the data writing process, and the mmc controller needs
to add a timeout processing.
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I11b75910f99eb040fa364990049f5cfe74fccfbf
fix commit "9625dd4e2af2"
(media: i2c: imx577: fix exposure control range according to datasheet)
Change-Id: Ie0e02b553599ed969dee496767c57ebac244bce1
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
CONFIG_ARM64_USE_LSE_ATOMICS is depends on CONFIG_JUMP_LABEL and
default y. So we should enable CONFIG_JUMP_LABEL.
Now we can use LSE to replace LL/SC on Cortex-A55/A76 for better performance.
Before:
text data bss dec hex filename
24693888 10091965 541616 35327469 21b0ded vmlinux
After:
text data bss dec hex filename
25114676 10943949 542776 36601401 22e7e39 vmlinux
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2900ff6f2fd8dae9f8afb0fc2da72c83de8ff63e
In some special products, after rtc probe, The system quickly goes to
sleep before the calibration function of delay_work is executed. In rtc
suspend will clamp rtc. In the off process, if delay_work is executed,
the system will crash.
Added calibration judgments to turn off delay_work when rtc suspend.
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ib212eabd18c27ddeff5c50e5b8ac0444a2cafc23
