Commit Graph

1255175 Commits

Author SHA1 Message Date
Tao Huang
a5aaa2f046 media: common: videobuf2-cma-sg: Remove depends on DMA_CMA || DMABUF_HEAPS_ROCKCHIP_CMA_HEAP
Fixes the following warnings:

WARNING: unmet direct dependencies detected for VIDEOBUF2_CMA_SG
  Depends on [n]: MEDIA_SUPPORT [=y] && (DMA_CMA [=n] || DMABUF_HEAPS_ROCKCHIP_CMA_HEAP [=n])
  Selected by [y]:
  - VIDEO_ROCKCHIP_CIF [=y] && MEDIA_SUPPORT [=y] && MEDIA_PLATFORM_SUPPORT [=y] && MEDIA_PLATFORM_DRIVERS [=y] && V4L_PLATFORM_DRIVERS [=y] && VIDEO_DEV [=y] && (ARCH_ROCKCHIP [=y] || COMPILE_TEST [=n]) && MEDIA_CAMERA_SUPPORT [=y]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7ece8eac45a726605192e8c3fb4af3f3c4a4fb51
2023-06-19 21:12:47 +08:00
Tao Huang
e954cacd5a ASoC: codecs: aw883xx: Fix build error for kernel 6.1
Disable AW_CALI_STORE_EXAMPLE for following build error:
sound/soc/codecs/aw883xx/aw_calib.c: In function 'aw_cali_write_cali_re_to_file':
sound/soc/codecs/aw883xx/aw_calib.c:65:9: error: unknown type name 'mm_segment_t'
sound/soc/codecs/aw883xx/aw_calib.c:78:14: error: implicit declaration of function 'get_fs'; did you mean 'sget_fc'? [-Werror=implicit-function-declaration]
sound/soc/codecs/aw883xx/aw_calib.c:79:9: error: implicit declaration of function 'set_fs'; did you mean 'sget_fc'? [-Werror=implicit-function-declaration]
sound/soc/codecs/aw883xx/aw_calib.c:79:16: error: 'KERNEL_DS' undeclared (first use in this function); did you mean 'KERNFS_NS'?
sound/soc/codecs/aw883xx/aw_calib.c:79:16: note: each undeclared identifier is reported only once for each function it appears in
sound/soc/codecs/aw883xx/aw_calib.c: In function 'aw_cali_get_cali_re_from_file':

sound/soc/codecs/aw883xx/aw883xx.c: In function 'aw883xx_i2c_remove':
sound/soc/codecs/aw883xx/aw883xx.c:2506:17: error: implicit declaration of function 'devm_gpio_free'; did you mean 'devm_gpiod_get'? [-Werror=implicit-function-declaration]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic92cc7e7d97e24778cfb6977be5e59df56fe58d8
2023-06-16 11:10:43 +08:00
Tao Huang
133327585f ASoC: es8311: 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: Icc09bb794dcc2efd0da7ad59c99f2901b2a5a773
2023-06-16 10:50:39 +08:00
Tao Huang
b5438adbb0 ASoC: es7243e: 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: I0de38f48b436741cad09558d373c6ed5a99a248b
2023-06-16 10:50:15 +08:00
Tao Huang
94b48c5a4b ASoC: es7202: 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: Idffadfe884af19a9ba749cc5b6c2eb8a2183527b
2023-06-16 10:49:00 +08:00
Tao Huang
2a6cd96c89 Partially revert "i2c: rk3x: Make sure the i2c transfer to be finished before system reboot"
This partially reverts commit 497e7bd6e1.

