Commit Graph

1255074 Commits

Author SHA1 Message Date
Cai YiWei
fa133f475e media: rockchip: isp: fix build error for kernel 6.1
Change-Id: I5f1e2b9ef7f4fdca51752d1b1598db630faaf5e4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-06-06 19:09:22 +08:00
Cai YiWei
814cb480e7 media: rockchip: ispp: fix build error for kernel 6.1
Change-Id: I967380bd5eefb217e2e3554e2ed8740b0310ac4f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-06-06 19:06:44 +08:00
Cai YiWei
c70a37278b media: rockchip: isp1: fix build error for kernel 6.1
Change-Id: I1f373d59ebb8eb736525df2c38383c201f784fde
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-06-06 18:51:02 +08:00
Finley Xiao
3b387ddb7d arm64: dts: rockchip: rk3588s: Add trips for some thermal nodes
This patch fixes the below error.

thermal_sys: Failed to find 'trips' node
thermal_sys: Failed to find trip points for tsadc id=1
rockchip-thermal fec00000.tsadc: failed to register sensor 1: -22
rockchip-thermal fec00000.tsadc: failed to register sensor[1] : error = -22
rockchip-thermal: probe of fec00000.tsadc failed with error -22

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I41668a94e5db1a701021df63a6b8fc7f9f267355
2023-06-06 15:16:16 +08:00
Zefa Chen
cf236058d4 phy: rockchip: csi2-dphy: do not to check port when parse fwnode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ifc1317b7a2ee163bd40d479122549fc863d6f19c
2023-06-06 14:39:21 +08:00
Zefa Chen
ace9adc376 media: rockchip: vicap: fixes build error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibe9d903c628d81ef75cf16ad564bc10764700627
2023-06-06 14:25:32 +08:00
Zefa Chen
0b42c92f71 media: i2c: fixes sensor driver for kernel-6.1
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib860c864c8bbe6a2a368a109ed8ff831bd6387c1
2023-06-06 11:40:31 +08:00
Tao Huang
ccfdb826e5 net: wireless: rockchip_wlan: remove unused drivers
Move to external driver repository.

Change-Id: Iffef1967344b10749f6afa7b8b3948cf93cd0ec4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-06-02 20:02:04 +08:00
Liang Chen
bf5cd86041 cpufreq: interactive: fix compile error kernel 6.1
drivers/cpufreq/cpufreq_interactive.c:1050:3: error: field designator
'default_attrs' does not refer to any field in type 'struct kobj_type'
        .default_attrs = interactive_attributes,
         ^
1 error generated.

Change-Id: I3d9ccc23a30f5be8bd10fd846f60c3611fb62a6f
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-06-02 16:24:32 +08:00
Zefa Chen
a41b37cce2 phy: rockchip: csi2-dphy: fixes build error for kernel 6.1
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I12808b5d617789d87fe4e528d8335fdb5ac5b4be
2023-06-01 19:38:00 +08:00
Zefa Chen
983b411763 phy: rockchip: mipi-rx: fixes build error for kernel 6.1
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia4fe55b20738c5be310d73edf7716615da849615
2023-06-01 19:34:10 +08:00
Yu Qiaowei
086a82237c video: rockchip: rga3: fix compile errors on kernel-6.1
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I3b0de1f1da992975c13f99de7574ff0cd0865e25
2023-06-01 19:33:27 +08:00
Tao Huang
d664f49dd0 arm64: rockchip_linux_defconfig: Use DEBUG_INFO_REDUCED
We've had DEBUG_INFO enabled for arm64 defconfigs since the initial
commit.  This is probably not that frequently used but substantially
inflates the size of the build tree and amount of I/O needed during the
build.  This was causing issues with storage usage in some automated CI
environments which don't expect defconfigs to be quite this big, and
generally increases the resource consumption for both them and people
doing local builds.  The main use case for the debug info is decoding
things with scripts/faddr2line but that doesn't need the full
DEBUG_INFO, DEBUG_INFO_REDUCED is enough for it, so enable that by
default.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaed05d8e472d331692e6a58b41edd81d600cf529
2023-06-01 19:13:49 +08:00
Tao Huang
48e353f473 arm64: rockchip_linux_defconfig: address renamed CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_INFO is now implicitly selected if one picks one of the
explicit options that could be DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT,
DEBUG_INFO_DWARF4, DEBUG_INFO_DWARF5.

