shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,265,655 Commits 55 Branches 2,486 Tags
07ec49e06a2302eb702afeb3d5faa6dcb7cc02cd
Commit Graph

1265655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Huang
07ec49e06a Merge commit '246ee6e4ef7b22156d819ceeaa72079689021849' 
* commit '246ee6e4ef7b22156d819ceeaa72079689021849':
  arm64: dts: rockchip: rk3308-evb-audio-v10-display-rgb: modify cma size from 8M to 16M
  ARM: dts: rockchip: add rv1103g-evb2-v10.dts
  arm64: dts: rockchip: rk3399-android: add debug support
  arm64: dts: rockchip: rk3588-vehicle-evb: add maxim display dtsi to support split mode

Change-Id: I084278b9dbce97a97db9f8c541204634644a537a
 2023-12-15 21:17:40 +08:00
Tao Huang
c595af4c2e Merge commit '955e34ae9961aac0faa77111a1991a107eb66ed3' 
Merge made by the 'ours' strategy.

* commit '955e34ae9961aac0faa77111a1991a107eb66ed3':
  arm64: rk3308_linux_defconfig: sync from savedefconfig

Change-Id: Idfab9e17645f4b555a42820a977af586665eeb9b
 2023-12-15 21:17:02 +08:00
Lin Jianhua
b00c8c8acc arm64: rk3308_linux_defconfig: sync from savedefconfig 
Change-Id: Id078d38495de8f5ee792adfc7bd7bde7f8c42b1f
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2023-12-15 21:06:57 +08:00
Tao Huang
e862f66d37 Merge commit '786d0045885c9696d8c7af75d9d5bc97742ea8c1' 
* commit '786d0045885c9696d8c7af75d9d5bc97742ea8c1':
  mfd: rkx110_x120: fix compile no previous prototype warning
  misc: rockchip: pcie-rkep: Select PCIE_DW_DMATEST as default
  PCI: rockchip: dw-dmatest: Bind the dma transmission code with the device
  media: i2c: gc8034 add delay after power on

Change-Id: I3b22348d736ddb5c655311bfd45c9eb425566d39
 2023-12-15 21:04:55 +08:00
Tao Huang
12d9d01b24 Merge commit 'e0a3fc877881ace202d0e90fa876b25296a0b60f' 
Merge made by the 'ours' strategy.

* commit 'e0a3fc877881ace202d0e90fa876b25296a0b60f':
  mfd: rkx110_x120: register 2 panel when attach 2 screen

Change-Id: I8d78863e429f1c8d3d42170984fb6d628451523a
 2023-12-15 21:04:25 +08:00
Zhang Yubing
3d94b76d25 mfd: rkx110_x120: register 2 panel when attach 2 screen 
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I9469fd964871ca26484f95d532a87db7a936937d
 2023-12-15 20:46:39 +08:00
Tao Huang
1c637d485a Merge commit '339c882a12a3d8dc19cbf7671d8afb3afee3dc2d' 
* commit '339c882a12a3d8dc19cbf7671d8afb3afee3dc2d':
  media: i2c: add vcm driver dw9800v
  media: i2c: ov16885: add camera sensor driver
  mfd: display-serdes: modify function definition for maxim chips
  media: i2c: add os04d10 sensor driver
  arm64: dts: rockchip: rk3308-evb: Add rk3308 audio v10 board devicetree
  regulator: rk806: fixes return value when read register failed

Change-Id: I6e27bb7cbd5329cf287fbe833c49f33d3e84cd85

Conflicts:
	drivers/media/i2c/Kconfig
	drivers/media/i2c/Makefile
 2023-12-15 20:40:59 +08:00
Tao Huang
8b690ee359 Merge commit '0a70f80c917300162edc7a999ab9ce6fef16a793' 
Merge made by the 'ours' strategy.

* commit '0a70f80c917300162edc7a999ab9ce6fef16a793':
  mfd: rkx110_x120: add pwm support

Change-Id: Ib41b8a19114c1a5748480d9f38881e2e4a4a0769
 2023-12-15 20:38:25 +08:00
Damon Ding
bcc1d27f5a mfd: rkx110_x120: add pwm support 
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I6d1ffa9e26ebbec3a06b8cb274227c6cdd420e05
 2023-12-15 19:51:00 +08:00
Lin Jianhua
246ee6e4ef arm64: dts: rockchip: rk3308-evb-audio-v10-display-rgb: modify cma size from 8M to 16M 
Change-Id: I6d9b4e3be4231530531fd99df966fa5b175c0265
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
 2023-12-15 17:12:07 +08:00
