shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,265,499 Commits 55 Branches 2,486 Tags
48eed3442f515bbafbc9711da44682f5c586a9fa
Commit Graph

1265499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Huang
48eed3442f mfd: rk806-i2c: Fix compilation errors on kernel 6.1 
drivers/mfd/rk806-i2c.c:56:14: error: incompatible function pointer types initializing 'void (*)(struct i2c_client *)' with an expression of type 'int (struct i2c_client *)'

Fixes: b473fca294 ("mfd: rk806: Add RK806 support i2c")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I00e7088be388222a914824fbc5c5e1ebef021e8a
 2023-12-01 21:16:57 +08:00
Tao Huang
8d8f2bbc40 Merge commit '8b15ae280af3fb565e89bf7e7746f47766bb00a4' 
* commit '8b15ae280af3fb565e89bf7e7746f47766bb00a4':
  video: rockchip: mpp: optimize iommu faul handle for ccu flow
  media: rockchip: isp: fix rockit set_fmt stuck
  pwm: rockchip: rename pwm-rockchip.h to pwm-rockchip-irq-callbacks.h
  media: i2c: sc223a fix dvp image error
  media: i2c: sc223a add dvp configuration
  video: rockchip: mpp: rkvenc2: fix irq proc
  ARM: dts: rockchip: rv1126: add pwm irq configs
  PCI: rockchip: dw: Support DMA linked list mode
  PCI: rockchip: dw: Adding DMA linked list mode definition
  video: rockchip: rga3: fix import failure does not return error code
  media: rockchip: isp: fix power_cnt if error
  drm: bridge: dw-hdmi: fix incorrect I2CM configuration
  Revert "drm: bridge: dw-hdmi: Fixed ddc error caused by plug out hdmi when reading edid"
  arm64: configs: rockchip_defconfig: Enable CONFIG_MFD_RK806_I2C
  arm64: dts: rockchip: rk3528: add pwm irq configs
  arm64: dts: rockchip: rk3328: add pwm irq configs
  arm64: dts: rockchip: rk1808: add pwm irq configs

Change-Id: I4ce6137b655a57fa97b9d2ae14b49b1ecf27db1d
 2023-12-01 20:58:48 +08:00
Tao Huang
76932737a2 Merge commit '5ec7ab5d65667a903b47361354e663560e592299' 
Merge made by the 'ours' strategy.

* commit '5ec7ab5d65667a903b47361354e663560e592299':
  arm64: dts: rockchip: rk3568: add pwm irq configs

Change-Id: Ic18cae0d51221020547d4d44db7a0fd1d09f6152
 2023-12-01 20:58:13 +08:00
Damon Ding
92c75d601d arm64: dts: rockchip: rk3568: add pwm irq configs 
Change-Id: I45dd3c50cbae6100c099714dcec5d39ce20a710a
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2023-12-01 20:56:47 +08:00
Tao Huang
ddc0738ae6 Merge commit '851545fccc4239eea695dc5191758bb393ec89a9' 
* commit '851545fccc4239eea695dc5191758bb393ec89a9':
  media: rockchip: isp: fix rv1106 cycle kill rkipc null pointer
  arm64: rk3308_linux_defconfig: add CONFIG_DRM_IGNORE_IOTCL_PERMIT
  media: i2c: imx464 fixes exposure error of short frame

Change-Id: I11e1b5d7ad67589e8aa06e14b2dd85e830e766cf
 2023-12-01 20:50:52 +08:00
Tao Huang
46c6e52606 Merge commit 'd4dcc9b2c5a73b73ff72b248f3c91a43d24c8fd7' 
* commit 'd4dcc9b2c5a73b73ff72b248f3c91a43d24c8fd7':
  media: i2c: add og01a10 driver
  media: i2c: add og02b10 driver

Change-Id: Idf1a4b4bed3cbaa005a8df090fe61a6bd2a276a7

Conflicts:
	drivers/media/i2c/Kconfig
	drivers/media/i2c/Makefile
 2023-12-01 20:49:36 +08:00
