Commit Graph

1255310 Commits

Author SHA1 Message Date
Shawn Lin
02e11db293 arm64: dts: rockchip: rk3562: Fix PCIe node
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I6deb77ddd8ce5593cd6daf636ac85d2274214fb9
2023-06-29 11:24:19 +08:00
Shawn Lin
7c71be7bbb arm64: dts: rockchip: rk3528: Fix PCIe node
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I0056c9260f30c30120e34a4d8d74d71950456a6d
2023-06-29 11:24:09 +08:00
Shawn Lin
5c7c022717 arm64: dts: rockchip: rk3588: Fix PCIe node
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Iac3f0af7d8911cf188cc29788b4777a446536362
2023-06-29 11:23:56 +08:00
Shawn Lin
7439ad8700 arm64: dts: rockchip: rk3588s: Fix PCIe node
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Iac3f0af7d8911cf188cc29788b4777a446536361
2023-06-29 11:23:46 +08:00
Tao Huang
aea0f350c4 Merge commit '5dfd3c6a1be9482099ea2a70479e3e50ae92b698'
* commit '5dfd3c6a1be9482099ea2a70479e3e50ae92b698':
  rfkill: bt: fix unbalanced wake_host_io
  drm/rockchip: rgb: add support for rgb666_3x6 and rgb565_2x8 modes
  drm/rockchip: vop: add support for rgb666_3x6 and rgb565_2x8 modes
  media: uapi: add MEDIA_BUS_FMT_RGB666_3X6 media bus format
  driver: rknpu: Compatible with kernel 6.1 compilation, version: 0.8.9
  misc: Add rk628 misc drivers
  drm/rockchip: vop3: update acm info when it change