Weiwen Chen
33a438dabd ARM: dts: rockchip: add rv1103g-evb2-v10.dts 
Change-Id: Ib1129a170917fc2a575a984f615217b09e61814a
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
 2023-12-15 17:06:07 +08:00
Wu Liangqing
eb131b8fbe arm64: dts: rockchip: rk3399-android: add debug support 
Change-Id: I0000d1cdff85a0989abacadef2cae48980ad2035
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
 2023-12-15 16:52:43 +08:00
Luo Wei
e15cb33d56 arm64: dts: rockchip: rk3588-vehicle-evb: add maxim display dtsi to support split mode 
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I19821aac62ab544fdfa6253ee3cda553a5bfc629
 2023-12-15 14:16:57 +08:00
Lin Jianhua
955e34ae99 arm64: rk3308_linux_defconfig: sync from savedefconfig 
Change-Id: Id078d38495de8f5ee792adfc7bd7bde7f8c42b1f
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
 2023-12-15 14:14:57 +08:00
Zhang Yubing
786d004588 mfd: rkx110_x120: fix compile no previous prototype warning 
Fixes: e0a3fc8778 ("mfd: rkx110_x120: register 2 panel when attach 2 screen")

Change-Id: Iccc663b6f523c1b4e3307712628406bf10163030
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
 2023-12-15 14:13:44 +08:00
Jon Lin
8b565da34c misc: rockchip: pcie-rkep: Select PCIE_DW_DMATEST as default 
Change-Id: I23d3fe2e1ba7a6726b888432fa86b646867c0d61
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-12-15 09:49:14 +08:00
Jon Lin
231360c3df PCI: rockchip: dw-dmatest: Bind the dma transmission code with the device 
Change-Id: Ida6d0b66c259bb4ddd8e84662f3df4ff0c37987c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-12-15 09:48:59 +08:00
Ye Zhang
132cfbfd6a arm64: dts: rockchip: rk3308: Add trips for gpu thermal node 
This patch fixes the below error.

thermal_sys: Failed to find 'trips' node
thermal_sys: Failed to find trip points for tsadc id=1
rockchip-thermal ff1f0000.tsadc: failed to register sensor 1: -22
rockchip-thermal ff1f0000.tsadc: failed to register sensor[1] : error = -22
rockchip-thermal: probe of ff1f0000.tsadc failed with error -22

Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com>
Change-Id: I933b45c9e55a4cc25b899c950698cf935f6755aa
 2023-12-15 09:36:51 +08:00
Ye Zhang
d643fdc997 arm64: dts: rockchip: px30: Add trips for gpu thermal node 
This patch fixes the below error.

thermal_sys: Failed to find 'trips' node
thermal_sys: Failed to find trip points for tsadc id=1
rockchip-thermal ff280000.tsadc: failed to register sensor 1: -22
rockchip-thermal ff280000.tsadc: failed to register sensor[1] : error = -22
rockchip-thermal: probe of ff280000.tsadc failed with error -22

Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com>
Change-Id: Idbc0a6671ab52213b826fa313bbd281254ea3bd6
 2023-12-15 09:34:40 +08:00
Ye Zhang
010139c313 ARM: dts: rockchip: rv1126: Add trips for npu thermal node 
This patch fixes the below error.

thermal_sys: Failed to find 'trips' node
thermal_sys: Failed to find trip points for tsadc id=1
rockchip-thermal ff5f8000.tsadc: failed to register sensor 1: -22
rockchip-thermal ff5f8000.tsadc: failed to register sensor[1] : error = -22
rockchip-thermal: probe of ff5f8000.tsadc failed with error -22

Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com>
Change-Id: I6ea02d8b720b494b213275804bbca039abaa1357
 2023-12-15 09:24:55 +08:00
Zefa Chen
031478d665 media: i2c: gc8034 add delay after power on 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1af45405869ff05f52318ea9237d9cf2f9906ccd
 2023-12-15 09:17:45 +08:00
Zhang Yubing
e0a3fc8778 mfd: rkx110_x120: register 2 panel when attach 2 screen 
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I9469fd964871ca26484f95d532a87db7a936937d
 2023-12-14 19:04:35 +08:00
Wang Panzhenzhuan
339c882a12 media: i2c: add vcm driver dw9800v 
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ic63a1bd40e4b6d209abe935a25552ccf6804f2a1
 2023-12-14 18:56:41 +08:00
Wang Panzhenzhuan
fae86dd645 media: i2c: ov16885: add camera sensor driver 
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I40ffcac0d695e11a561fb65c344b62643ee12f80
 2023-12-14 18:45:53 +08:00
