Commit Graph

1265431 Commits

Author SHA1 Message Date
Jianlong Wang
655d0987f9 arm64: dts: rockchip: rk3328: update to kernel6.1
Change-Id: If0969403709e56c61177003dedf251d10ba0cced
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2023-12-01 20:02:36 +08:00
Tao Huang
842bce7669 Merge tag 'v6.1.43'
This is the 6.1.43 stable release

* tag 'v6.1.43': (3386 commits)
  Linux 6.1.43
  dma-buf: fix an error pointer vs NULL bug
  dma-buf: keep the signaling time of merged fences v3
  test_firmware: return ENOMEM instead of ENOSPC on failed memory allocation
  selftests: mptcp: sockopt: use 'iptables-legacy' if available
  mptcp: ensure subflow is unhashed before cleaning the backlog
  cpufreq: intel_pstate: Drop ACPI _PSS states table patching
  ACPI: processor: perflib: Avoid updating frequency QoS unnecessarily
  ACPI: processor: perflib: Use the "no limit" frequency QoS
  drm/amd/display: Write to correct dirty_rect
  drm/amd/display: perform a bounds check before filling dirty rectangles
  tracing: Fix trace_event_raw_event_synth() if else statement
  drm/amd/display: set per pipe dppclk to 0 when dpp is off
  rbd: retrieve and check lock owner twice before blocklisting
  rbd: harden get_lock_owner_info() a bit
  rbd: make get_lock_owner_info() return a single locker or NULL
  dm cache policy smq: ensure IO doesn't prevent cleaner policy progress
  drm/i915/dpt: Use shmem for dpt objects
  ceph: never send metrics if disable_send_metrics is set
  PM: sleep: wakeirq: fix wake irq arming
  ...

Conflicts:
	arch/arm/boot/dts/rk3288.dtsi
	arch/arm64/boot/dts/rockchip/rk3568.dtsi
	arch/arm64/boot/dts/rockchip/rk356x.dtsi
	drivers/dma/pl330.c
	drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
	drivers/mmc/core/card.h
	drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
	drivers/nvme/host/nvme.h
	drivers/pci/controller/pcie-rockchip.c
	drivers/power/supply/rk817_charger.c
	drivers/tty/serial/8250/8250_port.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/udc/core.c
	drivers/usb/host/xhci.h
	drivers/usb/typec/tcpm/tcpm.c

Revert commit c649bf43a2 ("net: ethernet: stmmac: dwmac-rk: rework optional clock handling").

Change-Id: Ib0117e96e04e9a15543ebb69c1a873ba44e41546
2023-12-01 19:31:39 +08:00
Tao Huang
c9a9f50c9b Merge commit '0e02eaa9e319bf1e0f859115223a3e5bd36684ec'
Merge made by the 'ours' strategy.

* commit '0e02eaa9e319bf1e0f859115223a3e5bd36684ec':
  media: rockchip: vicap: mipi csi2 set default lane to 4 while not connect to sensor

Change-Id: Iea4fa875bf49f71029166515e5637478c48341f6
2023-11-22 18:11:56 +08:00
Zefa Chen
8779200b83 media: rockchip: vicap: mipi csi2 set default lane to 4 while not connect to sensor
fixes:

[    2.739982] rkcif rkcif-mipi-lvds: clear unready subdev num: 1
[    2.740008] ================================================================================
[    2.740018] UBSAN: shift-out-of-bounds in drivers/media/platform/rockchip/cif/mipi-csi2.c:505:32
[    2.740034] shift exponent -1 is negative
[    2.740046] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 6.1.25 #263
[    2.740061] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[    2.740073] Call trace:
[    2.740084]  dump_backtrace+0xdc/0x130
[    2.740108]  show_stack+0x1c/0x30
[    2.740123]  dump_stack_lvl+0x60/0x78
[    2.740141]  dump_stack+0x14/0x2c
[    2.740154]  ubsan_epilogue+0xc/0x3c
[    2.740174]  __ubsan_handle_shift_out_of_bounds+0xd0/0x1ac
[    2.740194]  csi2_g_mbus_config+0xe8/0x104
[    2.740213]  call_get_mbus_config+0x30/0x44
[    2.740230]  subdev_notifier_complete+0x104/0x35c
[    2.740247]  v4l2_async_nf_try_complete+0x7c/0x90
[    2.740262]  v4l2_async_notifier_clr_unready_dev+0x98/0xa0
[    2.740276]  rkcif_clr_unready_dev+0x40/0x70
[    2.740291]  do_one_initcall+0x5c/0x260
[    2.740304]  kernel_init_freeable+0x318/0x384
[    2.740319]  kernel_init+0x34/0x150
[    2.740334]  ret_from_fork+0x10/0x20
[    2.740348] ================================================================================

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id6bebc37a2e649a856ae12cbe3eb60917ecdf165
2023-11-22 18:11:07 +08:00
Tao Huang
64687019fb Merge commit '0aa6d336c04bba5357c0b0dd2321ace7194cc1b7'
* commit '0aa6d336c04bba5357c0b0dd2321ace7194cc1b7':
  ARM: rockchip: support rv1103 suspend
  drm/rockchip: vvop: fix compile errors
  drm/rockchip: dsi2: support Auto-Calculation mode
  drm/rockchip: dsi2: fix IPI_RATIO_MAN_CFG in dsc mode
  video: rockchip: vtunnel: buffer ID should generate by instance