Change-Id: I8ab22d964e62f265715d33a73d76d1144faeddd5
2023-06-29 10:05:56 +08:00
Yao Xiao
5dfd3c6a1b rfkill: bt: fix unbalanced wake_host_io
Change-Id: Ie486db27454a78f145d94b2c71b88e1ce3ab605b
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
2023-06-28 20:10:49 +08:00
Tao Huang
f87e68d7c4 ASoC: codecs: rk730: Remove now redundant non_legacy_dai_naming flag
The ASoC core has now been changed to default to the non-legacy DAI
naming, as such drivers using the new scheme no longer need to specify
the non_legacy_dai_naming flag.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4395bb04b0a959d1372c0a10359b83c75d96efb2
2023-06-28 17:15:36 +08:00
Tao Huang
b44bb22ace ASoC: rockchip: dlp: Fix compilation errors on kernel 6.1
sound/soc/rockchip/rockchip_dlp.c:434:16: error: 'struct snd_soc_pcm_runtime' has no member named 'num_cpus'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaa54add4e0779ba4ddd4f3225799250cde089f1c
2023-06-28 17:11:42 +08:00
Damon Ding
7bdc7c13c5 drm/rockchip: rgb: add support for rgb666_3x6 and rgb565_2x8 modes
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I9ae49745e0e8eca4672f3600d8a770279714fe98
2023-06-28 16:45:31 +08:00
Damon Ding
e9a74303e1 drm/rockchip: vop: add support for rgb666_3x6 and rgb565_2x8 modes
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I6a6f3610c9e9e7c8c7869796c0de318af19666da
2023-06-28 16:45:22 +08:00
Damon Ding
e59bb483a2 media: uapi: add MEDIA_BUS_FMT_RGB666_3X6 media bus format
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Idee22ed5875a58e22c89f7013c7c790a072a2e1a
2023-06-28 16:45:14 +08:00
Felix Zeng
89a2d47db7 driver: rknpu: Compatible with kernel 6.1 compilation, version: 0.8.9
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: I88ca7a85e3ea5e2a410f48a5789f17b57ffb267e
2023-06-28 16:36:49 +08:00
Algea Cao
484d7b1bd6 misc: Add rk628 misc drivers
Customers may use rk628 drivers on different platforms.
Hence we need drivers that do not rely on the FB/DRM
display framework.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Iaab679e4a72d0fb0e5a76bee89b8e1bdac60f4a7
2023-06-28 15:43:53 +08:00
Zhang Yubing
e847ed9deb drm/rockchip: vop3: update acm info when it change
When update acm info, it need disable acm function in the first frame,
then update the acm info and enable acm function in the second frame.
If the acm info is not changed between 2 frames, it don't need update.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Iaedead2fad5951844ca07b037c3588071499e50a
2023-06-28 15:36:09 +08:00
Tao Huang
3c0ee70ad9 input: sensors: accel: mc3230: Fix compilation errors on kernel 6.1
drivers/input/sensors/accel/mc3230.c:126:8: error: unknown type name 'mm_segment_t'
drivers/input/sensors/accel/mc3230.c:222:17: error: implicit declaration of function 'get_fs'; did you mean 'sget_fc'? [-Werror=implicit-function-declaration]
drivers/input/sensors/accel/mc3230.c:223:9: error: implicit declaration of function 'set_fs'; did you mean 'sget_fc'? [-Werror=implicit-function-declaration]
drivers/input/sensors/accel/mc3230.c:223:16: error: 'KERNEL_DS' undeclared (first use in this function); did you mean 'KERNFS_NS'?

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iea2ba6178309fd4654030325ef0d8810e9fa4972
2023-06-28 14:44:01 +08:00
Tao Huang
04c8d294f3 input: sensors: accel: da223: Fix compilation errors on kernel 6.1
drivers/input/sensors/accel/da223_cust.c:286:142: error: 'printk' undeclared here (not in a function); did you mean '_printk'?

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I180c5fa59c92eaf956c3819aefe70ae115e4ee4c
2023-06-28 14:20:32 +08:00
Tao Huang
fcde4be86b iio: light: vl6180: make use of devm_iio_kfifo_buffer_setup() helper
According to commit 17395ce299 ("iio: make use of devm_iio_kfifo_buffer_setup() helper")
and commit f67c6c73cb ("iio: core: Simplify the registration of kfifo buffers").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3b979d16941d5fc326b319c66b56911ca3de4422
2023-06-28 11:54:31 +08:00
Tao Huang
ac41697d6a iio: light: ucs12cm0: make use of devm_iio_kfifo_buffer_setup() helper
According to commit 17395ce299 ("iio: make use of devm_iio_kfifo_buffer_setup() helper")
and commit f67c6c73cb ("iio: core: Simplify the registration of kfifo buffers").

Change-Id: I841701d8518ed1b07838a57614477afc9dd5ab04
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-06-28 11:49:00 +08:00
Tao Huang
c51ca38cc8 iio: imu: lsm6dsr: make use of devm_iio_kfifo_buffer_setup() helper
According to commit 17395ce299 ("iio: make use of devm_iio_kfifo_buffer_setup() helper")
and commit f67c6c73cb ("iio: core: Simplify the registration of kfifo buffers").