Luo Wei
22e7707be9 mfd: display-serdes: modify function definition for maxim chips 
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I4a304304df468ad00e2bcf49f0d6bd5617d6757e
 2023-12-14 18:34:14 +08:00
Su Yuefu
239e5e386f media: i2c: add os04d10 sensor driver 
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: Icbfdde0ccb54d014fa58ea13b562abcc10f25390
 2023-12-14 15:50:07 +08:00
Tao Huang
32a4fc2c55 Merge commit 'b7adbc93a7494e848e11897db39f917c5874b445' 
* commit 'b7adbc93a7494e848e11897db39f917c5874b445':
  ARM: dts: rockchip: rv1106g-cvr: Supports dual-channel sensors
  ARM: dts: rockchip: rv1106-mcu-v20: Added MCU panel general configuration
  video: rockchip: vtunnel: do not fput fence file after fd install
  drm/rockchip: vop2: move crtc_clock check to mode_fixup for rk3528

Change-Id: Icc9b5ef59b0362497768fcd1b36165aa4e7c776e
 2023-12-13 19:37:28 +08:00
Tao Huang
99dd9ad1ab Merge commit '58e55eb624c66f4e0fae1d55578e211c6f838385' 
* commit '58e55eb624c66f4e0fae1d55578e211c6f838385':
  drm/rockchip: vop2: add rockchip_drm_dclk_set_rate for some special pll
  clk: rockchip: rk35xx: fix dclk_vop flags for drm dclk set rate
  ARM: dts: rockchip: rv1106g-dual: Swap front and rear road positions
  media: rockchip: hdmirx: low latency support fence
  media: rockchip: hdmirx: support hdmirx low latency function
  arm64: dts: rockchip: px30: add gpio aliases

Change-Id: I89a422bdb66c7ea4dfab13f2e42ca041eaf0c87c

Conflicts:
	drivers/gpu/drm/rockchip/rockchip_drm_drv.h
 2023-12-13 19:32:15 +08:00
Ye Zhang
d84481d736 arm64: dts: rockchip: rk3399: Add trips for gpu thermal node 
This patch fixes the below error.

thermal_sys: Failed to find 'trips' node
thermal_sys: Failed to find trip points for tsadc id=1
rockchip-thermal ff260000.tsadc: failed to register sensor 1: -22
rockchip-thermal ff260000.tsadc: failed to register sensor[1] : error = -22
rockchip-thermal: probe of ff260000.tsadc failed with error -22

Fixes: 778ce099dc ("arm64: dts: rockchip: add the IPA needed parameters for rk3399 thermal")
Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com>
Change-Id: Ia438b0f900c93267c3196d70b26db2e79e0a271b
 2023-12-13 19:08:51 +08:00
Huang zhibao
a0526a852a arm64: dts: rockchip: rk3308-evb: Add rk3308 audio v10 board devicetree 
Change-Id: Iee1408489e71f501563d64d68a0e0cec51426353
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
 2023-12-13 18:36:50 +08:00
shengfei Xu
a14b4e1f4c regulator: rk806: fixes return value when read register failed 
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I0163ddf976d6b5b0266ddc4376020e6bcb0522df
 2023-12-13 18:29:37 +08:00
Damon Ding
0a70f80c91 mfd: rkx110_x120: add pwm support 
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I6d1ffa9e26ebbec3a06b8cb274227c6cdd420e05
 2023-12-13 18:23:45 +08:00
Li Hangyu
b7adbc93a7 ARM: dts: rockchip: rv1106g-cvr: Supports dual-channel sensors 
Change-Id: Ifdadb74d6670d18de4299d179c6c6dd72cb70316
Signed-off-by: Li Hangyu <hangyu.li@rock-chips.com>
 2023-12-13 18:10:17 +08:00
Li Hangyu
371e924377 ARM: dts: rockchip: rv1106-mcu-v20: Added MCU panel general configuration 
Separate some configuration items of "rv1106g-evb1-mcu-display-v20.dts"
so that they can be used as common configurations

Change-Id: I72323b9342235f1c1e9b1c131ead3aabbe9dd51e
Signed-off-by: Li Hangyu <hangyu.li@rock-chips.com>
 2023-12-13 18:09:29 +08:00
Sandy Huang
2d7e051cf5 drm/rockchip: vop: fix AFBC format check error 
Fixes: fa6c7f1111 ("drm/rockchip: vop: sync with linux-4.19 for rk3399 vop")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I8d2bb4980d6a4c875af8f20d9358fd98ebc0f74a
 2023-12-13 18:07:30 +08:00
