* 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>
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
Before resetting the controller, it is necessary to increase
the delay by 1 us or wait for a slight decrease in FIFO, so
that no errors will occur during the DM 4GB TF card testing
process.
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Ic03a4d88367e3fea00f648f4a21df1669f4f0832
This applies to situations where multiple cameras need to be supported in one DTS,
and camera devices need to be registered with GKI
Note: phy-rockchip-csi2-dphy.ko must be insmod last
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib7dae1144a5f1923db41a489147f2aa5b2f2b358
This applies to situations where multiple cameras need to be supported in one DTS,
and camera devices need to be registered with GKI
Note: phy-rockchip-csi2-dphy.ko must be insmod last
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If915530d4b982df9500851df89b776e18ed7dd38
When the iommu device calls the dma_sync_single_xx API, it will be
regarded as being called through iova by default, so the physical
address obtained will be invalid.
Update driver version to 1.3.1
Change-Id: I0a2c8fcecd556eccee499e06f41d790043f1fa0d
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
1. Fix the issue of scheduler and hardware maximum count mismatch.
2. Fix the issue of potential GCD returning 0.
Change-Id: I083553e69ab60549b26465b5d1437e817575856f
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Move include dt-bindings/soc/rockchip-system-status.h
to soc/rockchip/rockchip-system-status.h.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie6046f762e38458a3505a6098d5211bdc4fd60e2
For rockchip platforms, set performance frequency for the
memory controller when uvc stream on, and clear it after
uvc stream off. It can improve uvc streaming stability.
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I1dc0cf10c552bba2c3a0f8a1bb37d90f546eb4a3
1. local device power on add some delay for i2c normal access.
2. enable hot plug detect for partial links are locked.
3. remote device hot plug init disable lock irq.
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I3424421395601266c0c2a787bedbd5028a786aab