Change-Id: Id0ab9d06e1dfb3797f13e58aeb6f975ce381ec0c
2023-11-22 17:55:34 +08:00
Tao Huang
866036f453 Merge commit '5eda8fae48807684b2bb82cc88d66106821883dc'
* commit '5eda8fae48807684b2bb82cc88d66106821883dc':
  media: i2c: add mis4001 sensor driver
  media: i2c: add mis2031 sensor driver
  media: i2c: add sc2355 driver
  ARM: configs: rk312x: enable CONFIG_DRM_IGNORE_IOTCL_PERMIT
  media: i2c: sc5336 update register list
  soc: rockchip: minidump: make md_vmalloc_to_page() static
  fiq_debugger: set current_cpu to new cpu after current_cpu is offline
  ARM: dts: rockchip: add rv1106g-evb2-v12-aov-spi-nor.dts
  media: rockchip: vicap: reserve memory according to actual needs when dev change from thunderboot to online
  media: rockchip: vicap fixes error when work on both thunderboot and quick suspend/resume
  video: rockchip: add mpp osal
  soc: rockchip: minidump: don't save peripheral space
  arm64: dts: rockchip: rk3588-linux: support minidump
  media: i2c: max92756: Support V4L2 DV class

Change-Id: Iafef5fffb4cd5d5020780e37882b60638d43de51

Conflicts:
	drivers/media/i2c/Kconfig
	drivers/media/i2c/Makefile
2023-11-22 17:54:23 +08:00
Tao Huang
1f14e29ea8 Merge commit '2688d7f9259151ac782d92bece2458eb998aa829'
* commit '2688d7f9259151ac782d92bece2458eb998aa829':
  media: i2c: add ar2020 sensor driver
  watchdog: dw_wdt: fix array out-of-bounds in theory
  mfd: rkx110_x120: add irq support
  drm/rockchip: vop2: fix overlapping_copy

Change-Id: I50059e725ec7b7efc4e0437e85f9622ba9c97fb9

Conflicts:
	drivers/media/i2c/Kconfig
	drivers/media/i2c/Makefile
2023-11-22 17:40:00 +08:00
Tao Huang
13d0dc4f31 Merge commit 'eeaca8874ba3e1b1050851af26a343240a41dd84'
Merge made by the 'ours' strategy.

* commit 'eeaca8874ba3e1b1050851af26a343240a41dd84':
  mtd: spi-nor-ids: support PY25Q128LA

Change-Id: I28b3d789c1a3d7249799c91f8de59e20bd55d931
2023-11-22 17:35:08 +08:00
Jon Lin
0faf330c2d mtd: spi-nor-ids: support PY25Q128LA
Change-Id: I5b92a866871b5635963510f46d3ba822d66964a2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-11-22 17:33:03 +08:00
Tao Huang
3aba50695b Merge commit '7f0033da72d88ee351d2e0fc798c8912aa27a6e4'
* 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
2023-11-22 17:29:32 +08:00
Tao Huang
4ed3c62e01 Merge commit '6e890ef6f64eef3a85f617e49a60c973df4a7346'
* commit '6e890ef6f64eef3a85f617e49a60c973df4a7346':
  rtc: rk630: add rtc for rk630
  mfd: rk630: add rtc regmap and irq
  mfd: rk630: Set phy clock from ref clock
  mfd: rk630: Add rk630 ref clk

Change-Id: Ibe62c780b30b34810d7c54d501b9cd925505fb94

Conflicts:
	drivers/rtc/Kconfig
