Commit Graph

1064883 Commits

Author SHA1 Message Date
Algea Cao
215ac770e2 phy: rockchip-samsung-hdptx-hdmi: Fix slight deviation of some frequencies
HDMI phy pll Ksub can't set to 0, or some frequencies may
have slight deviation.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I5e9b6faf7a4397b2b43beea7094fbd3f4b4cb46b
2022-01-25 16:54:44 +08:00
Elaine Zhang
6926e98d70 clk: rockchip: rk3588: export hdmirx_biu soft reset id
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I37c1f67bd62eabe3b0cfa2e1b304a3ae1950b66e
2022-01-25 16:41:58 +08:00
Jianwei Fan
3604e25e7a arm64: dts: rockchip: fix the file names of bt656 and bt1120 dtb
Fixes: 3a84f255cd ("arm64: dts: rockchip: rk3588: add support for BT656")
Fixes: 48801131ab ("arm64: dts: rockchip: rk3588: add support for BT1120")
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Ic182b1d138c0ceb26859639a99b56266754052de
2022-01-25 15:57:28 +08:00
Zhang Yubing
26491f667e drm/rockchip: add rockchip private drm property define
Different output interface may user the some property, keep
the property define in rockchip drm driver header file.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ia0e53c978285fa3fc4bb1642ab5886279139c461
2022-01-25 14:29:09 +08:00
Jianwei Fan
16179a9ba6 arm64: dts: rockchip: rk3588s-evb3: add support ahd to bt1120 configuration
add dts file:
        rk3588s-evb3-lp4x-v10-nvp6158-ahd-to-bt1120.dts

Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I12993714936cbc4c2e7b29649cadc9ead7a95da9
2022-01-25 14:27:26 +08:00
Zhang Yubing
74d6a13cb6 drm/rockchip: dw_hdmi: fix output interface config
hdmi id 0 mean hdmi0, hdmi id 1 mean hdmi1, fix it.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I8766336cf88c8b1dbff0f2f018cb69a5e65fdfa4
2022-01-25 11:01:23 +08:00
Sugar Zhang
6783f7920e clk: rockchip: Rename CLK_RV110X to CLK_RV1108
Now RV1103/6 is coming, the original CLK_RV110X is for
RV1107/8, to avoid been mis-understood, so, make this
change.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id27803b6b2863f6949ddebb9c285c21ad1ca32ef
2022-01-25 09:26:41 +08:00
Ding Wei
5104b0274b video: rockchip: mpp: Move mpp_get_task_used_device for common func
Change-Id: I374f216a2b487549a605e228a8bbe45445eaacb4
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2022-01-24 19:54:45 +08:00
Weiwen Chen
fba771c378 arm64: dts: rockchip: Add rk3588-ipc.dtsi for IPC products
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I8bc6abe231820379f5e97eab53b60710f2c0d4f6
2022-01-24 19:36:28 +08:00
Elaine Zhang
7f38c7fb40 thermal: rockchip: optimize static memory consume
$ ./scripts/bloat-o-meter rockchip_thermal_olg.o rockchip_thermal.o
add/remove: 0/32 grow/shrink: 1/1 up/down: 500/-6844 (-6344)
Function                                     old     new   delta
rk_tsadcv2_get_temp                           20     520    +500
temp_last                                      4       -      -4
prob_last                                      4       -      -4
bounding_cnt                                   4       -      -4
rk_tsadcv2_irq_ack                            16       -     -16
rk_tsadcv3_control                            24       -     -24
rk_tsadcv2_tshut_mode                         44       -     -44
rk_tsadcv2_initialize                         48       -     -48
rk_tsadcv5_initialize                         68       -     -68
rk_tsadcv4_initialize                         68       -     -68
rv1108_tsadc_data                             84       -     -84
rk3568_tsadc_data                             84       -     -84
rk3399_tsadc_data                             84       -     -84
rk3368_tsadc_data                             84       -     -84
rk3366_tsadc_data                             84       -     -84
rk3328_tsadc_data                             84       -     -84
rk3308_tsadc_data                             84       -     -84
rk3288_tsadc_data                             84       -     -84
rk3228_tsadc_data                             84       -     -84
rk1808_tsadc_data                             84       -     -84
px30_tsadc_data                               84       -     -84
rk_tsadcv7_initialize                        180       -    -180
rk_tsadcv3_initialize                        208       -    -208
rk_tsadcv3_get_temp                          244       -    -244
rk3328_code_table                            280       -    -280
rv1108_table                                 288       -    -288
rk3568_code_table                            288       -    -288
rk3399_code_table                            288       -    -288
rk3368_code_table                            288       -    -288
rk3288_code_table                            288       -    -288
rk3228_code_table                            288       -    -288
rk1808_code_table                            288       -    -288
rk_tsadcv2_code_to_temp                      556       -    -556
of_rockchip_thermal_match                   2548     392   -2156
Total: Before=12093, After=5749, chg -52.46%

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I506a6135907942abcb60684f9f0888a238950421
2022-01-24 19:23:26 +08:00
Sugar Zhang
6631851252 soc: rockchip: Rename CPU_RV110X to CPU_RV1108
Now RV1103/6 is coming, the original CPU_RV110X is for
RV1107/8, to avoid been mis-understood, so, make this
change.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I1fa19e740b72934dc84f0d2bbbf56b00aa24225a
2022-01-24 19:23:26 +08:00
Tao Huang
92073c0050 drm/rockchip: Remove depends on ROCKCHIP_IOMMU
Some CPUs without IOMMU but have VOP.