According to commit f9b3cd2457 ("Kconfig.debug: make DEBUG_INFO selectable from a choice"),
we use DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7acc85b5fc3e41f82e78337949346576cf621ef8
2023-06-01 19:13:20 +08:00
Tao Huang
8dabb59a05 arm64: rockchip_linux_defconfig: Replace I2C_HID by I2C_HID_OF
According to commit b33752c300 ("HID: i2c-hid: Reorganize so ACPI and OF are separate modules"),
replace I2C_HID by I2C_HID_OF.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I23eb34acdc6f0603285b8a9abe6100c227bf27a9
2023-06-01 19:03:41 +08:00
Tao Huang
e6aa862b3e arm64: rockchip_linux_defconfig: Remove unused configs
-# CONFIG_ARCH_RANDOM is not set
9592eef7c1 ("random: remove CONFIG_ARCH_RANDOM").

-CONFIG_ARM_CPUIDLE=y
51280acad8 ("cpuidle: cpuidle-arm: remove arm64 support").

-CONFIG_ARM64_CRYPTO=y
4a329fecc9 ("crypto: Kconfig - submenus for arm and arm64").

-CONFIG_ZSMALLOC=y
b3fbd58fcb ("mm: Kconfig: simplify zswap configuration").
select by ZRAM.

-# CONFIG_USB_GSPCA is not set
2a621b0859 ("media: gspca: Drop default m").

-CONFIG_ANDROID=y
1045a06724 ("remove CONFIG_ANDROID").

-CONFIG_CRYPTO_SHA512=y
5261cdf457 (crypto: drbg - select SHA512).
select by CRYPTO_DRBG_HMAC.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4fb4ea89f8d32470c9cad8054b89ca81c3df935a
2023-06-01 18:43:59 +08:00
Tao Huang
a9bc1db909 arm64: rockchip_linux_defconfig: Remove Android only configs
-CONFIG_CPU_FREQ_TIMES=y
-CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y
-CONFIG_DMABUF_HEAPS_PAGE_POOL=y
-CONFIG_IOMMU_LIMIT_IOVA_ALIGNMENT=y
-CONFIG_IOMMU_IOVA_ALIGNMENT=4

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7c4015e93a5181e2fbb9c9893534f169136ee82c
2023-06-01 10:11:03 +08:00
Tao Huang
1a9f428fcd arm64: rockchip_linux_defconfig: reorder configs only for kernel 6.1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I14f84bd19a87080c9caaadede4ef21e0e239dad0
2023-06-01 09:54:02 +08:00
Tao Huang
b206c8f2b0 drm: DRM_IGNORE_IOTCL_PERMIT drop depends on ANDROID
According to commit 1045a06724 ("remove CONFIG_ANDROID").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I59ab120e00569bcdb85564a1e1c8bef9d3f02688
2023-06-01 09:47:06 +08:00
Yandong Lin
4d6861cc43 video: rockchip: mpp: rkvenc2: fix adapt to kernel 6.1 issue
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I8d15a61066b7ecc27aabb33d9fd867586da603e1
2023-05-31 16:24:58 +08:00
Finley Xiao
c127ccc232 video: rockchip: mpp: rkvenc: remove old power model
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I333110472a1e66cde196b1880b317ebecb413a87
2023-05-31 16:24:13 +08:00
Finley Xiao
5eb44985ae video: rockchip: mpp: rkvdec2: remove old power model
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I04ac1e8a9d2963f990fc7e0b8d22c5a18bf2f640
2023-05-31 16:24:03 +08:00
Finley Xiao
c407d3fd78 video: rockchip: mpp: rkvdec: remove old power model
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I1b6307901c0e37f4ff46d63bd23baf0bb17a528f
2023-05-31 16:23:29 +08:00
Yandong Lin
53023d88f9 video: rockchip: mpp: iommu: fix adapt to kernel 6.1
Add mpp_iommu_reserve_iova api to implement reserve_iova.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ie4873af15d461842ddedd5b21a05fabf5bfda837
2023-05-31 16:16:20 +08:00
Herman Chen
e520884467 video: rockchip: mpp: fix dma_buf_vmap/vunmap adapt to kernel 6.1
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I9c6767ccf2711432c10674815139b9109d62af4e
2023-05-31 16:12:16 +08:00
Simon Xue
aebba681da dma-buf: rk_heaps: fix build error for kernel 6.1
Change-Id: Idd1f3c0bdada13049498be45da57f38c8c4da817
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2023-05-30 20:18:19 +08:00
Guangming Cao
e413dfb738 FROMLIST: dma-buf: support users to change dma_buf.name
User space user can call DMA_BUF_SET_NAME to set dma_buf.name,
but until now we can't set it at kernel side, it's difficult to debug
kernel dma_buf users.

There are some kernel users of dma_heap also need it at MTK,
such as camera, it's also have a allocator for other camera part,
unlike most case in userspace, it's in kernel.
For debug buffer owner, we need add it to let it can set debug name
for each dmabuf, so that we can know dmabuf owner by dma_buf.name.

