Commit Graph

1256239 Commits

Author SHA1 Message Date
Tao Huang
ee2ea83260 Merge commit '510972e61e134b53564795e4f5319be7a2faae95'
* commit '510972e61e134b53564795e4f5319be7a2faae95':
  rpmsg: rockchip: Add Soft IRQ Mode Support
  arm64: dts: rockchip: rk356x-evb: update claa070wp03xg panel timing
  ARM: dts: rockchip: update the map of mmc_idmac for rv1106-tb*_mmc
  ARM: dts: rockchip: add clock refs for rv1106-tb*_mmc
  soc: rockchip: thunderboot_mmc: enable clk_emmc before accessing
  drm/rockchip: vop: check for valid sdr2hdr eoth
  drm/rockchip: vop2: make sure the bpp is not zero
  ARM: rv1106-evb.config: enable CONFIG VIDEO SC450AI/SC401AI/SC200AI
  ARM: dts: rockchip: rv1106-evb-cam: add sc450ai/sc401ai/sc200ai

Change-Id: I606b631e81fab4c5f92d3a53b4577bc4da0e93dc
2023-11-06 11:12:00 +08:00
Tao Huang
df9e22fec7 Merge commit 'ef1fb629c500d75ae3cd1bf7fbfe38ade30edd0b'
* commit 'ef1fb629c500d75ae3cd1bf7fbfe38ade30edd0b':
  media: i2c: add sc450ai support

Change-Id: I39d21053083223db0fbf4727744e5d542e240549

Conflicts:
	drivers/media/i2c/Kconfig
2023-11-06 11:11:30 +08:00
Tao Huang
796ecb79e1 Merge commit 'ccc60a624971b61ccbe2780289b39fae1c2e88d2'
* commit 'ccc60a624971b61ccbe2780289b39fae1c2e88d2':
  media: rockchip: vicap support to do reset in online mode
  media: rockchip: isp support to do reset in online mode
  arm64: dts: rockchip: rk3588 boards: Fix bitclock-inversion
  arm64: dts: rockchip: rk356x boards: Fix bitclock-inversion
  arm64: dts: rockchip: rk3528 boards: Fix bitclock-inversion
  arm64: dts: rockchip: rk3399-tve1205g: Fix bitclock-inversion
  arm64: dts: rockchip: rk3326-evb: Fix bitclock-inversion
  video: rockchip: mpp: Add uapi header
  soc: rockchip: tb_service: add memory-no-free property support

Change-Id: I068ca307ee0ec53eb570ce4f7fd5604c6bb796d8
2023-11-06 11:06:11 +08:00
Hongming Zou
510972e61e rpmsg: rockchip: Add Soft IRQ Mode Support
1. Add a way to trigger soft interrupts for rpmsg communication
soft irq refers to reserved irq in shared peripheral interrupt (SPI).

2. Rename rockchip_rpmsg.c to rockchip_rpmsg_mbox.c.

Change-Id: I8007f4b77ba669073db9074e9c19623c37c27fb6
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-11-01 18:12:01 +08:00
Chaoyi Chen
43dfdb1bc3 arm64: dts: rockchip: rk356x-evb: update claa070wp03xg panel timing
Change-Id: I1b2a7fa60bdd73c2a0016044c219540a396992e1
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2023-11-01 17:10:35 +08:00
Weiwen Chen
2578958855 ARM: dts: rockchip: update the map of mmc_idmac for rv1106-tb*_mmc
The mmc_idmac run at the address [512KB ~ (2M - 8KB)] which is SPL's
Stack and Heap.
SPL'mmc_idmac use malloc and Kernel reserve this memory.

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I267759d6acd1137a19e0e5d534c481b8f579b1ee
2023-11-01 17:10:18 +08:00
Ziyuan Xu
d5ec07e871 ARM: dts: rockchip: add clock refs for rv1106-tb*_mmc
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I1d4a94a3ba522fcb4d9ff44be0d8324a813fd81d
2023-11-01 17:09:40 +08:00
Ziyuan Xu
b908341ad3 soc: rockchip: thunderboot_mmc: enable clk_emmc before accessing
Avoid the *clk_emmc* are disabled by *unused_off* when the ramdisk is
too large.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I38b6f33ab55fbb65781ee266237382c977848e68
2023-11-01 17:07:49 +08:00
Finley Xiao
71f1b94ae2 Mali: midgard: Fix mdevp opp info NULL
Fixes: 5577e94f30 ("Mali: midgard: Use new APIs for devfreq")