Also fixes the following warning:
drivers/iio/imu/st_lsm6dsr/st_lsm6dsr_buffer.c:992:19: error: implicit declaration of function 'of_property_read_bool' [-Werror=implicit-function-declaration]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia8229b4fe1d22c6455ea8b1eeb410a925f71e785
2023-06-28 11:43:38 +08:00
Tao Huang
756a7e4cb2 iio: imu: lsm6dsr: Fix fall-through warning for Clang
drivers/iio/imu/st_lsm6dsr/st_lsm6dsr_core.c:1129:4: error: unannotated fall-through between switch labels [-Werror,-Wimplicit-fallthrough]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaa46d98150f27e1ea410e52a580d636de23b5c28
2023-06-28 11:29:34 +08:00
Tao Huang
1ce4377b68 Merge commit 'ce5da098c4cd46deb075845111383d9fd34afa7a'
* commit 'ce5da098c4cd46deb075845111383d9fd34afa7a': (27 commits)
  drm/rockchip: vop2: update rk3568 max height limit
  drm/rockchip: lvds: update MEDIA_BUS_FMT_RGB666_1X7X3_SPWG description
  mmc: sdhci-of-dwcmshc: support HS400ES for RK3568
  Revert "arm64: rockchip_defconfig: enable CONFIG_ROCKCHIP_DRM_CUBIC_LUT"
  Revert "FROMLIST: drm: Extend color correction to support 3D-CLU"
  drm/rockchip: vop2: move cubic lut to rockchip drm driver
  media: i2c: add ar0822 driver
  media: i2c: max96722: version 1.00.00
  video: rockchip: rga3: add mm_flag 'RGA_MEM_FORCE_FLUSH_CACHE'
  arm64: dts: rockchip: rk3528 boards: btsco enable 16k pcm support
  arm64: dts: rockchip: rk356x boards: btsco enable 16k pcm support
  arm64: dts: rockchip: rk3588 boards: btsco enable 16k pcm support
  arm64: dts: rockchip: rk3562-evb: enable logo display for rgb board
  nvme-pci: add NVME_QUIRK_LIMIT_IOQD32 to fix Phison E15 NVMe controller
  video: rockchip: mpp: fix crash issue when no iommu
  soc: rockchip: mtd_vendor_storage: force config spi nor erase size to 64KB
  PCI: rockchip: dw_ep: Delaying the link training after hot reset
  video: rockchip: rga3: adapt to kernel-6.1/5.10/4.19
  ARM: dts: rockchip: rmii_phy use increment 0 for rv1106-evb
  arm64: dts: rockchip: rk3588: Add opp-info support
  ...

Conflicts:
	drivers/gpu/drm/drm_atomic_helper.c
	drivers/media/i2c/Kconfig
	drivers/media/i2c/Makefile
	drivers/media/i2c/max96722.c
	drivers/nvme/host/pci.c
	drivers/pci/controller/dwc/pcie-dw-rockchip.c

Ignore:
	commit 49520417ba ("PCIe: dw: rockchip: Disabled BAR0 and BAR1").

Change-Id: I41d947eda90f8b547ef2af30c3b093f556521803
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-06-28 10:19:01 +08:00
Sandy Huang
ce5da098c4 drm/rockchip: vop2: update rk3568 max height limit
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ic323e783452e1d97a0b4df955ad7d11ead8da17a
2023-06-27 20:40:08 +08:00
Sandy Huang
96a4ade24f drm/rockchip: lvds: update MEDIA_BUS_FMT_RGB666_1X7X3_SPWG description
Refer to the following information:

https://www.kernel.org/doc/Documentation/devicetree/bindings/display/panel/panel-lvds.txt

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I9ea389605940911d576e5ed0c0be20f892f41390
2023-06-27 20:40:08 +08:00
Yifeng Zhao
4fa16359d6 mmc: sdhci-of-dwcmshc: support HS400ES for RK3568
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I0491bcb3def6e1f5975a94b8e8921027a9d6e271
2023-06-27 20:37:32 +08:00
Sandy Huang
79f0bdb4fc Revert "arm64: rockchip_defconfig: enable CONFIG_ROCKCHIP_DRM_CUBIC_LUT"
This reverts commit d7c77171a7.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ifff2f6bccc17c78fd6d449613da8b9c352293c70
2023-06-27 20:31:20 +08:00
Sandy Huang
7f9e600004 Revert "FROMLIST: drm: Extend color correction to support 3D-CLU"
This reverts commit 4b81d4e560.