2023-11-22 17:24:34 +08:00
Tao Huang
3a04a0e312 Merge commit 'df698fe006e7c20c17e6dd3c3a042da6f8bd0660'
Merge made by the 'ours' strategy.

* commit 'df698fe006e7c20c17e6dd3c3a042da6f8bd0660':
  clk: rockchip: avoid division by zero

Change-Id: Id8e76699a5c2cf216eaa0d54b4a0397f23403e2a
2023-11-22 17:23:22 +08:00
Elaine Zhang
173b944491 clk: rockchip: avoid division by zero
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ie28c61d3907d80c3d12087dea59a9567e183012d
2023-11-22 17:14:07 +08:00
Tao Huang
86f733a6c3 Merge commit 'bc3739735df8cf89c0ba4acb433ea8ec7392124f'
* commit 'bc3739735df8cf89c0ba4acb433ea8ec7392124f':
  media: i2c: add sc4336p driver

Change-Id: Ie99cb4322bded3a963bef2c4206fac7c10950ab2
2023-11-22 17:11:45 +08:00
Tao Huang
ca7450a6d2 Merge commit 'c95ecab515064933a8186fadac06a0100e94cef0'
Merge made by the 'ours' strategy.

* commit 'c95ecab515064933a8186fadac06a0100e94cef0':
  mmc: add timeout for write data and reset while recovery

Change-Id: Icb8f2a6fa38d6dba0347069ccd766f085b3e2afb
2023-11-22 17:08:16 +08:00
Yifeng Zhao
645f6c421d mmc: add timeout for write data and reset while recovery
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
2023-11-22 10:08:38 +08:00
Tao Huang
bfb6e6cbd5 Merge commit 'c252d35d35d09a9be3b0fb9b216304f641d1e83e'
* 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
2023-11-21 18:03:27 +08:00
Tao Huang
59a5456ff0 Merge commit '4997ee78fe6800c5b4935efa50c8dcf242232297'
Merge made by the 'ours' strategy.

* commit '4997ee78fe6800c5b4935efa50c8dcf242232297':
  arm64: rockchip_linux_defconfig: Enable CONFIG_ARM64_USE_LSE_ATOMICS

Change-Id: I514ab0d412441623f73aaaa87dc66baf749a9221
2023-11-21 17:54:29 +08:00
Tao Huang
2a995f7160 arm64: rockchip_linux_defconfig: Enable CONFIG_ARM64_USE_LSE_ATOMICS
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
2023-11-21 17:30:55 +08:00
Tao Huang
302e1ca830 Merge commit '1d795ddee4f73b2739410f99c22280b00f452187'
* 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
2023-11-21 16:05:41 +08:00
Tao Huang
06f60be82f Merge commit 'bcbcebd833f6a37c224b53028baeaa39f86564f3'
Merge made by the 'ours' strategy.

* commit 'bcbcebd833f6a37c224b53028baeaa39f86564f3':
  soc: rockchip: opp_select: implement rockchip_uninit_opp_table()

Change-Id: I92b5978c9a817d3ce00e9e9fc8f0d12bf96e2055
2023-11-21 16:04:21 +08:00
Tao Huang
634dc4ae6c Merge commit '6de3d51dcdf7e19c1484ac967943387e0621b4a5'
* 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
2023-11-21 14:39:36 +08:00
Tao Huang
46a15c58e5 Merge commit 'e201a6c59def9fca39f85e1d7c521a041fb492e8'
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
2023-11-21 14:33:28 +08:00
Zefa Chen
0e02eaa9e3 media: rockchip: vicap: mipi csi2 set default lane to 4 while not connect to sensor
fixes:

[    2.431002][    T1] rkcif rkcif-mipi-lvds: clear unready subdev num: 1
[    2.431031][    T1] ================================================================================
[    2.431039][    T1] UBSAN: shift-out-of-bounds in drivers/media/platform/rockchip/cif/mipi-csi2.c:523:18
[    2.431048][    T1] shift exponent -1 is negative
[    2.431059][    T1] CPU: 3 PID: 1 Comm: swapper/0 Not tainted 5.10.198 #14
[    2.431065][    T1] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[    2.431072][    T1] Call trace:
[    2.431088][    T1]  dump_backtrace+0x0/0x1dc
[    2.431096][    T1]  show_stack+0x18/0x24
[    2.431107][    T1]  dump_stack_lvl+0xe4/0x12c
[    2.431114][    T1]  dump_stack+0x18/0x3c
[    2.431126][    T1]  __ubsan_handle_shift_out_of_bounds+0x2dc/0x30c
[    2.431137][    T1]  csi2_g_mbus_config+0xf8/0x100
[    2.431147][    T1]  call_get_mbus_config+0x2c/0x44
[    2.431154][    T1]  subdev_notifier_complete+0xec/0x6dc
[    2.431162][    T1]  v4l2_async_notifier_clr_unready_dev+0xd0/0xd8
[    2.431168][    T1]  rkcif_clr_unready_dev+0x38/0x6c
[    2.431175][    T1]  do_one_initcall+0xe8/0x320
[    2.431186][    T1]  do_initcall_level+0xd4/0x1d8
[    2.431193][    T1]  do_initcalls+0x54/0x94
[    2.431199][    T1]  do_basic_setup+0x24/0x30
[    2.431205][    T1]  kernel_init_freeable+0xf0/0x168
[    2.431212][    T1]  kernel_init+0x14/0x1ac
[    2.431219][    T1]  ret_from_fork+0x10/0x18
[    2.431225][    T1] ================================================================================
[    2.431639][    T1] rkcif-mipi-lvds: rkcif_update_sensor_info: stream[0] get remote terminal sensor failed!
[    2.431662][    T1] rkcif-mipi-lvds: Async subdev notifier completed
[    2.431679][    T1] rkcif-mipi-lvds: rkcif_update_sensor_info: stream[0] get remote terminal sensor failed!
[    2.431687][    T1] rkcif-mipi-lvds: There is not terminal subdev, not synchronized with ISP

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id6bebc37a2e649a856ae12cbe3eb60917ecdf165
2023-11-21 10:40:23 +08:00
XiaoDong Huang
0aa6d336c0 ARM: rockchip: support rv1103 suspend
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I9dc1d71bf0c20b8a48f49c283bc1fdef37be770a
2023-11-20 16:49:20 +08:00
Damon Ding
f946ec4332 drm/rockchip: vvop: fix compile errors
Fixes: 7f0033da72 ("drm/rockchip: vvop: fix a potential race condition when vvop_disable_vblank")

Change-Id: I63356c83dfca4d6d0c98a23105343a496b760587
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2023-11-20 15:32:59 +08:00
Guochun Huang
58ca4dfe89 drm/rockchip: dsi2: support Auto-Calculation mode
the dsi2 controller can be select work in Munual or
Automatic mode, by writing in MANUAL_MODE_CFG register.

the Auto-Calculation mode has the following advantages:

1.Eliminates the need for the user to configure a set of registers
2.Makes the configuration routine easier, and the controller is less
  prone to undesired behaviors
3.Allows IPI frames to change dynamically with the controller adapting
  the output frames

Change-Id: I00dfad82f9d5aa27abc4a2b99471ae4d6412d1b0
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-11-17 18:13:49 +08:00
Guochun Huang
90463250cb drm/rockchip: dsi2: fix IPI_RATIO_MAN_CFG in dsc mode
Change-Id: Iad403cca10fb1d9efb84d6b7e6524e22586a2421
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-11-17 17:59:08 +08:00
Rimon Xu
dfb726bf21 video: rockchip: vtunnel: buffer ID should generate by instance
When resetting an instance, the buffer generation ID will be changed,
but when receiving images, the ID will be used to determine whether
it is an expired buffer. Therefore, the ID generator should be placed
in the instance instead of the device.

Change-Id: I707403dd22dce784dee07654d7333a02f5f35f43
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
2023-11-17 16:50:39 +08:00
Mingwei Yan
5eda8fae48 media: i2c: add mis4001 sensor driver
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I14ce592e0f03af0584b49f9dbf79b4685265bba3
2023-11-17 15:46:44 +08:00
Mingwei Yan
7a09fd1675 media: i2c: add mis2031 sensor driver
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: Ief24f6240f85971aa1e65927127934b2c2e41e77
2023-11-17 15:42:21 +08:00
Sach Lin
094d8870cd media: i2c: add sc2355 driver
Signed-off-by: Sach Lin <sach.lin@rock-chips.com>
Change-Id: I829a47eb558a47d93e437c0aef71b42fd1ce4fd1
2023-11-17 15:15:49 +08:00
Jianlong Wang
36fe76db56 ARM: configs: rk312x: enable CONFIG_DRM_IGNORE_IOTCL_PERMIT
Allow the DRM ignore some permission issues.