Tao Huang
fa453b17a5 Merge commit 'bc95e6862a3f13d4ae07e5a5265f142641bdef02' 
* commit 'bc95e6862a3f13d4ae07e5a5265f142641bdef02':
  media: i2c: mis4001 driver update version 0.01.02
  arm64: dts: rockchip: rk3562: Add csu-clocks for vop
  drm/rockchip: vop2: Add csu clock support for rk3562
  arm64: dts: rockchip: rk3562: Add rockchip,csu for gmac
  ethernet: stmmac: dwmac-rk: Add csu clock support
  arm64: dts: rockchip: rk3562: Add csu device node
  Revert "arm64: dts: rockchip: rk3562-rk817-tablet-v10: Change clkin div to 5 for aclk vo"
  Revert "arm64: dts: rockchip: rk3562-evb1-lp4x-v10: Change clkin div to 5 for aclk vo"
  arm64: configs: rockchip_linux_defconfig: Enable CONFIG_ROCKCHIP_CSU
  arm64: configs: rockchip_defconfig: Enable CONFIG_ROCKCHIP_CSU
  soc: rockchip: Add clock subunit driver
  arm64: dts: rockchip: px30: add pwm irq configs
  PCI: rockchip: dw: Reserve msi_data in obj_info
  misc: rockchip: pcie-rkep: Support mmap bar resource and rw config space
  misc: rockchip: pcie-rkep: Adding more mmap resources
  media: rockchip: isp: fix wnd_num cause array access out of bounds
  mfd: rk806: Add RK806 support i2c
  PCI: rockchip: dw: Validate phy mode in suspend
  phy: rockchip: naneng-combphy: Add phy_validate support
  arm64: dts: rockchip: add lvds demo dts for rk3567/rk3568

Change-Id: I610c43a60826e361c65a6e1d4fa23da6a56653fa
 2023-12-01 20:43:53 +08:00
Tao Huang
f3e269432c Merge commit 'a857a766e8206c3084a57acba5dcc3cd175f0889' 
Merge made by the 'ours' strategy.

* commit 'a857a766e8206c3084a57acba5dcc3cd175f0889':
  arm64: dts: rockchip: rk3568: Add readable label for lvds0

Change-Id: Ib14d3674d1ef321dff2e2baaec008f80ce552c4e
 2023-12-01 20:43:19 +08:00
Chaoyi Chen
67c4732aa5 arm64: dts: rockchip: rk3568: Add readable label for lvds0 
Change-Id: Iacf2cc02fb23ac4a5e8384c3901ce83ed30ef392
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
 2023-12-01 20:40:28 +08:00
Tao Huang
83014ed577 Merge commit '38cfa875e45d5142bf549944d2f3f7ee82a22e49' 
* commit '38cfa875e45d5142bf549944d2f3f7ee82a22e49':
  video: rockchip: rga3: modify rga_win_data formats config
  drm/rockchip: vop2: add debug name for rgb565_2x8 mode
  drm/rockchip: vop: add debug name for rgb666_3x6 and rgb565_2x8 modes

Change-Id: Ie6d054896eda299861011288cf3af06e168fc068
 2023-12-01 20:35:08 +08:00
Tao Huang
7b7baa80c7 Merge commit '9cf5d6948348ab1e1df4260549c8c7590809f143' 
Merge made by the 'ours' strategy.

* commit '9cf5d6948348ab1e1df4260549c8c7590809f143':
  spi: rockchip: Preset SPI slave controller configuration

Change-Id: Ib88964f05dbded909565ff8a844fcc8e6bc7b55c
 2023-12-01 20:34:11 +08:00
Jon Lin
2cda47f66a spi: rockchip: Preset SPI slave controller configuration 
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>
 2023-12-01 20:32:31 +08:00
Tao Huang
98006c7092 Merge commit 'd2ce9f696f0f9bb73ff65ccaa37cb9c05814a162' 
* commit 'd2ce9f696f0f9bb73ff65ccaa37cb9c05814a162':
  mfd: display-serdes: improve pinctrl interface for maxim chip
  media: rockchip: isp: frame timestamp change to sof
  driver: rknpu: Split devfreq into separate file
  arm64: dts: rockchip: rk3328-evb: update to kernel5.10

Change-Id: Iaebd4a12b6f781b3d406e50f951098f2efa7d1c4
 2023-12-01 20:16:35 +08:00
Tao Huang
bb5d231ab6 Merge commit 'a84f6f50455c37cb29041623c3c50701a879932b' 
Merge made by the 'ours' strategy.

* commit 'a84f6f50455c37cb29041623c3c50701a879932b':
  arm64: dts: rockchip: rk3328: correct dmc_opp_table frequencies
  arm64: dts: rockchip: rk3328: update to kernel5.10

