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,255,255 Commits 55 Branches 2,486 Tags
c756266e3f7cab0c400cdc4cd32cd50180da1c92
Commit Graph

1255255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Zhao
c756266e3f net: wireless: update bcmdhd driver to 101.10.591.33.19 
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: Idd85ddea6c7f0d2e0dd5a80baa9c371695d30d49
 2023-06-25 17:23:55 +08:00
Alex Zhao
ec8180b011 net: r8168: update r8168 driver to v8.051.02 
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: Id6adb874e046d6222c02ea8d7310bf03dd202d0b
 2023-06-25 16:53:13 +08:00
Zhen Chen
b0d20f84d1 Mali: utgard: Fix compilation errors on kernel 6.1 
Change-Id: Idb486aa35fed6ac26fa8949346c6de71f7cafefc
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
 2023-06-25 16:52:20 +08:00
Zhen Chen
f04fd717f9 Mali: midgard: Fix compilation errors on kernel 6.1 
Change-Id: Ie33e2a9e0f153be287ff5e9d3081d1a088dd587b
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
 2023-06-25 16:52:07 +08:00
Tao Huang
d036c2479b Merge commit '02fc73a44beb8d96ab88bf0ef8b56babf6ca05c2' 
* commit '02fc73a44beb8d96ab88bf0ef8b56babf6ca05c2': (48 commits)
  i2c: rk3x: get_version after mcu is done for thunder-boot
  media: i2c: add sc223a driver
  media: rockchip: isp: wait RISC-V with 400ms timeout
  drm/panel: simple: add support for panels initialized by spi
  video: rockchip: rga3: modify over-constraint on fbcd
  PCIe: dw: rockchip: Delaying the link training after hot reset
  arm64: dts: rockchip: rk3562-evb: add rgb display board
  media: rockchip: vicap fixed error state of group mode and add some debug log
  ARM: dts: rockchip: update rv1106g-evb2-v10-dual-camera.dts
  arm64: dts: rockchip: rk3562: Add trim configure for tsadc
  thermal: rockchip: Add trim temperature for rk3562
  thermal: rockchip: Add default value for trim base
  misc: lt7911d-fb-notifier: add firmware upgrade support
  ARM: configs: rockchip: rv1106 enable sc301iot for battery-ipc
  ARM: configs: rockchip: rv1106: add recovery config
  meida: i2c: fix gc2503 dual sensor sync issue
  media: rockchip: isp: fix uyvy format for isp32
  drm/rockchip: dsi: fix RK3562_SYS_GRF_VO_CON1 offset addr
  media: i2c: fix sc301iot reset when probe for fastboot
  arm64: dts: rockchip: rk356x boards: prepare bt sco settings
  ...

Change-Id: I4bf311a087a887a0377afe80775fa437676ea6e3

Conflicts:
	arch/arm64/configs/rockchip_defconfig
	arch/arm64/kernel/smp.c
	drivers/i2c/busses/i2c-rk3x.c
	drivers/media/i2c/Kconfig
	drivers/mtd/nand/spi/Makefile
	drivers/spi/spi-rockchip.c

Fixes:
	drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c
	drivers/gpu/drm/panel/panel-simple.c

Change-Id: I4f6975c411775fd3cd4b2135ef032b15b68e6563
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2023-06-25 16:45:44 +08:00
Ziyuan Xu
02fc73a44b i2c: rk3x: get_version after mcu is done for thunder-boot 
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ic3e679207ebdec79b536abd029d410ddb15a19e8
 2023-06-21 19:29:02 +08:00
Su Yuefu
d4b1e00722 media: i2c: add sc223a driver 
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: Id21af19d557e61b8d8e3261d7777a4d140c8d4cd
 2023-06-21 16:48:09 +08:00
Ziyuan Xu
6bcac58699 media: rockchip: isp: wait RISC-V with 400ms timeout 
Fixes: d0edc7b3e7 ("media: rockchip: isp: thunder boot with multi sensor")
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: If7623fd081796904b891ed7fae7cf402b52cd860
 2023-06-21 16:44:01 +08:00
Damon Ding
0065c0b8f9 drm/panel: simple: add support for panels initialized by spi 
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
change-Id: I4582cc98619f7b7327af68c266ba0de1163a1b63
 2023-06-21 16:36:11 +08:00
Yu Qiaowei
2b39b0acb4 video: rockchip: rga3: modify over-constraint on fbcd 
Change-Id: I9aa492263f036cedddc5e85485bb250770d2aafa
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-06-21 14:59:20 +08:00
Jon Lin
679557456b PCIe: dw: rockchip: 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: Ieb34676ecd13d8b4c47b5adc34350294ddc60ace
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2023-06-21 14:42:36 +08:00
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
Damon Ding
528c67179b arm64: dts: rockchip: rk3562-evb: add rgb display board 
Panel k350c4516t supports to be initialized by spi in
rgb mode.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Id6addc5db469acaf9a55b1d9d1b867c364526290
 2023-06-20 20:45:15 +08:00
Zefa Chen
9c2112878e media: rockchip: vicap fixed error state of group mode and add some debug log 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6484ea72caa89bd420c68d607e3fec21e2bceac1
 2023-06-20 20:43:44 +08:00
Lan Honglin
cfe0bad194 ARM: dts: rockchip: update rv1106g-evb2-v10-dual-camera.dts 
Support sc31iot and sc230ai
Update isp thunderboot buffer size

Change-Id: If701735b748b1329f3d90e2986ff0d6870aede65
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
 2023-06-20 20:42:33 +08:00
Elaine Zhang
423f806d76 arm64: dts: rockchip: rk3562: Add trim configure for tsadc 
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I078a15cb3a8290f5233a7c04edb85870bed863f7
 2023-06-20 20:38:39 +08:00
Elaine Zhang
d1b2c15f5f thermal: rockchip: Add trim temperature for rk3562 
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I49a527fe1f36854ae3859636a9acfcfb36d23a50
 2023-06-20 20:38:39 +08:00
Finley Xiao
7da0c1498f thermal: rockchip: Add default value for trim base 
The trim_base nvmem cell is abandoned on some platforms, and use the
default value 30.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: If2ebb13de33b0928854a406cbefdcdc95cfa0947
 2023-06-20 20:38:39 +08:00
Luo Wei
1a2e751d9f misc: lt7911d-fb-notifier: add firmware upgrade support 
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I4deb3a0b61d4fa0605da637cf41423995ce4be0e
 2023-06-20 20:36:15 +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
Lan Honglin
cae91899b6 ARM: configs: rockchip: rv1106 enable sc301iot for battery-ipc 
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
Change-Id: Ib844385bfd58f73eaa5f4e415d598d1f983fa4cd
 2023-06-20 17:04:47 +08:00
Weiwen Chen
11e0aed493 ARM: configs: rockchip: rv1106: add recovery config 
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I283c6b7d0e3b9fc22160ecdec237fb5a728d1c30
 2023-06-20 14:59:13 +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
LongChang Ma
2f601384d9 meida: i2c: fix gc2503 dual sensor sync issue 
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: I6a7fbd29000262f676c91e470e52cf52dc3c0bd5
 2023-06-20 10:24:16 +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
Cai YiWei
599ad4d224 media: rockchip: isp: fix uyvy format for isp32 
Change-Id: I0dc34f154e989ef88ae5b5402339f60b43fbb4a0
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-06-19 17:55:20 +08:00