Commit Graph

1255202 Commits

Author SHA1 Message Date
Liang Chen
9f8a989bb7 soc: rockchip: rockchip_performance: fix build error for kernel 6.1
In file included from drivers/soc/rockchip/rockchip_performance.c:9:
./include/uapi/../../kernel/sched/sched.h:3226:2: error: implicit declaration of function 'account_group_exec_runtime' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
        account_group_exec_runtime(curr, delta_exec);
        ^
drivers/soc/rockchip/rockchip_performance.c:19:2: error: use of undeclared identifier 'sysctl_sched_uclamp_util_min_rt_default'
        sysctl_sched_uclamp_util_min_rt_default = util;
        ^
2 errors generated.

Change-Id: Ia8a25a77429e60935c2a832f741f6ca2512bb51d
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-06-20 21:14:30 +08:00
Tao Huang
d601871a5f drm/rockchip: rk628: fix compile warning for kernel 6.1
drivers/gpu/drm/rockchip/rk628/rk628_dsi.c:804:21: warning: this statement may fall through [-Wimplicit-fallthrough=]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5b74e244f05b92103a94e6c66c070af56d0fcb16
2023-06-20 19:37:29 +08:00
Tao Huang
12862a5f30 drm/rockchip: rk618: fix compile warning for kernel 6.1
drivers/gpu/drm/rockchip/rk618/rk618_dsi.c:953:23: warning: this statement may fall through [-Wimplicit-fallthrough=]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ifb918241130d90f1c53ea8b1598d25c04aa1dfcc
2023-06-20 19:37:12 +08:00
Sandy Huang
6c1cc0110a drm/rockchip/rk628: gvi: use edid_hdmi_xx_dc_modes instead of edid_hdmi_dc_modes
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I33f15eab2b5a06aadd53723f45d119da0a6dbcce
2023-06-20 19:19:26 +08:00
Sandy Huang
6eed718ff8 drm/rockchip/rk628: hdmi: use edid_hdmi_xx_dc_modes instead of edid_hdmi_dc_modes
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ie466025189d3bbb206157ce54d5dab89693b11ec
2023-06-20 19:19:22 +08:00
Sandy Huang
f981234cb7 drm/rockchip/rk618: hdmi: use edid_hdmi_xx_dc_modes instead of edid_hdmi_dc_modes
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I434557b6d2fdd41ea5be542e834ae639a0fe2d85
2023-06-20 19:19:19 +08:00
shengfei Xu
a7d5f5ffcd power: supply: rockchip_charger_manager: fix build error for kernel 6.1
drivers/power/supply/rockchip_charger_manager.c:2520:53:
error: incompatible pointer types passing 'struct power_supply_battery_info *' to parameter of type 'struct power_supply_battery_info **'
[-Werror,-Wincompatible-pointer-types]
	ret  = power_supply_get_battery_info(&charger_psy, &(desc->info));
                                                           ^~~~~~~~~~~~~
./include/linux/power_supply.h:833:42: note: passing argument to parameter 'info_out' here
				     struct power_supply_battery_info **info_out);
									^

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ie8b34ac9d4320eb8d2bec4ca30d5e0690216907f
2023-06-20 17:45:37 +08:00
shengfei Xu
a7c9c882b7 power: supply: sgm41542: fix build error for kernel 6.1
drivers/power/supply/sgm41542_charger.c:930:52:
error: incompatible pointer types passing 'struct power_supply_battery_info *' to parameter of type 'struct power_supply_battery_info **'
[-Werror,-Wincompatible-pointer-types]
	 ret = power_supply_get_battery_info(sgm->charger, &bat_info);
                                                              ^~~~~~~~~