Change-Id: Ic11d1438851eb4773bc94e74879a2329964d012a
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2022-01-24 19:23:26 +08:00
Elaine Zhang
971b62dfb0 clk: rockchip: rk3588: aclk_vop not allowed set parent to aupll
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Id66af7ceffba10cb3218626b3ca0cc408fa55fba
2022-01-24 19:23:26 +08:00
Jianqun Xu
b6f4e3659a pinctrl: rockchip: fix rk3568 slew rate to 2bit per pin
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I5cb7d6fbb26f5bcdc6ab181d1ad33547259163ab
2022-01-24 15:16:53 +08:00
Cai YiWei
ce8c9ed3e9 media: rockchip: isp: clean rdbk kfifo for isp32
Change-Id: I6ed469017581f2e830b386e50ea96ff792fe6abf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-01-24 11:46:24 +08:00
Weixin Zhou
b371f0e3ff arm64: dts: rockchip: rk3588s-tablet-rk806-single: add otg config
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I6537105b08ca8be3fb3fe6ad06479db551c9fece
2022-01-24 10:57:47 +08:00
Finley Xiao
e00294a28c arm64: dts: rockchip: rk3588s: Add cooling devices
Change-Id: I37d546e1a8d11e0dbc1093cd77889c0b560b57b0
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2022-01-21 20:29:48 +08:00
Finley Xiao
f4639a388e MALI: bifrost: Add support to only calculate dynamic power
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I62047acb6a57652c9473d117651f4bf75fcbbb28
2022-01-21 20:29:48 +08:00
Finley Xiao
bdf97c1cae thermal: rockchip: change code table for rk3588
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia2b765257833801b217b87c51481e58451bfd74a
2022-01-21 20:29:48 +08:00
Lin Jinhan
166709baa0 ARM: rockchip_linux_defconfig: enable CONFIG_CRYPTO_DEV_ROCKCHIP_DEV
CONFIG_CRYPTO_DEV_ROCKCHIP_DEV is used to export kernel crypto interface
 into user space.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I06e49ba8c430eaa06315c4b549c939a73bdb7c4c
2022-01-21 19:47:05 +08:00
Lin Jinhan
8e287ffcf2 ARM: rockchip_defconfig: enable CONFIG_CRYPTO_DEV_ROCKCHIP_DEV
CONFIG_CRYPTO_DEV_ROCKCHIP_DEV is used to export kernel crypto interface
 into user space.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I3d1069b83ba1d29304deccda0392ac5b27e6fd0f