Remove private pre_restart_handler APIs which can be replaced by
restart_handler with high priority.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I6eb16b94b36732e748597ecaf3eea3f082fb2cdd
2023-06-16 10:27:31 +08:00
Tao Huang
26c56634fe power: reset: reboot-mode: use restart_handler
Replace private pre_restart_handler which can remove on kernel 6.1.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1ccb0ddc6c7d6475c77f3d478138fb03e3619395
2023-06-16 10:27:31 +08:00
Tao Huang
e8276fe4ff i2c: rk3x: use restart_handler
Replace private pre_restart_handler which can remove on kernel 6.1.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I79d3a16811b14c176a9d17d782f3cc17717fbd7f
2023-06-16 10:27:31 +08:00
Sugar Zhang
4e891f6020 ASoC: rockchip: vad: remove rtd->num_codecs
Fixes: 3989ade2d1 ("ASoC: soc.h: remove num_cpus/codecs")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I41ccfff7fdcd811c509e7a83bd3f18093e8a2fc9
2023-06-16 10:15:29 +08:00
Sugar Zhang
bf75c5a2c6 ASoC: rockchip: mdais: stop setting slave_id
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I06b7633647fc6be3ea3ab2f20e16f462b7d54177
2023-06-16 10:02:26 +08:00
Tao Huang
8501e9f533 soc: rockchip: pm_config: Use devm_register_sys_off_handler()
Use devm_register_sys_off_handler() that replaces global
pm_power_off_prepare variable.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If8c0029962d81ae02128f5c8245d32788437f82c
2023-06-13 17:24:05 +08:00
Tao Huang
d78ed97ebf Merge commit '6fe07fe66175aa84c7f56d3071be5d7cb730e07b'
* commit '6fe07fe66175aa84c7f56d3071be5d7cb730e07b':
  pwm: rockchip: enable dclk scale function in oneshot mode
  soc: rockchip_system_monitor: Fix TPYE -> TYPE typo
  media: i2c: max96712: version 1.05.00
  drm/panel: maxim-max96752f: Fix pin assignment
  soc: rockchip: tb_service: unmask mcu_done after all registered cb were finished
  arm64: dts: rockchip: rk3588s: Fix low-volt-mem-read-margin
  arm64: dts: rockchip: rk3588: Fixed the rkvenc1 init frequency
  phy: rockchip: samsung-dcphy: restart rx after apb reset when rx is streaming

Change-Id: I169f5ca13020b86970b62eda17cb6ca50067464d
2023-06-13 16:23:41 +08:00
Damon Ding
6fe07fe661 pwm: rockchip: enable dclk scale function in oneshot mode
This is a workaround, an uncertain waveform will be
generated after oneshot ends. It is needed to enable
the dclk scale function to resolve it. It doesn't
matter what the scale factor is, just make sure the
scale function is turned on, for which we set scale
factor to 2.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: If34837194cba89570a58a993d7133a852955f69c
2023-06-13 16:22:57 +08:00
Tao Huang
8c43b7ff27 soc: rockchip_system_monitor: Fix TPYE -> TYPE typo
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I815c6e01039c0ba6469b575cf86349e6b87148c5
2023-06-13 15:28:39 +08:00
Cai Wenzhong
afbe5ad755 media: i2c: max96712: version 1.05.00
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I683859243f34981c5bbc594d45360d79139e04a1
2023-06-13 14:34:11 +08:00
Wyon Bi
3536a204ce drm/panel: maxim-max96752f: Fix pin assignment
Fixes: 375777288b ("drm/panel: maxim-max96752f: Add HannStar HSD123JPW3-A15 panel")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I73ae495870af9d230bd6a16bed8205a03841bac0
2023-06-13 11:57:26 +08:00
Ziyuan Xu
0950a09b27 soc: rockchip: tb_service: unmask mcu_done after all registered cb were finished
Make sure the next action after the higher priority registrant.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I8bc99294f28aaeb4e574a45d17264cfe3317fbdd
2023-06-13 10:18:21 +08:00
Finley Xiao
413f050fd6 arm64: dts: rockchip: rk3588s: Fix low-volt-mem-read-margin
Fixes: 038080da03 ("arm64: dts: rockchip: rk3588s: Modify npu opp table")

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I96a2850508f736fdd033b568d8f5b981cba42c50
2023-06-12 14:19:46 +08:00
Elaine Zhang
ff9bbf0db5 arm64: dts: rockchip: rk3588: Fixed the rkvenc1 init frequency
Make sure that the init frequency is within the design range