Change-Id: I55e2e037b5d1ef338abfc863d5d7d03534806cc0
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-11-01 11:27:20 +08:00
Zhen Chen
9e4bae6d2b Mali: midgard: use platform_get_irq_byname() to obtain IRQ numbers
referencing bifrost/

Change-Id: I880f79dcafcb8da6d5f44c033cf8f3290b136acb
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2023-11-01 11:26:42 +08:00
Andy Yan
14fe560ebd drm/rockchip: vop: check for valid sdr2hdr eoth
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I8de0881df1c49f3b7365dbd6b33a716cd746ad98
2023-11-01 11:22:00 +08:00
Andy Yan
3f00c490d3 drm/rockchip: vop2: make sure the bpp is not zero
The bpp should not be a zero value.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I1a1f9214087639f63c101d0d5c68ee470c852649
2023-11-01 11:22:00 +08:00
LiuDiMing Lin
4fec67500f ARM: rv1106-evb.config: enable CONFIG VIDEO SC450AI/SC401AI/SC200AI
Signed-off-by: LiuDiMing Lin <fenrir.lin@rock-chips.com>
Change-Id: I8541cd64556eca8f958a4becc43ac22c4253789a
2023-10-31 20:13:33 +08:00
LiuDiMing Lin
6aef36d7b6 ARM: dts: rockchip: rv1106-evb-cam: add sc450ai/sc401ai/sc200ai
Signed-off-by: LiuDiMing Lin <fenrir.lin@rock-chips.com>
Change-Id: I3349cb999e9a204e76ad883e25af85c1762c6866
2023-10-31 20:13:25 +08:00
LiuDiMing Lin
ef1fb629c5 media: i2c: add sc450ai support
Signed-off-by: LiuDiMing Lin <fenrir.lin@rock-chips.com>
Change-Id: Id8e49af4fe64557238a226da6abbb6b80d849a44
2023-10-31 20:13:13 +08:00
Zefa Chen
ccc60a6249 media: rockchip: vicap support to do reset in online mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibea46658e5d9a41b4f5685838230321e9b71032e
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
2023-10-31 20:11:26 +08:00
Mingwei Yan
5c222a001f media: rockchip: isp support to do reset in online mode
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I32a2aa91258130a69ec09e5743e27f8c85279322
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
2023-10-31 20:11:26 +08:00
Sugar Zhang
a86b62fb9b arm64: dts: rockchip: rk3588 boards: Fix bitclock-inversion
simple-audio-card,bitclock-inversion is a boolean property.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I2f69c4fd79b6f2b2cc06d69f720671227901482c
2023-10-31 20:11:04 +08:00
Sugar Zhang
1e839d738b arm64: dts: rockchip: rk356x boards: Fix bitclock-inversion
simple-audio-card,bitclock-inversion is a boolean property.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ic8f1028e97a29e0af257a860be9b2022511c7a9a
2023-10-31 20:10:46 +08:00
Sugar Zhang
6131b1b779 arm64: dts: rockchip: rk3528 boards: Fix bitclock-inversion
simple-audio-card,bitclock-inversion is a boolean property.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I019257ca1585bcb0c531589bc8a8205842cff00d
2023-10-31 20:10:24 +08:00
Sugar Zhang
e3f6c3e4c5 arm64: dts: rockchip: rk3399-tve1205g: Fix bitclock-inversion
simple-audio-card,bitclock-inversion is a boolean property.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I7a9d17eebe4b5037f3976a8b70e5bef44d24cdd3
2023-10-31 20:09:18 +08:00
Sugar Zhang
0f41d6c903 arm64: dts: rockchip: rk3326-evb: Fix bitclock-inversion
simple-audio-card,bitclock-inversion is a boolean property.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I141b6edcfbcbdafffed1d29b2b9273ac461e894e
2023-10-31 20:08:48 +08:00
Herman Chen
a1410c65b3 video: rockchip: mpp: Add uapi header
Change-Id: Id419e6a57adaf37371be8757b2435db0cffe7350
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2023-10-31 20:04:37 +08:00
Ziyuan Xu
ef83daca54 soc: rockchip: tb_service: add memory-no-free property support
Some product scenarios would like the rtos's memory space always been
exclusive.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ib71da6b355995ab5b12ddfdf346bbce8e1852745
2023-10-31 19:08:04 +08:00
Tao Huang
c10819c672 Merge commit '2c17810b099a0eae28cfc9f9c115431c1e9b0164'
* commit '2c17810b099a0eae28cfc9f9c115431c1e9b0164':
  media: rockchip: vicap: fixes warning of clk disable when dev suspend