2022-01-21 19:46:51 +08:00
Lin Jinhan
dde0eff412 arm64: rockchip_linux_defconfig: enable CONFIG_CRYPTO_DEV_ROCKCHIP_DEV
CONFIG_CRYPTO_DEV_ROCKCHIP_DEV is used to export kernel crypto interface
 into user space.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Id7f33508567fc3c55704a8325774c3f4c57c187f
2022-01-21 19:45:25 +08:00
Chen Shunqing
5525b57efc power: supply: bq25703a: set low power mode when suspend
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I9dd19a3314293178c03464ae55fd3dc564089dd7
2022-01-21 19:44:00 +08:00
Sandy Huang
f8ea21c7db drm/rockchip: dw_hdmi: Fix 8K30/25/24 YUV420 no enter FRL mode
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I1788a14ba5c4bd0b162b6d78e4b4944450c3c097
2022-01-21 19:42:50 +08:00
Sandy Huang
68580e2435 drm/rockchip: drv: logo: add vm reserved for logo memory
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I91f0831d24d29015389a66b68ef39e0fbd96dcde
2022-01-21 19:38:53 +08:00
Chen Shunqing
10f028dc00 power: supply: bq25890: register otg vbus regulator
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: Ie59529377558bbfeabf9bd2a614df6a8b0402c32
2022-01-21 19:27:27 +08:00
Shunqing Chen
ed37307abb power: supply: bq25890: add pd charge support
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I3597b7e1934396a2e3d29f314fac50d476a46a23
2022-01-21 19:20:35 +08:00
Chen Shunqing
2a5891beb5 power: supply: bq25890: add sy6970 charger ic support
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I3911a8ae5fe562e875d7f59e541da30e1f9d53de
2022-01-21 19:15:55 +08:00
Sugar Zhang
b12cc7fd53 ASoC: rockchip: spdif: Add support for set mclk rate
This patch allow to set mclk rate from machine driver.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id1e713c7021cb644eeb32fb98d384a6fd320f31d
2022-01-21 19:13:17 +08:00
Shunhua Lan
16696df0a0 media: rockchip: rkhdmirx: add audio feature
Change-Id: I22feb58a5feaf1e08751464f6bc4d0a9edbe8ae5
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
2022-01-21 18:42:48 +08:00
Zefa Chen
9e14aff51e media: rockchip: vicap: mipi csi2 modify irq err print
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic9cf0fa4fe72bc0e96e72fd541e2aaed50a24cba
2022-01-21 17:32:25 +08:00
Joseph Chen
5d8b8680f5 arm64: dts: rockchip: rk3588: use pmu0_grf for reboot mode
If use pmu1_grf register, BL31 can't assert NPOR when reboot.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I14c78f83aa600d8964eccb2eb7df2c7f6fc0b530
2022-01-20 18:55:50 +08:00
Huibin Hong
8fd12728a0 arm64: dts: rockchip: rk3588-android: disable gic nmi
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I26e9aaed58534b6a02064f81538235d3e158f86d
2022-01-20 18:51:02 +08:00
Huibin Hong
5f2e518f7c arm64: dts: rockchip: rk3588-linux: disable gic nmi
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Ie43042ce19586c5b37e0864ff9ccef87f20fd68d
2022-01-20 14:20:59 +08:00
Dingxian Wen
3e6fe49ea6 arm64: dts: rockchip: rk3588-evb1-lp4: enable hdmirx_ctrler
Enable hdmirx_ctrler and reserve cma memory for hdmi-in application

Change-Id: I033bcea55e03e168a73fb607c17d92468b6f2c34
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-01-20 10:56:08 +08:00
Dingxian Wen
f2639a412c arm64: dts: rockchip: rk3588: Remove hdmirx_reserved
hdmirx can use the default CMA memory.

Fixes: d14994e799 ("arm64: dts: rockchip: rk3588: add hdmirx_ctrler node")
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I6b019fd278374e5edc9e46db63b50e4658578178
2022-01-20 10:55:57 +08:00
Dingxian Wen
c377384268 media: platform: hdmirx: hdmirx can use specific reserved CMA memory or
default CMA memory

Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I6a913c496d2098b62a7cafbd9932d87804474d9f
2022-01-19 18:04:14 +08:00
Jianqun Xu
e8f7a297a7 Revert "video: rockchip: mpp: use dma-buf-cache func"
This reverts commit 5a9e481dce.