Fixes: fd4c1a5ee2 ("arm64: dts: rockchip: rk3588: Fixed the init frequency")
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I62d9f2c5c87663f17b0f1dbff9b2109d05b5a5fa
2023-06-12 11:42:42 +08:00
Zefa Chen
fefe9843bc phy: rockchip: samsung-dcphy: restart rx after apb reset when rx is streaming
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I9e5e8607b8c824daca8ea820d785323e0ac8c8fa
2023-06-12 10:52:59 +08:00
Tao Huang
04c44c91e5 Merge commit '33f4a54037590ce6bf13e3568e33685dbe752588'
* commit '33f4a54037590ce6bf13e3568e33685dbe752588':
  fiq_debugger: tty write to tty fifo
  ARM: dts: rockchip: rv1106 boards: Add sdmmc idle state support
  ARM: dts: rockchip: rv1126: Add sdmmc idle state support
  ARM: dts: rockchip: add idle state for sdmmc of rv1106-pinctrl
  ARM: dts: rockchip: add idle state for sdmmc of rv1126-pinctrl
  media: i2c: max96712: version 1.04.00
  media: rockchip: vicap: fixes s_selection, support to set crop area
  media: rockchip: vicap: only enum outout formats that terminal sensor support to use
  media: rockchip: vicap: add security testing for output format
  arm64: dts: rockchip: rk3528-demo: Enable dfi
  arm64: dts: rockchip: rk3528-evb: Enable dfi
  arm64: dts: rockchip: rk3528: Add ddr related nodes
  PM / devfreq: rockchip_dmc: Add support for rk3528
  dt-bindings: devfreq: rockchip_dmc: Add rk3528 support
  PM / devfreq: rockchip-dfi: Add support for rk3528 dfi
  dt-bindings: devfreq: rockchip_dfi: Add rk3528 support

Change-Id: I57b0ee5b5bbbcbba0c40f447f4a866775d2743c7
2023-06-09 20:35:02 +08:00
Huibin Hong
33f4a54037 fiq_debugger: tty write to tty fifo
It means printf(user) write log to tty fifo, to reduce printf time.

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Iaf55719e7089a7c3b3638e2976c97868eed3868e
2023-06-09 19:40:12 +08:00
Shawn Lin
05bd7e4fe2 ARM: dts: rockchip: rv1106 boards: Add sdmmc idle state support
In order to avoid power leak for affacting SD cards, add idle state
to all related boards for RV1106 series and change default state to
normal state for the driver to totally control it.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I80089eecb2ce1d41f8aaca9a17f913f5fa971514
2023-06-09 15:56:25 +08:00
Shawn Lin
c44a5ce055 ARM: dts: rockchip: rv1126: Add sdmmc idle state support
In order to avoid power leak for affacting SD cards, add idle state
to all related boards for RV1126 and change default state to normal
state for the driver to totally control it.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: If00ed994eb2a467bd5ef16fd52f51b490bea4b27
2023-06-09 15:54:27 +08:00
Shawn Lin
3dea3e0664 ARM: dts: rockchip: add idle state for sdmmc of rv1106-pinctrl
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I77707268214b2d6433dc386b45015bb9d21b4cb2
2023-06-09 15:21:25 +08:00
Shawn Lin
5c80c612ad ARM: dts: rockchip: add idle state for sdmmc of rv1126-pinctrl
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ie72c4c8ac311aab1b02fb8c514c8652260aaa0e6
2023-06-09 15:21:21 +08:00
Cai Wenzhong
e11e649ac1 media: i2c: max96712: version 1.04.00
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: Icfd197f3bdf68f104bad82121b041962e3f3aa2e
2023-06-09 15:07:36 +08:00
Tao Huang
ef7d7abc40 soc: rockchip: ramdisk: Fix for kernel 6.1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If6971efee17ff826d3dd83b1cdda31f6b6a7de11
2023-06-09 11:43:36 +08:00
Tao Huang
ebc9475ec9 fsdax: depend on ZONE_DEVICE || FS_DAX_LIMITED || ROCKCHIP_RAMDISK
So we can use FS_DAX on ROCKCHIP_RAMDISK.