Change-Id: I501bc346b574df3143a505abb509e331a5afc7b6
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2023-06-27 20:30:33 +08:00
Sandy Huang
3325b43a1a drm/rockchip: vop2: move cubic lut to rockchip drm driver
move cubic lut support from drm croe to rockchip drm driver and remove
depend on NO_GKI.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I8fb6ba4fc927bf9f7e1b38c180986b1e25393347
2023-06-27 20:30:23 +08:00
Yingsong Ye
be4fe51d5b media: i2c: add ar0822 driver
Change-Id: I8a860b248528cb6ad1e263ea5e10b89efd503bf9
Signed-off-by: Yingsong Ye <alexhazel.ye@rock-chips.com>
2023-06-27 20:08:26 +08:00
Cai Wenzhong
b114426b90 media: i2c: max96722: version 1.00.00
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I59fafb4aa4bfa06b989b9d13ae9b88aa25dc65df
2023-06-27 20:04:44 +08:00
Yu Qiaowei
1d2f80aa5e video: rockchip: rga3: add mm_flag 'RGA_MEM_FORCE_FLUSH_CACHE'
Use the RGA_MEM_FORCE_FLUSH_CACHE flag to force the flush cache for
the current buffer, not by judging the memory type.

Update driver version to 1.2.27

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ife6d26faf59c1e33a2cddc389ded7c93b63a22a5
2023-06-27 20:01:30 +08:00
Zou Dengming
ac3b62bb63 arm64: dts: rockchip: rk3528 boards: btsco enable 16k pcm support
In android 9,10,11,12,13, we have already support 16k wbs in
hardware level code. So, enable 16k support in kernel dts default.

Info:
In future, to support BTSCO 16k, it only need to change the
default setting of bluedroid's "DISABLE_WBS" setting.

Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
Change-Id: Ide2435eb0fb9e8e0ffb705d8ba4b43af95dd37ff
2023-06-27 19:59:39 +08:00
Zou Dengming
2093b6351a arm64: dts: rockchip: rk356x boards: btsco enable 16k pcm support
In android 9,10,11,12,13, we have already support 16k wbs in
hardware level code. So, enable 16k support in kernel dts default.

Info:
In future, to support BTSCO 16k, it only need to change the
default setting of bluedroid's "DISABLE_WBS" setting.

Change-Id: I382bfdb47a6e13c54c53e8e666aecbad6e135f41
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-06-27 19:59:18 +08:00
Zou Dengming
e1e3340e25 arm64: dts: rockchip: rk3588 boards: btsco enable 16k pcm support
In android 9,10,11,12,13, we have already support 16k wbs in
hardware level code. So, enable 16k support in kernel dts default.

Info:
In future, to support BTSCO 16k, it only need to change the
default setting of bluedroid's "DISABLE_WBS" setting.

Change-Id: I31db010004b09723840c9674a093eaaa78822658
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-06-27 19:58:45 +08:00
Jon Lin
7abaac5a04 PCIe: dw: rockchip: Disabled BAR0 and BAR1
fix the following case:
[    2.143145] pci 0000:00:00.0: BAR 0: no space for [mem size 0x40000000]
[    2.143155] pci 0000:00:00.0: BAR 0: failed to assign [mem size 0x40000000]
[    2.143161] pci 0000:00:00.0: BAR 1: no space for [mem size 0x40000000]
[    2.143168] pci 0000:00:00.0: BAR 1: failed to assign [mem size 0x40000000]