Change-Id: I56e60eeec934c240464c5e2677bb1fb635410528
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-01-19 18:03:45 +08:00
Caesar Wang
e34225faf5 Revert "arm64: dts: rockchip: enabled dmc on rk3588 linux evb1"
This reverts commit f48350e234.

Conflicts:
	arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4-v10-linux.dts

Change-Id: I334d4892fb3ef51f5cbe66b80a6d4bbf1938310d
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2022-01-19 18:02:02 +08:00
Jianqun Xu
2da4d0ad4c dma-buf: remove size align to cache line size check for partial sync
Fixes: 1aef8d5550 ("dma-buf: add DMA_BUF_IOCTL_SYNC_PARTIAL support")
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I89a0a98be33235ce707f660a95098511bbdf830a
2022-01-19 18:01:33 +08:00
吴良清
de8062f2c3 Revert "arm64: dts: rockchip: rk3588-android: enabled dmc"
This reverts commit 2e274f3186.

Change-Id: Ieefcf657118a95ad44344e8bca1bcc4403d1665d
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2022-01-19 17:15:45 +08:00
Dingxian Wen
b1ba0df9c0 arm64: dts: rockchip: rk3588: configure hdmirx_reserved as reusable
To fix memory reservation error.

Fixes: d14994e799 ("arm64: dts: rockchip: rk3588: add hdmirx_ctrler node")
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I340a5efefeaba2985d9bb811e20a76b90e0b7888
2022-01-19 16:08:56 +08:00
Yao Xiao
a2538eae57 arm64: dts: rockchip: rk3588-evb1-lp4-v10-linux: keep wifibt power in suspend
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: I360ac3b6765fc4dfba139fce6856ef1eab16fd72
2022-01-19 14:30:46 +08:00
Weiwen Chen
08462a9ef6 arm64: dts: rockchip: Add rk3588-evb1-lp4-v10-linux-ipc.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Iafd5bef2acb8388dcd58fcbcb86748cafecf9737
2022-01-19 14:29:59 +08:00
Wyon bi
f444da677c drm/rockchip: dw-dp: Add extcon support
Signed-off-by: Wyon bi <bivvy.bi@rock-chips.com>
Change-Id: I7310fb33f46ed555bdf4c4f5601356696e68f34d
2022-01-19 08:41:15 +08:00
Dingxian Wen
d14994e799 arm64: dts: rockchip: rk3588: add hdmirx_ctrler node
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I6d86ff13e58611e068fd3a6cc44d1f9b6f6457da
2022-01-18 20:05:20 +08:00
Dingxian Wen
1998c1af0a media: platform: add rockchip hdmirx phy and controller driver
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I9344f8e2221d714f0c6d90c6e1f51c60024ffefc
2022-01-18 16:11:16 +08:00
Dingxian Wen
ee8940ee60 arm64: rockchip_defconfig: enable CONFIG_VIDEO_ROCKCHIP_HDMIRX
Enable CONFIG_VIDEO_ROCKCHIP_HDMIRX for hdmi-in application on
rk3588-evb1-lp4

Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I947bc91362704b443feb5fdbc9905cd2d2a2a0ef
2022-01-18 15:48:33 +08:00
Caesar Wang
f48350e234 arm64: dts: rockchip: enabled dmc on rk3588 linux evb1
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Icdc38d87c9ac3fe3e14caf77beaaa840909066ef
2022-01-18 14:40:26 +08:00
Alex Wang
f7486beac7 arm64: dts: rockchip: rk3588-nvr: Assign VOP_ACLK to 800MHZ for 8K
Change-Id: Ide4640955e4bdab9273df81d25aa4d361a9fa487
Signed-off-by: Alex Wang <alex.wang@rock-chips.com>
2022-01-18 11:31:34 +08:00