Fixes: f74515986e ("fsdax: depend on ZONE_DEVICE || FS_DAX_LIMITED")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I80b6b36c390fb36a98fa4bd73f7c42efad23788a
2023-06-09 11:43:36 +08:00
Zefa Chen
2f2bda6e44 media: rockchip: vicap: fixes s_selection, support to set crop area
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia87c372d7b372bcb74a9ecf09b1789153baf51b9
2023-06-09 11:07:27 +08:00
Zefa Chen
1a955904dc media: rockchip: vicap: only enum outout formats that terminal sensor support to use
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I58d67a9c8ba65e18fd9031d3fc49f51beb47f067
2023-06-09 11:00:50 +08:00
Zefa Chen
7e9e093b8c media: rockchip: vicap: add security testing for output format
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6c48543295eeef7c67e192bf16da44e533c07f09
2023-06-09 11:00:41 +08:00
Wesley Yao
fc947972ad arm64: dts: rockchip: rk3528-demo: Enable dfi
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: I10b208e45b091d7e0090b6fca7ce68d35e7f2f48
2023-06-09 10:48:28 +08:00
Wesley Yao
d285000cc8 arm64: dts: rockchip: rk3528-evb: Enable dfi
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: Iccc421ab21a05f3f0f74a01dd6c334d0cc0b27ca
2023-06-09 10:48:28 +08:00
Wesley Yao
31dd4c38e5 arm64: dts: rockchip: rk3528: Add ddr related nodes
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: I9d728a6a26c1156976958d242297e2a14ca28c66
2023-06-09 10:48:28 +08:00
Wesley Yao
a822375383 PM / devfreq: rockchip_dmc: Add support for rk3528
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: I90b09d044769747e8858c23f3087c00b2fcb2f12
2023-06-09 10:48:28 +08:00
Wesley Yao
1f98b6284d dt-bindings: devfreq: rockchip_dmc: Add rk3528 support
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: I3150649f8f9f3083d54ba80de706937b4a0852da
2023-06-09 10:48:28 +08:00
Wesley Yao
daf1596e95 PM / devfreq: rockchip-dfi: Add support for rk3528 dfi
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: Iaf29eebe4ccf3e9a25f5a76cd727af2410d514b3
2023-06-09 10:48:28 +08:00
Wesley Yao
61b70d7bc1 dt-bindings: devfreq: rockchip_dfi: Add rk3528 support
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: I2ecbe8788d046ce745157042b9038380d732590d
2023-06-09 10:48:28 +08:00
Tao Huang
1621bd6b24 Merge commit 'e0716c0140025007b43b1a07dc128c4d4ca5f367'
* commit 'e0716c0140025007b43b1a07dc128c4d4ca5f367': (60 commits)
  media: i2c: lt7911uxc: Fix print format string
  ARM: configs: rockchip: add uvc to rv1106-rndis.config
  media: rockchip: isp: fix isp32 and lite buf output err due to mi on/off
  dt-bindings: suspend: rk3528: add sleep pin defines
  soc: rockchip: pm_config: support sleep-pin-config
  arm64: dts: rockchip: add rk3588-evb7-v11 board
  arm64: dts: rockchip: rk3588: Fixed the init frequency
  Mali: bifrost: disable tiler heap reclaiming temporally
  arm64: dts: rockchip: rk3528-evb: prepare bt sco settings
  arm64: dts: rockchip: rk3528: Split I2Sx pinctrl
  drm/rockchip: dw-dp: notify audio when enable/disable dptx
  media: i2c: lt6911uxe/c: set default timing
  media: i2c: lt7911uxc: update driver to V0.0X01.0X07
  media: i2c: lt6911uxe: add interlaced support
  arm64: configs: update camera sensors for rockchip_linux_defconfig
  arm64: dts: rockchip: add camera sensor configuration for rk3588s-evb1-lp4x-v10-linux.dts
  phy: rockchip: naneng-combphy: Fix Rx squelch for RK3528 U3
  phy: rockchip: naneng-combphy: Fix Rx squelch for RK3562 U3
  phy: rockchip: naneng-combphy: Fix Rx squelch for RK3568 U3
  mmc: dw_mmc: Add normal and idle pinctrl control
  ...