Change-Id: I5eca2adb49d83c775036df7e961dab5c9fbfffbb
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-06-27 15:46:27 +08:00
Tao Huang
c5eaa56982 rknpu: Add MODULE_IMPORT_NS(DMA_BUF) for kernel 5.16
ERROR: modpost: module rknpu uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rknpu uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rknpu uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rknpu uses symbol dma_buf_get from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rknpu uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rknpu uses symbol dma_buf_fd from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rknpu uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I959a6f67e8c623e81df32d0d7c7f51a5f7d6907e
2023-06-27 15:31:18 +08:00
Damon Ding
053f5f2aa5 arm64: dts: rockchip: rk3562-evb: enable logo display for rgb board
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I451968707f05a5e464cecf7146d15d274bf31d3a
2023-06-27 15:21:42 +08:00
Felix Zeng
db9c609686 driver: rknpu: Fix build errors in kernel 6.1, version: 0.8.9
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: I88ca7a85e3ea5e2a410f48a5789f17b57ffb267e
2023-06-27 14:24:47 +08:00
Shawn Lin
b20870d869 nvme-pci: add NVME_QUIRK_LIMIT_IOQD32 to fix Phison E15 NVMe controller
Phison E15 NVMe controller is known to be broken when doing a high loading
test. Limit io queue depth to 32 is suggested by vendor.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ie2a89197311a6a7b59281ff12caf545ae0ab37bf
2023-06-27 09:36:35 +08:00
Chandler Chen
1dd504da41 video: rockchip: mpp: fix crash issue when no iommu
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: Ic0a8523fecad460ec129836ab2693ceb0472f0f9
2023-06-27 09:20:55 +08:00
Yifeng Zhao
3473270fe2 soc: rockchip: mtd_vendor_storage: force config spi nor erase size to 64KB
Some projects config 4KB erase sizes for SPI NOR, which are
incompatible with 64KB in u-boot, and may cause functional
abnormalities or data loss.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I90a026a4cd8cc2550f1cdb84db4602c2e239e51c
2023-06-27 09:14:51 +08:00
Jon Lin
c3f038c2dc PCI: rockchip: dw_ep: Delaying the link training after hot reset
Delaying the link training after hot reset, so that it's possible
to read/write some register status through the DBI.

The controller support delaying the Link Training by setting
app_dly2_en/done register.

Change-Id: Ic6d1b28ca42e3d355610db33f4e5086cf26d705c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-06-26 19:42:43 +08:00
Yu Qiaowei
bfe46724a3 video: rockchip: rga3: adapt to kernel-6.1/5.10/4.19
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ie38ae6b0fc6037bfeee5b19077ff339f39933bc4
2023-06-26 19:40:55 +08:00
Yu Qiaowei
d6af8d8e91 video: rockchip: rga3: adapt to kernel-6.1/5.10/4.19
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ic58947f624bc532730b39744a3385d02fbaf6743
2023-06-26 19:24:55 +08:00
Yu Qiaowei
38fe2a5683 video: rockchip: rga: adapt to kernel-6.1
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I798ec5540f64c2423885a6442a76c097e72e6fb8
2023-06-26 19:24:26 +08:00
Yu Qiaowei
04824b83ee video: rockchip: rga2: adapt to kernel-6.1
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I08d3b7a852b450f91327d65110f818b6cdf9545d
2023-06-26 19:24:19 +08:00
David Wu
772d601026 ARM: dts: rockchip: rmii_phy use increment 0 for rv1106-evb
Only network cables with waterproof wires require +2, otherwise 0.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ic00c06857a9f49d4648a2fa94d7630f7b293c4b9
2023-06-26 19:10:32 +08:00
Finley Xiao
8fde0d8b67 arm64: dts: rockchip: rk3588: Add opp-info support
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5f0fa938f78480712a2c4c313c368a48843eaef3
2023-06-26 19:05:42 +08:00
Finley Xiao
924d577057 soc: rockchip: opp_select: adjust memory voltage by otp
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Icfed6bd8766329b10ddb6d5d78e5306a013389cb
2023-06-26 19:05:42 +08:00
Herman Chen
dcc425f09c video: rockchip: mpp: rkvenc2: Add check for error irq status
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I2f5e2909d189cb78052c85c89ac994fcdb586708
2023-06-26 19:03:19 +08:00
Wangqiang Guo
04a51f4342 media: rockchip: hdmirx: enhanced compatibility.
1.check format when get timing.
2.if read wrong format, try multiple times.
3.disable interrupts once triggered, avoid multiple triggers.

Change-Id: I2ac21723071dd89e74b0a854a3501ab8ea978aa1
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
2023-06-26 17:38:20 +08:00