Change-Id: I3e431f1719b2c1dd96833fa9cbc86fa86a68b6f0
2023-10-31 18:41:28 +08:00
Zefa Chen
2c17810b09 media: rockchip: vicap: fixes warning of clk disable when dev suspend
iclk_csihost1 already disabled
WARNING: CPU: 1 PID: 1977 at drivers/clk/clk.c:1040 clk_core_disable+0x88/0x220
Modules linked in: bcmdhd r8168
CPU: 1 PID: 1977 Comm: binder:315_4 Not tainted 6.1.25 #139
Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
pstate: 604000c9 (nZCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : clk_core_disable+0x88/0x220
lr : clk_core_disable+0x88/0x220
sp : ffffffc01221b9a0
x29: ffffffc01221b9a0 x28: ffffff8102014d28 x27: 0000000000000000
x26: ffffff8102014c10 x25: ffffffc00a22b000 x24: ffffffc00a171000
x23: ffffff814e3e5c80 x22: ffffffc00a222000 x21: ffffffc00a222000
x20: ffffff810024fe00 x19: ffffff810024fe00 x18: ffffffc00add90b0
x17: 0000000000000013 x16: ffffffffffffffff x15: 0000000000000004
x14: ffffffc009dbdf18 x13: 0000000000003fff x12: 0000000000000003
x11: 00000000ffffbfff x10: c0000000ffffbfff x9 : e683b01efecc8800
x8 : e683b01efecc8800 x7 : 205b5d3835343931 x6 : 342e39322020205b
x5 : ffffffc00a1f37c7 x4 : ffffffc01221b6d7 x3 : 0000000000000000
x2 : 0000000000000000 x1 : ffffffc01221b740 x0 : 000000000000001e
Call trace:
 clk_core_disable+0x88/0x220
 clk_core_disable_lock+0x9c/0x130
 clk_disable+0x20/0x2c
 rkcif_sleep_suspend+0x3c/0x6c

Fixes: af37f2152d ("media: rockchip: vicap fixes suspend/resume")
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I49f7adf948c9049ec6ad8fea8f8089e991e39b91
2023-10-31 18:18:10 +08:00
Tao Huang
294b431a58 Merge commit 'a7c7116f785844bdd3f8c9e13d66aac64374cb83'
* commit 'a7c7116f785844bdd3f8c9e13d66aac64374cb83':
  driver: rknpu: Fix probe failed due to missing interrupt names in DTS in kernel 6.10
  ASoC: rockchip: utils: include rockchip_utils.h for missing prototype
  arm64: dts: rockchip: Add rk3562-evb2-ddr4-v10-linux-amp.dts

Change-Id: Ib8058157dfe0d0160fa4aacc74348cb598840bc8
2023-10-31 11:17:48 +08:00
Tao Huang
452453dc55 Merge commit 'a662526fcbe1281b7dcdb74c136feb87eab99646'
Merge using ours merge strategy.

* commit 'a662526fcbe1281b7dcdb74c136feb87eab99646':
  drm/fourcc: add and update rockchip modifier format define
  mtd: spi-nor: gigadevice: Support gd25lb256

Change-Id: If9066a2f63875524854fd338b4d07557a3e6d00b
2023-10-31 11:17:12 +08:00
Sandy Huang
558c82b92a drm/fourcc: add and update rockchip modifier format define
1. update rockchip tiled modifier format define;
2. add rockchip rfbc modifier format define, rfbc is rockchip
framebuffer compression format, it's will supported by rockchip
video decoder, RGA and VOP modules, and the superblocks size is 64x4.

Fixes: f727d3ad8e ("drm/fourcc: Add definitions for Rockchip vendor and VPU tiled format")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ice06eda4819254ba670a7231836cabe46bc38137
2023-10-31 11:15:47 +08:00
Jon Lin
9c39ec33b0 mtd: spi-nor: gigadevice: Support gd25lb256
Change-Id: I6934e4bfd0ded64f05ea6dc738d73d6ea1131f42
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-10-31 11:09:23 +08:00
Tao Huang
fe73b8d04d Merge commit 'ebce6934858d9a3bb9138c8f97716ed46b87ed37'
* commit 'ebce6934858d9a3bb9138c8f97716ed46b87ed37':
  media: rockchip: vicap support to set quick stream
  include: uapi: rkcif-config.h: add cmd RKCIF_CMD_SET_QUICK_STREAM
  media: rockchip: vicap: resume/suspend with rtt
  media: rockchip: vicap fix online stop switch mode to rdbk

Change-Id: I456d3860ed504cf1edadafbc0ba749b82924a3fc
2023-10-31 11:08:13 +08:00
Tao Huang
bbeb0a6133 Merge commit '534dc2d08b251dc7d13aa005626ed3b6fddf389f'
Merge using ours merge strategy.

* commit '534dc2d08b251dc7d13aa005626ed3b6fddf389f':
  media: rockchip: vicap support capture raw online with only one buffer

Change-Id: Ia0f1bd6381a643d251b09f5af2a51759d036063b
2023-10-31 11:07:48 +08:00
Zefa Chen
8bba4bcdbb media: rockchip: vicap support capture raw online with only one buffer
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6e4be9633798c3c666dbc36221acbbf3d5df0c35
2023-10-31 10:49:54 +08:00
Tao Huang
fa8191a8fd Merge commit 'af37f2152d1bdc8e2859810c51bc441bf67e780d'
* commit 'af37f2152d1bdc8e2859810c51bc441bf67e780d':
  media: rockchip: vicap fixes suspend/resume
  phy: rockchip: mipi csidphy fixed register of write/read out of range
  Mali: bifrost: log: Add task_comm of contexts in OOM notification log
  Mali: bifrost: log: Add pid and task_comm of contexts in the info read from node "gpu_memory"
  arm64: configs: px30_linux_defconfig: enable CONFIG_DRM_IGNORE_IOTCL_PERMIT
  phy: rockchip: mipi-dcphy: fix null point cause reboot issue
  BACKPORT: pinctrl: rockchip: fix reading pull type on rk3568
  ASoC: rockchip: sai: Use DMC-DVFS-SCENE for HBR audio
  ASoC: rockchip: i2s: Use DMC-DVFS-SCENE for HBR audio

Change-Id: Ibecb4b81024dfd6ad6df341784ca637b2b0c270a
2023-10-31 10:29:00 +08:00
Tao Huang
a6bdde3e26 Merge commit 'adb52b660051c9ff11d4509a807035f9d952a27a'
* commit 'adb52b660051c9ff11d4509a807035f9d952a27a':
  ASoC: rockchip: i2s-tdm: Use DMC-DVFS-SCENE for HBR audio
  ASoC: rockchip: Introduce rockchip utils common API
  mtd: spinand: xtx: Support new device XT26G0xDWSIGA
  PM / devfreq: rockchip_dmc: support get dmcfreq stall time

Change-Id: I16ba5a625b339e3dbcd8628a2b48266c783ae68f

Conflicts:
	sound/soc/rockchip/rockchip_i2s_tdm.c
2023-10-31 10:26:58 +08:00
Tao Huang
6601f1c1b9 Merge commit 'e797ca0abf4f26595730ddb86db71f9f88c28d80'
Merge using ours merge strategy.

* commit 'e797ca0abf4f26595730ddb86db71f9f88c28d80':
  ANDROID: usb: gadget: fix cannot create multiple android instances

Change-Id: I1aac9a593f337af45648c8197cd860ab83ba7fe4
2023-10-31 10:22:54 +08:00
Tao Huang
2351d7f0ad Merge commit '059a18f32f1db89e019885d2c9786dfe9b65ca3c'
* commit '059a18f32f1db89e019885d2c9786dfe9b65ca3c':
  misc: rockchip: pcie-rkep: Support clear id for pcie_rkep_release
  misc: rockchip: pcie-rkep: Support raising ep elbi int by ioctl
  misc: rockchip: pcie-rkep: Support adding virtual id by ioctl
  serial: 8250_dma: fix bug when tx dma is enable
  arm64: dts: rockchip: rk3588-vehicle-evb: improve lcd init of serdes display
  mfd: display-serdes: add soft reset and delay control support
  ARM: configs: rockchip: update rv1106-wakeup.config
  ARM: dts: rockchip: update rv1106g-evb2-v12-wakeup

Change-Id: I5c1687d7bab6e49ad160245f40df571090d7e0ed
2023-10-31 10:16:28 +08:00
Felix Zeng
a7c7116f78 driver: rknpu: Fix probe failed due to missing interrupt names in DTS in kernel 6.10
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: Ie109c814b0c4f3e6b6ddc0c6e12fd58a2e645036
2023-10-31 10:07:35 +08:00
Finley Xiao
3ac1d20ce9 dt-bindings: power: rockchip: Add bindings for rk3562
Document dt-bindings for RK3562 power-controller.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I755b753bb08aab5a9c2b1ee8784f762a8bdf368a
2023-10-31 10:01:22 +08:00
Tao Huang
ce595e7f0c ASoC: rockchip: utils: include rockchip_utils.h for missing prototype
sound/soc/rockchip/rockchip_utils.c:115:6: warning: no previous prototype for 'rockchip_utils_get_performance' [-Wmissing-prototypes]
sound/soc/rockchip/rockchip_utils.c:135:6: warning: no previous prototype for 'rockchip_utils_put_performance' [-Wmissing-prototypes]

Fixes: ff0c025724 ("ASoC: rockchip: Introduce rockchip utils common API")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ida15cf7c465fbabea0f0db9bfd21f4577e9e8dbd
2023-10-31 09:23:33 +08:00
Steven Liu
ddab942b9e gpio: rockchip: Set input direction in irq_request_resources
Set input direction to avoid FLAG_IS_OUT in gpiochip_lock_as_irq

Fixes: adc8b4bf2a ("gpio: rockchip: lock GPIOs used as interrupts")
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ib5bb752b410894cd0fd9694f332f902d07ca9701
2023-10-30 20:18:17 +08:00
Jiahang Zheng
b368ed36e3 arm64: dts: rockchip: Add rk3562-evb2-ddr4-v10-linux-amp.dts
Signed-off-by: Jiahang Zheng <jiahang.zheng@rock-chips.com>
Change-Id: I9770e87f0002cd170867f7d717732c9785b2e732
2023-10-30 19:30:49 +08:00
Sandy Huang
a662526fcb drm/fourcc: add and update rockchip modifier format define
1. update rockchip tiled modifier format define;
2. add rockchip rfbc modifier format define, rfbc is rockchip framebuffer
compression format, it's will supported by rockchip video decoder, RGA and VOP
modules, and the superblocks size is 64x4.

Fixes: f727d3ad8e ("drm/fourcc: Add definitions for Rockchip vendor and VPU tiled format")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ice06eda4819254ba670a7231836cabe46bc38137
2023-10-30 19:30:13 +08:00
Jon Lin
c050db5c79 mtd: spi-nor: gigadevice: Support gd25lb256
Change-Id: I6934e4bfd0ded64f05ea6dc738d73d6ea1131f42
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-10-30 19:26:36 +08:00
Zefa Chen
ebce693485 media: rockchip: vicap support to set quick stream
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Idbf038d79080b394c5bb614a0b04039964624ab5
2023-10-30 19:26:11 +08:00
Zefa Chen
534dc2d08b media: rockchip: vicap support capture raw online with only one buffer
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6e4be9633798c3c666dbc36221acbbf3d5df0c35
2023-10-30 19:26:11 +08:00
Zefa Chen
af37f2152d media: rockchip: vicap fixes suspend/resume
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1d7e7d8f521fca3bda4f3599a7b34233e1a94bc2
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
2023-10-30 19:26:11 +08:00
Zefa Chen
368a33796a include: uapi: rkcif-config.h: add cmd RKCIF_CMD_SET_QUICK_STREAM
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib6bd9116605ea8feb9cc0826cc2c5c359aa91b08
2023-10-30 19:26:11 +08:00
Zefa Chen
6a556c2b9e media: rockchip: vicap: resume/suspend with rtt
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic45894930f97eb8b4e32fc202630f88a5f6e67be
2023-10-30 19:26:11 +08:00
Mingwei Yan
a253fe656c media: rockchip: vicap fix online stop switch mode to rdbk
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: Icf19cdfaeada77a781fb32e1e97fc8f6965af249
2023-10-30 19:26:11 +08:00