Bug: 193623372
Link: https://lore.kernel.org/patchwork/patch/1459719/
Change-Id: Iac5c6b8838b9b4d976f4525d000e17a3abab94f6
Signed-off-by: Guangming Cao <Guangming.Cao@mediatek.com>
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2023-05-30 20:17:41 +08:00
Tao Huang
dd66c1b38f Merge commit '1013c54dc1e12db382e058d34b1038e0c1cad361'
* commit '1013c54dc1e12db382e058d34b1038e0c1cad361': (33 commits)
  input: touchscreen: gt1x: remove all usages of mm_segment_t
  Mali: bifrost: use task_tgid_vnr() and task_pid_vnr() to get tgid and pid
  MALI: rockchip: upgrade bifrost DDK to g18p0-01eac0, from g17p0-01eac0
  ARM: configs: rv1106: Add config for TEE support
  ARM: dts: rv1106: Add PSCI node
  ARM: dts: rv1106: Add Non-secure physical timer
  uapi/fec-config.h: Fix UAPI compile-test
  uapi/rk_vcm_head.h: Fix UAPI compile-test
  uapi/rk-camera-module.h: Fix UAPI compile-test
  uapi/rk-preisp.h: Fix UAPI compile-test
  uapi/rk-isp32-config.h: Fix UAPI compile-test
  uapi/rk-isp3-config.h: Fix UAPI compile-test
  uapi/rk-ispp-config.h: Fix UAPI compile-test
  uapi/rk-isp1-config.h: Fix UAPI compile-test
  uapi/rk-isp21-config.h: Fix UAPI compile-test
  uapi/rk-isp2-config.h: Fix UAPI compile-test
  uapi/rkcif-config.h: Fix UAPI compile-test
  uapi/rk-video-format.h: include types.h
  uapi/rockchip_drm.h: Fix UAPI compile-test
  uapi/dw_hdcp2.h: Fix UAPI compile-test
  ...

Fix drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c fallthrough warning.
Fix drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c atomic_commit argument.

Change-Id: I9ca9fad9694e31a7373b567eb3681fa6d7834c40
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-05-30 19:16:57 +08:00
Wu Liangqing
1013c54dc1 input: touchscreen: gt1x: remove all usages of mm_segment_t
The struct mm_segment_t is required by this driver only in conjunction
with Linux 5.9.0 or older. Since the struct is removed in Linux 5.18, it
must be removed from the driver as well.

Change-Id: I993800f1f6f03962dfd267a9b8e3c95f37baffe5
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2023-05-30 18:41:49 +08:00
Zhen Chen
e8df1af4f2 Mali: bifrost: use task_tgid_vnr() and task_pid_vnr() to get tgid and pid
To resolve the error of "Failed to get pid pointer for ...",
when running in container environment that uses pid_namespace.

Change-Id: Iff033d9cd8af33b9f2a536cbfbe2ae1e8d71bfba
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2023-05-30 18:41:29 +08:00
Zhen Chen
7a76350c1e MALI: rockchip: upgrade bifrost DDK to g18p0-01eac0, from g17p0-01eac0
Change-Id: I2c7e002c4b1a1834f89c52e4113e3b2f48f9cba6
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2023-05-30 18:41:29 +08:00
Sugar Zhang
038247591f ARM: configs: rv1106: Add config for TEE support
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Icbb212470faf7b6dc822d88061f10ffbce159090
2023-05-30 16:18:03 +08:00
Sugar Zhang
d159a00ad2 ARM: dts: rv1106: Add PSCI node
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I08d549b801f18f8337e7ce92b0b8ca46e63068d9
2023-05-30 16:18:03 +08:00
Sugar Zhang
8c6317e0fc ARM: dts: rv1106: Add Non-secure physical timer
We should introduce both Non-secure and Secure timer
to compatible for kernel with TEE or not.

As the chapter 2.3.2 PPIs of GIC-400 TRM says:

Interrupt ID   Source