Change-Id: Ibf5faaf3940716bd0bd8ea6b547bdeb61ab661fb
 2023-12-01 20:07:28 +08:00
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
Yandong Lin
8b15ae280a video: rockchip: mpp: optimize iommu faul handle for ccu flow 
1. Add iommu fault handle for soft ccu flow
2. Optimize iommu fault handle for hard ccu flow

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I7efc0e006469ef673b96a537555e345fd0f92a2f
 2023-11-30 11:36:42 +08:00
Mingwei Yan
f127b87577 media: rockchip: isp: fix rockit set_fmt stuck 
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I8b4eda7462ce6dc0afc23fc63b35ff364ee59b9f
 2023-11-30 09:10:42 +08:00
Damon Ding
65d10a12ec pwm: rockchip: rename pwm-rockchip.h to pwm-rockchip-irq-callbacks.h 
Change-Id: Iea8f4edf02c35cd7b2337b014989abb2fa94b71d
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2023-11-29 16:03:07 +08:00
yuefu.su
7a225df5af media: i2c: sc223a fix dvp image error 
1. modify mbus_fmt to 8bit
2. modify the edge of sampling to rising

Change-Id: I771b9c0df5a582576de18a5877a898f35336d661
Signed-off-by: yuefu.su <yuefu.su@rock-chips.com>
 2023-11-29 16:02:05 +08:00
yuefu.su
b5ad0abeef media: i2c: sc223a add dvp configuration 
Signed-off-by: yuefu.su <yuefu.su@rock-chips.com>
Change-Id: I52fb0bea0c29d41d94db2c7a5ba8366933da4409
 2023-11-29 16:02:05 +08:00
Herman Chen
f3304bc395 video: rockchip: mpp: rkvenc2: fix irq proc 
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I169c526004d85220940b677755ce8021828765d2
 2023-11-29 15:14:04 +08:00
Damon Ding
fd4811893b ARM: dts: rockchip: rv1126: add pwm irq configs 
Change-Id: Idf54d512d8c4be462c8cf5280a0b2b8cbf18815d
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2023-11-29 15:13:46 +08:00
Jon Lin
a0c00d3e72 PCI: rockchip: dw: Support DMA linked list mode 
Change-Id: I0016897ce22dde35b379f23872324614e50b6713
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-11-29 11:11:22 +08:00
Jon Lin
4baf0d6fad PCI: rockchip: dw: Adding DMA linked list mode definition 
Change-Id: Ia4264d281296fc07c8567bf2306e5b45e09af458
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-11-29 11:11:22 +08:00
Yu Qiaowei
bb47c8ad34 video: rockchip: rga3: fix import failure does not return error code 
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ie1295d10b48b5e9775f0b66eeb0fd21bb916dded
 2023-11-29 11:09:26 +08:00
Cai YiWei
e47fab24c5 media: rockchip: isp: fix power_cnt if error 
Change-Id: I2c918827daeebb14af57c83cc1de2250a85422ca
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-11-29 11:06:20 +08:00
Eddy Zhang
75479b9711 drm: bridge: dw-hdmi: fix incorrect I2CM configuration 
In the old code, I2CM configuration was not performed when using a
separate controller, This will cause a wrong interrupt polarity
configuration and make communication confirmation timeout between
the Synopsys controller and Synopsys PHYs

Change-Id: Ie95e0f41164a33417bad5d17a722218c279624f9
Signed-off-by: Eddy Zhang <eddy.zhang@rock-chips.com>
 2023-11-29 11:05:33 +08:00
Eddy Zhang
b924b98ffa Revert "drm: bridge: dw-hdmi: Fixed ddc error caused by plug out hdmi when reading edid" 
This reverts commit 3f1bcfe6ec.

Change-Id: Ib2d1d621f8903601fd9cd03d74c23d2e758665a5
Signed-off-by: Eddy Zhang <eddy.zhang@rock-chips.com>
 2023-11-29 11:05:33 +08:00
shengfei Xu
76c5bcfc43 arm64: configs: rockchip_defconfig: Enable CONFIG_MFD_RK806_I2C 
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I115a5fbed17d3db420e6360d3f0acf8597f0ed92
 2023-11-29 11:01:36 +08:00
