Merge made by the 'ours' strategy.
* commit 'a857a766e8206c3084a57acba5dcc3cd175f0889':
arm64: dts: rockchip: rk3568: Add readable label for lvds0
Change-Id: Ib14d3674d1ef321dff2e2baaec008f80ce552c4e
Ensure that cs io is in the input state in initial progress.
Change-Id: I808994ec14e3f4ab1c580f2f07e3e41b444bcc2e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
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
1. update gain control with 0x401d
2. update time control with 0x4007
3. update vts with stream off/on
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I35f821a944bebd4db8ec2e2cf3a16e2313eeb1b0
Adding:
PCIE_EP_MMAP_RESOURCE_USER_MEM,
PCIE_EP_MMAP_RESOURCE_RK3568_RC_DBI,
PCIE_EP_MMAP_RESOURCE_RK3588_RC_DBI,
Change-Id: I69facbb8b268516c3ab68f70f15650b214649c55
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Some PCIe root port uses combophy but combo phy can be used by
other type of controllers. If someone enable phy for both of two
controllers, it should break the s2r and hard to debug. Validate
this kind of bug and cast an error like this:
[ 10.698225] naneng-combphy fee20000.phy: expected mode is PCIe, but current mode is USB3
[ 10.698232] rk-pcie fe180000.pcie: PHY is reused by other controller, check the dts!
[ 10.698244] PM: dpm_run_callback(): rockchip_dw_pcie_suspend+0x0/0x410 returns -22
[ 10.698266] PM: Device fe180000.pcie failed to suspend async: error -22
[ 10.902134] PM: pm_system_irq_wakeup: 166 triggered fsc_interrupt_int_n
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Icc65c9d19ef2bcb54bfb3665d4c012f8ac0e710e
This commit adds demo dts about the various possible uses of LVDS:
1. Single channel LVDS
2. Dual LVDS
3. Two Video Port use two separate single channel LVDS
4. One Video Port use two separate single channel LVDS
For case 1, the video port outputs as follows:
VP1 -> LVDS0 or VP1 -> LVDS1
or VP2 -> LVDS0 or VP2 -> LVDS1
For case 2, the video port outputs as follows:
VP1 -> LVDS0, VP1 -> LVDS1
or VP2-> LVDS0, VP2-> LVDS1
For case 3, the video port outputs as follows:
VP1 -> LVDS0, VP2 -> LVDS1
or VP1 -> LVDS1, VP2 -> LVDS0
For case 4, the video port outputs as follows:
VP1 -> LVDS0, VP1 -> LVDS1
or VP2-> LVDS0, VP2-> LVDS1
Change-Id: I426ba9033863cc1442834daf8fa63aaa472274c5
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
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
* 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
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
Ensure that cs io is in the input state in initial progress.
Change-Id: I808994ec14e3f4ab1c580f2f07e3e41b444bcc2e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
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