./include/linux/power_supply.h:833:42: note: passing argument to parameter 'info_out' here
                                         struct power_supply_battery_info **info_out);
                                                                                ^

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I73e2e48d45611a3d9b11f3bae306d79aa86fc38c
2023-06-20 17:44:24 +08:00
Tao Huang
b40b8ac1de rk: clang-wrapper.py: Ignore #pragma-messages warning
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id0dc4f3dbcc9debe03e602972c515b57f416e487
2023-06-20 14:17:33 +08:00
Finley Xiao
2f20047853 mali400: mali: Use new APIs for devfreq
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I972c99a1063f27b7a7ee48d1d5e075028c73705a
2023-06-20 10:17:54 +08:00
Finley Xiao
5577e94f30 Mali: midgard: Use new APIs for devfreq
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ib624fcb78606fc9a0c04680ae35dcc2eb75ffe8b
2023-06-20 10:17:54 +08:00
Finley Xiao
7724cd7e46 PM / devfreq: rockchip_bus: Use new API to init opp table
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I488541923e68388956282639b9c06fc693a69370
2023-06-20 10:17:54 +08:00
Finley Xiao
3a820a497f PM / devfreq: rockchip_dmc: Use new APIs for devfreq
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I88369c2449aead37a23a5f125b2e6789902ff18c
2023-06-20 10:17:54 +08:00
Finley Xiao
5ce46b1b09 cpufreq: dt: Use new API to adjust table
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I4fc29aa89e1769c0081beedaf9d8d56b2eea2c50
2023-06-20 10:17:54 +08:00
Finley Xiao
4ee2a79a5e cpufreq: rockchip: Use new opp APIs to init opp table
Use new APIs to init opp info and set opp rate.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I58ecf6edccde170e1e9e12fa5b75c4261a39eac0
2023-06-20 10:17:54 +08:00
Finley Xiao
5dfb778413 video: rockchip: mpp: rkvdec: Use new API to init and uninit opp table
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ib768f1b62b2a68451cbf54a580dc9da9fb0ebefd
2023-06-20 10:17:54 +08:00
Finley Xiao
047ff16316 video: rockchip: mpp: rkvenc: Use new API to init and uinit opp table
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I79314fa107f45a50890e137d1bb52f05554f3a66
2023-06-20 10:17:54 +08:00
Finley Xiao
eeccebbfda video: rockchip: mpp: rkvenc2: Use new API to init and uninit opp info
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5ceb970f3d0ee1e6edeb51f51eb9015589fc65f3
2023-06-20 10:17:54 +08:00
Finley Xiao
400ce7d433 video: rockchip: mpp: rkvdec2: Use new API to init and uinit opp table
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I013ed72ef9fb1a3e93453cb73a421a00709bd35c
2023-06-20 10:17:53 +08:00
Finley Xiao
148a53e168 MALI: bifrost: Use new APIs for devfreq
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ifd0262cbff997a752f81aa4941763c12bde741cf
2023-06-20 10:17:53 +08:00
Finley Xiao
389088186f soc: rockchip: rockchip_system_monitor: Use new APIs to check rate and volt
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I1b1ad7a0a9d5619e23aca6e382ce2ee7035c1663
2023-06-20 10:17:53 +08:00
Finley Xiao
c64369f0e4 soc: rockchip: opp_select: Implements new opp APIs for kernel 6.1
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I3e1bef3d15d8ea290565fb3573d8e79b5bf18815
2023-06-20 10:17:53 +08:00
Tao Huang
dee8d6d889 ARM: rk3128_linux_spi_nand.config: Disable deprecated CONFIG_RK_FLASH
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I584a5a6e7147443ea6dd049031658be6b758f7a7
2023-06-20 10:12:44 +08:00
Tao Huang
f6696bebb3 Revert "arm: configs: enable slc nand and sfc devices for rk3308 aarch32"
This reverts commit 7361795f1d.
CONFIG_RK_FLASH is deprecated.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I660d356e42baa31fdf7e526344b2ce880053d1ec
2023-06-20 10:12:44 +08:00
Tao Huang
c798ba44d6 arm64: rk1808_linux_defconfig: Disable deprecated CONFIG_RK_FLASH
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I765c78cf5602a9f48b9b2f5e157936acf6f95717
2023-06-20 10:12:44 +08:00
Tao Huang
c027a95d76 Revert "arm64: configs: rk3308_linux_defconfig: enable slc nand and sfc devices driver"
This reverts commit cbf6303b22.
CONFIG_RK_FLASH is deprecated.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id1c197c1da7b1b8906d8d1a91b1075074e1d0384
2023-06-20 10:12:44 +08:00
Tao Huang
1e0ac63c98 Revert "ARM: rockchip_linux_defconfig: enable rk_nand"
This reverts commit 5f583a525f.
CONFIG_RK_NAND is deprecated.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ifda47e234cf1b8b25aaf01530a371da2f2c4b662
2023-06-20 10:12:44 +08:00
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