Finley Xiao
b2077d12a7 arm64: dts: rockchip: rk3399: Fix nvmem-cell-names for opp table 
Change-Id: Ie6f60d0beec1a721aa4237bccbcfeca7e0e29985
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
 2023-12-13 18:06:32 +08:00
Finley Xiao
a2a92da5ef arm64: dts: rockchip: rk3328: Fix nvmem-cell-names for opp table 
Change-Id: I7a33115d45f9764eee44ddc884fa1e68e1cb4c81
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
 2023-12-13 18:06:32 +08:00
Finley Xiao
c05a42749d arm64: dts: rockchip: px30: Fix nvmem-cell-names for opp table 
Change-Id: I3f9d0028e2e1d4ef78e29faa69c48e7e5f60bd14
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
 2023-12-13 18:06:32 +08:00
Finley Xiao
1d614d3cd9 ARM: dts: rockchip: Fix nvmem-cell-names for opp table 
Change-Id: I8d96287159c8a58b94664db6573c978ff3733d32
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
 2023-12-13 18:05:33 +08:00
Zhen Chen
c19692bbff Mali: midgard: import DMA_BUF module namespace 
Fix compilation errors when building as modules:

ERROR: modpost: module midgard_kbase uses symbol dma_buf_end_cpu_access from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_mmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_begin_cpu_access from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_get from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module midgard_kbase uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.

Change-Id: I36b1f2bb0f1c9018a795d9640f64656a275bfb28
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
 2023-12-13 11:04:53 +08:00
Rimon Xu
7c4a3b6468 video: rockchip: vtunnel: do not fput fence file after fd install 
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
Change-Id: I2d596aa981dac5a32267f4f08935fb0401186ead
 2023-12-13 09:47:17 +08:00
Damon Ding
3aa5acec15 drm/rockchip: vop2: move crtc_clock check to mode_fixup for rk3528 
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I207dbe09f17991e9a107cc2df5e7b130600be7b7
 2023-12-13 08:47:47 +08:00
Sandy Huang
58e55eb624 drm/rockchip: vop2: add rockchip_drm_dclk_set_rate for some special pll 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I12f1e797d02253ce97b46e6845144f09db101485
 2023-12-13 08:47:37 +08:00
Elaine Zhang
842ad2732d clk: rockchip: rk35xx: fix dclk_vop flags for drm dclk set rate 
The specify dclk setting rules in drm.

Change-Id: I802b28005ca76b13836d2ead04954d67ee3f625b
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
 2023-12-13 08:45:21 +08:00
Li Hangyu
243648ee57 ARM: dts: rockchip: rv1106g-dual: Swap front and rear road positions 
Change-Id: I8c4824a7593efa4062d07495070a0a320361bcc4
Signed-off-by: Li Hangyu <hangyu.li@rock-chips.com>
 2023-12-12 20:05:01 +08:00
Dingxian Wen
588c040ed1 media: rockchip: hdmirx: low latency support fence 
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I1d86ace09f73e7794b6e682a1438ad691a24ab59
 2023-12-12 19:09:47 +08:00
Dingxian Wen
6d8b5b33d5 media: rockchip: hdmirx: support hdmirx low latency function 
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I6a03bdfae6436972c3875711c8c2e75aa24c4c82
 2023-12-12 19:09:47 +08:00
Elaine Zhang
a2b651515a clk: rockchip: rk3568: Mark clk_msch and parent clk as critical 
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ia622a8537c3ce3d4d98c352672b79ac86c05add4
 2023-12-12 18:23:34 +08:00
Tao Huang
8e7b38ba25 Merge commit '7f71d2776b12d75dababf4dc1a98ca0d8a3205f4' 
* commit '7f71d2776b12d75dababf4dc1a98ca0d8a3205f4':
  PCI: rockchip: dw: Support IRQ user
  misc: rockchip: pcie-rkep: Change to use pci_request_irq apis.
  arm64: dts: rockchip: Covert ciu-drv to ciu-drive for matching the driver
  media: i2c: imx415: fix issues for thunderboot

Change-Id: I9f617a032a1c14ec377c93e05bb63fca5376d584
 2023-12-12 17:50:44 +08:00
Tao Huang
54f1bbde22 Merge commit '27061736bc5c6fab8bfeb0739c82fff1e2a48c3a' 
Merge made by the 'ours' strategy.

* commit '27061736bc5c6fab8bfeb0739c82fff1e2a48c3a':
  media: i2c: imx415: add 720P config

Change-Id: Ib445c3c11a232a8127b674e7bde6073d8e8584b8
 2023-12-12 17:50:27 +08:00