Conflicts:
	arch/arm64/configs/rockchip_linux_defconfig
	drivers/gpu/drm/drm_edid.c
	drivers/media/i2c/lt7911uxc.c
	drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
	drivers/pwm/pwm-rockchip.c

Ignore:
commit 1255f11b25 ("clk: rockchip: clk-out: Add CLK_IGNORE_UNUSED flag").
commit e2a24104ee ("drm/edid: add HF-EEODB support to EDID read and allocation").

Change-Id: I2e320837a80b34092b7964072d4dbcaa4ad79335
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-06-08 19:29:28 +08:00
Tao Huang
e0716c0140 media: i2c: lt7911uxc: Fix print format string
u64 format should be %llu.

Fixes: db473bd423 ("media: i2c: lt7911uxc: update driver to V0.0X01.0X07")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iadd65d15d690222da7561a9ea67bd70082d79b45
2023-06-08 19:04:04 +08:00
Weiwen Chen
d600ae58b7 ARM: configs: rockchip: add uvc to rv1106-rndis.config
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I83de76ba4e7a0827f0bcfc4840db1c1b4adcacc7
2023-06-08 16:32:47 +08:00
Cai YiWei
5cad0068f7 media: rockchip: isp: fix isp32 and lite buf output err due to mi on/off
Change-Id: I7d78a12861c075e99f3005af5b8ffab2958a10b2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-06-08 16:32:00 +08:00
Tao Huang
d4cdea389f media: rockchip: isp: fix rkisp_tb_helper build error for kernel 6.1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2a87fe29e9d4c6ad207b86c7d6e4ae59b6a2898c
2023-06-08 16:17:06 +08:00
XiaoDong Huang
9004c277ca dt-bindings: suspend: rk3528: add sleep pin defines
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I6bffbb885c5d09bbf0c92db32112eac246f2bc56
2023-06-08 14:27:49 +08:00
XiaoDong Huang
68a0cca2c3 soc: rockchip: pm_config: support sleep-pin-config
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I93f52766bfa1ce0cf97d826dc1cad5af0134a4c1
2023-06-08 14:27:49 +08:00
Wu Liangqing
1e135f352e arm64: dts: rockchip: add rk3588-evb7-v11 board
Change-Id: If9788078dd3a428e7be8e102dff274a5aecd10a6
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2023-06-08 14:19:31 +08:00
Elaine Zhang
fd4c1a5ee2 arm64: dts: rockchip: rk3588: Fixed the init frequency
Make sure that the init frequency is within the design range

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I1aea3638e0aa70e425410e71060ce89fa96e1869
2023-06-08 11:20:12 +08:00
Zhen Chen
eaf544c6d9 Mali: bifrost: disable tiler heap reclaiming temporally
Comes from mail "230423: 15:04: ARM support: Yao: ".

This patch and fw_230426 can resolve the occurrence
of "Unhandled Page fault" and CS_FAULTs exceptions
in the stress test "Dvfs+Gl_retrace+Rockx+emmc".

In another mail, Yao said "before any further suggestion or conclusion from RD,
you could temporally WA the issue by disable tiler heap reclaim".

Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: If06aa8e207b05f1a277aae9a86d1ff76b9a9f93b
2023-06-08 11:18:42 +08:00
Zou Dengming
c5cdbfc2eb arm64: dts: rockchip: rk3528-evb: prepare bt sco settings
we don't directly add bt-sco cards because it may take some
i2s/pcm, which may use dma, but dmas may limit.
so we just prepare this settings, then if any one who want to
support bt-sco, he/she can just add dts in board-level dtsi.

For example diff in "rk3528-evb1-ddr4-v10.dtsi":

+&bt_sco {
+       status = "okay";
+};
+
+&bt_sound {
+       status = "okay";
+};
+
+&sai0{
+       status = "okay";
+};

The default pcm/i2s setting is:
Format: PCM, dsp_a, MSB first, short sync, rising edge and 1 bclk.
rockchip soc: master; Bt controller: slave

Change-Id: I64e76c2ae4b8449e2ee345587e080b3a70521ed9
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-06-07 14:14:25 +08:00