Change-Id: I8e122ebeb1fc103b0bb5b9334cbb89ebf5a4334d
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2023-11-17 15:04:20 +08:00
Zefa Chen
187f0ceb6a media: i2c: sc5336 update register list
compatible with sc5336 and sc5338

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I294b88bae34a4f38e8d4947acdc7b1fddacdfd5c
2023-11-17 14:51:42 +08:00
Tao Huang
3b5325a4cd soc: rockchip: minidump: make md_vmalloc_to_page() static
drivers/soc/rockchip/minidump/minidump_log.c:662:14: warning: no previous prototype for 'md_vmalloc_to_page' [-Wmissing-prototypes]

Fixes: 0417e5b732 ("soc: rockchip: minidump: don't save peripheral space")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I23753bd1baebb78fc60aae8ab1529f560ea84d25
2023-11-17 09:36:10 +08:00
Tao Huang
a11cf7949a Merge commit 'c575feaee97f3c3f0d29ec8e5e4948e08f56cd61'
* 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
2023-11-16 15:58:06 +08:00
Tao Huang
ee62f01508 Merge commit '2182c42cb8df4d11eff3812a7ce10ea1bbba2e8d'
* commit '2182c42cb8df4d11eff3812a7ce10ea1bbba2e8d':
  media: i2c: add Maxim Dual GMSL2/GMSL1 to CSI-2 Deserializer driver.
  media: i2c: sc200ai: get camera param from cam-tb-setup

Change-Id: Ieea0e5189859c2365195a5f94a9a394dfc6e20b4

Conflicts:
	drivers/media/i2c/Makefile
2023-11-16 15:57:37 +08:00
Huibin Hong
4ec9300575 fiq_debugger: set current_cpu to new cpu after current_cpu is offline
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Ie86c4115df6b20e2d5ab3d79cd594e6e5ddad0c9
2023-11-16 14:23:27 +08:00
Zhen Chen
b72fff5ed8 MALI: rockchip: upgrade bifrost DDK to g21p0-01eac0, from g18p0-01eac0
"/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>
2023-11-16 14:18:32 +08:00
Zhichao Guo
cfae443e0a ARM: dts: rockchip: add rv1106g-evb2-v12-aov-spi-nor.dts
Signed-off-by: Zhichao Guo <zhichao.guo@rock-chips.com>
Change-Id: I76e9dd8413fa2ccc6cd0d08e31e3a5aaae58a9de
2023-11-16 11:26:29 +08:00
Zefa Chen
07eb3ddd78 media: rockchip: vicap: reserve memory according to actual needs when dev change from thunderboot to online
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I539450bd80ee5e1a81e58924f75bd27d0aefe86c
2023-11-16 10:31:03 +08:00
Zefa Chen
61949a9b21 media: rockchip: vicap fixes error when work on both thunderboot and quick suspend/resume
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ied9db7a3ed4e63735066424c48b6870830284588
2023-11-16 10:11:26 +08:00
Yandong Lin
49b335bda8 video: rockchip: add mpp osal
The osal is to adapt to kmpp ko.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I134d1e50b66a0e23ecfd8de60498b7b6e5c3a0c2
2023-11-16 10:09:16 +08:00
Huibin Hong
0417e5b732 soc: rockchip: minidump: don't save peripheral space
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I9da05cd44d85866dccd0bbd61962c2ac4534dcfd
2023-11-16 01:21:08 +00:00
Huibin Hong
15eb463188 arm64: dts: rockchip: rk3588-linux: support minidump
Take a buffer from pstore buffer for minidump share memory

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: If201f09d771b612258d703fa567813976f7c99f2
2023-11-16 01:21:08 +00:00
Cody Xie
33ea3cee5e media: i2c: max92756: Support V4L2 DV class
Change-Id: Ia790015f551442f7716deeb10f79530d8a023c9a
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-11-15 18:58:36 +08:00
Zefa Chen
2688d7f925 media: i2c: add ar2020 sensor driver
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I16a53fa473d82ac377c31fadb3cc55898825428f
2023-11-15 18:45:36 +08:00
Simon Xue
e8cea8fe67 watchdog: dw_wdt: fix array out-of-bounds in theory
Change-Id: Ie11b60cf79b4c988af1ca7939334cbb742582247
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2023-11-15 18:44:21 +08:00
Zhang Yubing
077c5b13fa mfd: rkx110_x120: add irq support
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ibb8316211ef67ffe9ee9a0dcfa391ecfae0af9d0
2023-11-15 18:17:57 +08:00
Andy Yan
5498c2a4d2 drm/rockchip: vop2: fix overlapping_copy
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Icbae6c1dd5ad0b3c580c73b8776272d364473501
2023-11-15 18:11:05 +08:00