Damon Ding
bf5401325c arm64: dts: rockchip: rk3528: add pwm irq configs 
Change-Id: I426d21919ee8a3f674446797e56e36e5de96a181
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2023-11-29 10:52:05 +08:00
Damon Ding
7a7cdb6365 arm64: dts: rockchip: rk3328: add pwm irq configs 
Change-Id: I8d12796a9f58a5121f67d70434d3a4cf1c791474
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2023-11-29 10:48:42 +08:00
Damon Ding
d240b85d0b arm64: dts: rockchip: rk1808: add pwm irq configs 
Change-Id: I5d8f3ce9e9229e6b2ca810c6cf02b774b6e2a8fa
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2023-11-29 10:46:38 +08:00
Damon Ding
5ec7ab5d65 arm64: dts: rockchip: rk3568: add pwm irq configs 
Change-Id: I45dd3c50cbae6100c099714dcec5d39ce20a710a
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2023-11-28 16:40:20 +08:00
Mingwei Yan
851545fccc media: rockchip: isp: fix rv1106 cycle kill rkipc null pointer 
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I070878cb4d0fc31adabc76885b9090e4da982fc1
 2023-11-28 16:39:59 +08:00
Tony Zheng
7c102d5c0b arm64: rk3308_linux_defconfig: add CONFIG_DRM_IGNORE_IOTCL_PERMIT 
Change-Id: Ib86ee647d9f1f45bf3dfaba39ea39a83748b3c4a
Signed-off-by: Tony Zheng <tony.zheng@rock-chips.com>
 2023-11-28 09:20:22 +08:00
Zefa Chen
d4dcc9b2c5 media: i2c: add og01a10 driver 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4be70fac4eaaee48692edc843b6dbc0940acc3b1
 2023-11-27 19:45:23 +08:00
Zefa Chen
bc95e6862a media: i2c: mis4001 driver update version 0.01.02 
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
 2023-11-27 19:45:23 +08:00
Zefa Chen
28a0dfee1c media: i2c: imx464 fixes exposure error of short frame 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I73143f8dfb665d802c4d7ad911b6a1a50f4f612e
 2023-11-27 19:45:23 +08:00
Zefa Chen
7b51e6182b media: i2c: add og02b10 driver 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I462b4482600291ae7f0578dc96d7afcc10c7030d
 2023-11-27 19:45:23 +08:00
Sandy Huang
7acc7fe0ad arm64: dts: rockchip: rk3562: Add csu-clocks for vop 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I6c3993720446fb95683ae10f9b3e1b2aeac96959
 2023-11-27 19:28:02 +08:00
Sandy Huang
0c94344f32 drm/rockchip: vop2: Add csu clock support for rk3562 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I2f9f962902df0648e3f30ecd26eeb3e8fa475179
 2023-11-27 19:28:02 +08:00
Finley Xiao
29af394d95 arm64: dts: rockchip: rk3562: Add rockchip,csu for gmac 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Iae2cdaa474deaa0f7791f3227b60c4da3ffe4acb
 2023-11-27 19:28:01 +08:00
Finley Xiao
a7a8b96367 ethernet: stmmac: dwmac-rk: Add csu clock support 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I2498d053faf8c51f7c39ffd22e5f2bf6871d6a47
 2023-11-27 19:28:01 +08:00
Finley Xiao
2cb3623b0e arm64: dts: rockchip: rk3562: Add csu device node 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I552b695dff29072d5468b0a081cdc38c8575ebdf
 2023-11-27 19:28:01 +08:00
Finley Xiao
5aea0b9686 Revert "arm64: dts: rockchip: rk3562-rk817-tablet-v10: Change clkin div to 5 for aclk vo" 
This reverts commit 26d58236a5.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I24e24d5e806be7202c6002d6f323a89bc9cf967d
 2023-11-27 19:28:01 +08:00
Finley Xiao
56960b6e47 Revert "arm64: dts: rockchip: rk3562-evb1-lp4x-v10: Change clkin div to 5 for aclk vo" 
This reverts commit 24ea6649ad.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Iaa4453872c3addce15c5f78643293dd59a49089c
 2023-11-27 19:28:01 +08:00
Finley Xiao
62580d5332 arm64: configs: rockchip_linux_defconfig: Enable CONFIG_ROCKCHIP_CSU 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I38ba978f27b9b9bbdfb1e4d9702d15bac818c101
 2023-11-27 19:28:01 +08:00
Finley Xiao
14640886d0 arm64: configs: rockchip_defconfig: Enable CONFIG_ROCKCHIP_CSU 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Id6cefadc0c0056be8df84a11f601761f844d1779
 2023-11-27 19:28:01 +08:00
Finley Xiao
86d8a7fc28 soc: rockchip: Add clock subunit driver 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Id1d784d2549bf1c47066b572d32b396966c52c96
 2023-11-27 19:27:52 +08:00