30             Non-secure physical timer
29             Secure physical timer
27             Virtual timer
26             Hypervisor timer

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: If9441688d39930e71c5b217a4356f1c9972a8269
2023-05-30 16:18:03 +08:00
Tao Huang
03e8db0382 uapi/fec-config.h: Fix UAPI compile-test
./usr/include/linux/fec-config.h:14:2: error: unknown type name 'u32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I14edf55fe45b52f21bc18fba90f9d434a8882cfa
2023-05-30 16:09:11 +08:00
Tao Huang
9a2fdb9b46 uapi/rk_vcm_head.h: Fix UAPI compile-test
./usr/include/linux/rk_vcm_head.h:88:2: error: unknown type name 's32'
./usr/include/linux/rk_vcm_head.h:111:30: error: field has incomplete type 'struct __kernel_old_timeval'
./usr/include/linux/rk_vcm_head.h:116:23: error: field has incomplete type 'struct old_timeval32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I603502aaac87c71de8ae6ad027652de23cdcf73d
2023-05-30 16:09:11 +08:00
Tao Huang
9392fc185f uapi/rk-camera-module.h: Fix UAPI compile-test
./usr/include/linux/rk-camera-module.h:180:2: error: unknown type name 'u8'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I388d47ea658b5829df148c8b10eb5c466160a0e7
2023-05-30 16:09:11 +08:00
Tao Huang
4100ee9184 uapi/rk-preisp.h: Fix UAPI compile-test
./usr/include/linux/rk-preisp.h:65:2: error: unknown type name 's32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib1812da340c745600b4e2286ca299db2c1922bce
2023-05-30 16:09:11 +08:00
Tao Huang
d2c8cecdbc uapi/rk-isp32-config.h: Fix UAPI compile-test
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iddda89ca94260056fee99b15c72c0c83cf02a8e1
2023-05-30 16:09:11 +08:00
Tao Huang
36d41c6a18 uapi/rk-isp3-config.h: Fix UAPI compile-test
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I26016e6d1c3dbea0717ea97f80798677ac1b8823
2023-05-30 16:09:11 +08:00
Tao Huang
6c9d8b3eab uapi/rk-ispp-config.h: Fix UAPI compile-test
./usr/include/linux/rk-ispp-config.h:21:43: warning: // comments are not allowed in this language [-Wcomment]
./usr/include/linux/rk-ispp-config.h:132:2: error: unknown type name 'u32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5d9a79af6c1f72a8e969b0664e6b48fbf9e0199f
2023-05-30 16:07:14 +08:00
Tao Huang
97cb4e6b74 uapi/rk-isp1-config.h: Fix UAPI compile-test
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1bacf9575ded157a7c720472c24dfb32ff59c8e1
2023-05-30 16:06:44 +08:00
Tao Huang
7ea15737d0 uapi/rk-isp21-config.h: Fix UAPI compile-test
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id8c9c89b79b621aac379e3f937dfc488772c1b2f
2023-05-30 16:06:44 +08:00
Tao Huang
7e16cc6ce6 uapi/rk-isp2-config.h: Fix UAPI compile-test
./usr/include/linux/rk-isp2-config.h:277:21: error: implicit declaration of function 'BIT' [-Werror,-Wimplicit-function-declaration]
./usr/include/linux/rk-isp2-config.h:288:2: error: unknown type name 'u32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2f98bdcf50638cbe328b310d17d9417b382ab551
2023-05-30 16:06:44 +08:00
Tao Huang
1f70949faa uapi/rkcif-config.h: Fix UAPI compile-test
./usr/include/linux/rkcif-config.h:63:2: error: unknown type name 'u8'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic1c8f6c71c7fcaffd3f44ea8c88fcbeba19f3f7d
2023-05-30 16:06:44 +08:00
Tao Huang
1f72923c99 uapi/rk-video-format.h: include types.h
usr/include/linux/rk-video-format.h:10: found __[us]{8,16,32,64} type without #include <linux/types.h>

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3071683240e04039186c3a1d506835bd732c6716
2023-05-30 16:06:44 +08:00
Tao Huang
35d4f2a5df uapi/rockchip_drm.h: Fix UAPI compile-test
./usr/include/drm/rockchip_drm.h:19:10: fatal error: 'drm/drm_file.h' file not found

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I987b8bb26023e9e7b652962e54b45c24a0231d57
2023-05-30 16:06:44 +08:00
Tao Huang
018299a4ca uapi/dw_hdcp2.h: Fix UAPI compile-test
./usr/include/misc/dw_hdcp2.h:15:1: warning: // comments are not allowed in this language [-Wcomment]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib68c8b37acdc7e7cb11abeae15d1bfd27ec945b3
2023-05-30 16:06:44 +08:00
Tao Huang
78e874e69c uapi/rkflash_vendor_storage.h: include types.h
./usr/include/misc/rkflash_vendor_storage.h:11:2: error: unknown type name '__u32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia912e65b2f87d2c6bd57eb76019431c4084f6549
2023-05-30 16:06:44 +08:00
XiaoDong Huang
da9a7e29f0 ARM: configs: rockchip: Add rv1106-pm.config
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: Id8375b10d5c9b240a45e451b0a027d362c7ca06a
2023-05-30 10:41:39 +08:00