Commit Graph

863207 Commits

Author SHA1 Message Date
Elaine Zhang
c953ed2a09 UPSTREAM: clk: rockchip: support more core div setting
Use arrays to support more core independent div settings.
A55 supports each core to work at different frequencies, and each core
has an independent divider control.

Change-Id: I40dde15e25843090160bbc32d2de8e2cddffc96e
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20210315085608.16010-4-zhangqing@rock-chips.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from commit a3561e77cf)
2021-05-08 14:15:15 +08:00
Ding Wei
c655ba882d arm64: dts: rockchip: rk3568-nvr: Set parameters for nvr
1. rockchip,disable-auto-freq, means when get/set/reduce freq,
   return directly.
2. set assigned-clock-rates at hardware running rates, then
   it not need to adjust before running.

Change-Id: I0d7864112bb5ade99e29bcce9824f84e9a58735e
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-05-08 10:16:00 +08:00
Ding Wei
d8efa8439a video: rockchip: mpp: Add property for disable freq set
if property set, then it will skip get/set/reduce freq.

Change-Id: I56f641807327e9e63b8ebc0c91e79ffb19680b1c
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-05-08 10:15:38 +08:00
Alex Zhao
7d5518f87b net: rockchip_wlan: cywdhd: update version to 1.363.125.19-20210427
1. Add to support Low Power Solution.
2. Fix that system can't suspend in Android.
3. Fix that the SSID list will be shown very slowly when disable/enable wifi in Android.

Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: Ib0f9387e670cb2cb4aca9e2279f76f24dec3aa99
2021-05-08 09:53:55 +08:00
Wyon Bi
c9825f398a pinctrl: rk628: Dynamic allocation of GPIOs
Change-Id: I7b6de3d5a1f0866fc18bd3355c44ecc0862ad800
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-05-08 08:51:16 +08:00
Wyon Bi
311506dc96 Revert "ARM: Kconfig: set default gpio number for rockchip SoCs"
This reverts commit 7b5da4c3b9.

After commit 7ca267faba ("gpio: Increase ARCH_NR_GPIOs to 512"),
default ARCH_NR_GPIOS=512.

Change-Id: I028967da6fe2279d62803fb35d9d8874af9dbd11
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-05-08 08:51:16 +08:00
Weixin Zhou
d12d3e8501 ARM: dts: rockchip: rk628: Avoid namespace conflicts for pinctrl
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Ibc14654e8b321daebf5b15d51c0de26acb41df91
2021-05-08 08:51:15 +08:00
Wyon Bi
ed85b3c401 ARM: dts: rockchip: rk628: Avoid namespace conflicts
Add a prefix for all clocks to avoid namespace conflicts,
and no functional changes.

Change-Id: I1cf1c868f84b9bee4ba033bdd80c4995876b43f1
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-05-08 08:51:15 +08:00
Wyon Bi
613d31105b clk/rockchip/regmap: rk628: Avoid namespace conflicts
Add a prefix for all clocks to avoid namespace conflicts,
and no functional changes.

Change-Id: I6b586ce859ecf084fe6037c10c775d6bcc78baa1
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-05-08 08:51:15 +08:00
Caesar Wang
a2f7ea78f2 arm64/configs: update rockchip_linux_defconfig
1) enable rk628 configure
2) enable CONFIG_NTFS_FS
3) enable CONFIG_RK_HEADSET

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Ie66c1ca860fc53342dc5b8fad012f3e996b61c33
2021-05-07 20:08:48 +08:00
Jianqun Xu
e68e6d1a35 drm/rockchip: add dmabuf sync partial to dma_buf_ops
Change-Id: I6ba192c11a0ff9eeafa4f4f0260addb1e56c4afc
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-05-07 20:07:07 +08:00
Tao Huang
8d73d218b3 video: rockchip: mpp: rkvdec2: Fix compile warning on ARM
drivers/video/rockchip/mpp/mpp_rkvdec2.c:1029:16: warning:
format '%llx' expects argument of type 'long long unsigned int',
but argument 3 has type 'resource_size_t {aka unsigned int}' [-Wformat=]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5bb3ac3a2d5d2d41c802e42ed6a26efb5219d0aa
2021-05-07 18:22:57 +08:00
Ding Wei
98fdba74e1 video: rockchip: mpp: when meet unknown cmd, not return error.
reason: when kernel version later than mpp which user space, then
it will meet unknow cmd. however, it should not return error, and
let it continue instead.

Change-Id: I1209c27ef8de98f25b47700bc48dfcff305e0c0e
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-05-07 17:25:45 +08:00
Fenrir Lin
d6db4040f4 media: platform: rockchip: cif: avoid initcall later than isp
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Ic69f50d9d2c9b87d1e701badab6d2538f5c191ed
2021-05-07 17:19:57 +08:00
Sandy Huang
6cbc8aefdc drm/rockchip: drv: add support bcsh read from loader
Change-Id: I181f0d9066b4a1dbfdfe076a5b18a8d4cd639230
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-05-06 20:48:55 +08:00
Sandy Huang
fb57e7e357 drm/rockchip: vop2: add support cubic lut from loader
Change-Id: I11d65477364dc9ff4fb34d038179d5702faeb484
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-05-06 20:48:55 +08:00
Sandy Huang
9dafae176b arm64: dts: rockchip: rk3568: add reserved memory for cubic lut
Change-Id: I68bc3fb2e3955383652fd1e583728becbfca744b
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-05-06 20:48:55 +08:00
Sandy Huang
dbb3122b77 drm/rockchip: vop2: add consider three display pending done bit
Change-Id: I9e2fe62cff31153a1b16faaaa11f9a49b8051975
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-05-06 20:48:49 +08:00
Sandy Huang
a103f1595b drm/rockchip: vop2: add parse plane mask policy from uboot or dts file
Change-Id: I8608dfeb44ab02717d64da151aefe1f9548c936b
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-05-06 20:40:29 +08:00
Weixin Zhou
6f9d003a83 arm64: dts: rockchip: rk3566-eink: setting sleep_sta_ctl on in ultra sleep only
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I40484a87ef97429649620adebdc466cfadad4dc3
2021-05-06 20:22:40 +08:00
Sandy Huang
c176649809 arm64: dts: rockchip: rk3568: set display endpoint default as disabled
Change-Id: I3e8544ca6764aaa6c4327ad58e227a5e091e7dc9
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-05-06 15:19:52 +08:00
Sandy Huang
8584171ed1 arm64: dts: rockchip: rk3568: VOP: export VP to other dts file
Change-Id: I4172f4af7818f0fb5e49d438600debbd4bce2a0a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-05-06 15:19:52 +08:00
Sandy Huang
55bd4c4147 drm/rockchip: vop2: add to get more bus format from dri sunmmary
Change-Id: I58d505fb5abe9f71ab7dd747a0345b226aa46855
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-05-01 17:54:49 +08:00
Sandy Huang
c22203c149 drm/rockchip: vop: add to get more bus format from dri sunmmary
Change-Id: Id90f5734f431d2ff70a3196e3e600be426cfeae4
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-05-01 17:54:49 +08:00
Jianqun Xu
6ea9c8f968 arm64: dts: rockchip: rk3568-pinctrl fix node name to gpio-func
From gpio-consumer.yaml

properties:
  gpios:
    $ref: "/schemas/types.yaml#/definitions/phandle-array"
patternProperties:
  "(?<!,nr)-gpios?$":
    $ref: "/schemas/types.yaml#/definitions/phandle-array"

This patch try to avoid anything with gpio.

Change-Id: I0c32b585aaefcaa5d0e985b3ada1887019e006c7
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-30 18:33:14 +08:00
Meiyou Chen
ecb02a3dca staging: android: ion: support get physical address
Signed-off-by: Meiyou Chen <cmy@rock-chips.com>
Change-Id: I002b94215de5a34580c5b291932ddba0d4ac33bf
2021-04-30 17:31:36 +08:00
Jianqun Xu
59541c84bb arm64: configs: rockchip_defconfig enable ION_FORCE_DMA_SYNC
Enable ION_FORCE_DMA_SYNC for Rockchip platform.

Change-Id: I989b4a2fdaf3b7878f63336805479ec52fcf1ffe
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-30 15:16:57 +08:00
Jianqun Xu
646b9fca8f staging: android: ion: add FORCE SYNC for ion heap
Do dma sync after sg table created during ion alloc.

Since dma sync api requires a device, this patch also create a platform
device for ion.

The sg_phys will be filled after buffer mapped, but someone may need to
do sync without map/unmap operation, this patch also fills the sg_phys
after the sg_table created.

Change-Id: I2110f7727dbee55f7498c8d3376efcb7cd869b3a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-30 15:16:57 +08:00
Jianqun Xu
835aee8692 Revert "staging: android: ion: set dma ops for platform device"
This reverts commit 6a40ead69f.

The old patch only do sync for pages first allocated from system to page
pools which have memset operation.

In that case, the sg table hasn't been created, so the sg_phy should be
filled extra.

After this revert, a new patch will push to do sync after sg table
created, and use a common device from ion driver, which is required by
dma_sync api.

Change-Id: I9712136a532f64ff3224308f48d59efb87fd5be2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-30 15:16:57 +08:00
Jianqun Xu
0f4763b1c6 dma-buf: add DMA_BUF_IOCTL_SYNC_PARTIAL support
Add DMA_BUF_IOCTL_SYNC_PARTIAL support for user to sync dma-buf with
offset and len.

Change-Id: I03d2d2e10e48d32aa83c31abade57e0931e1be49
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-30 15:16:57 +08:00
Tao Huang
454d65eb27 arm64: dts: rockchip: Disable CPU_SLEEP idle state on rk3568-nvr
Reduce wake up latency.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I704c359338e2ef556f56af63875be54335974b52
2021-04-30 15:03:19 +08:00
Tao Huang
6409cc339e arm64: dts: rockchip: rkvdec use 64KB sram on rk3568-nvr
Without DDR freq, rkvdec can use all sram.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I17ddd8715ffff524613ba0a2f906d51ec12f4a94
2021-04-30 15:03:19 +08:00
Tao Huang
02c875c876 Revert "arm64: dts: rockchip: rk3568-nvr: remove rcb reference properties"
This reverts commit fc2f74ccdd.

Use sram can reduce the memory bandwidth usage.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5fae577671a905348239d0a40299d69e4cd8e6bb
2021-04-30 15:03:19 +08:00
Jianqun Xu
62618bd61d arm64: configs: rockchip_defconfig select ION_CMA_HEAP
This patch selects the ION_CMA_HEAP, for userspace to allocate continuous
memory area from ion cma-heap allocator.

Change-Id: I501f097cf8005bc7ecad8a0a23706f11b1987d3e
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-30 14:44:50 +08:00
Jianqun Xu
975372e2cb staging: android: ion: support partial cpu access
Change-Id: I8250c0bb26b776b8c8f5e4c3ee0cb71e26445743
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-30 08:29:06 +08:00
Alex Zhao
d37b518b0e arm64: dts: rockchip: rk356x board: give wifi some time after power-on.
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I29503ce3f328862361fda1c192aaff5d3b3781cb
2021-04-29 17:15:57 +08:00
Wyon Bi
075f963442 drm/bridge: analogix_dp: set correct dpms mode in loader_protect callback
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I2e99a3fac5ab51e94990d2e3e4720f1e885ff045
2021-04-28 16:06:04 +08:00
Wyon Bi
0311e832b5 Revert "arm64: rockchip_defconfig: enable CONFIG_PHY_ROCKCHIP_DP"
This reverts commit 621fa3942d.

Change-Id: If3f9ff54e0b1c2fc518c2f93b225b0382a5e0133
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-04-28 16:06:04 +08:00
Wyon Bi
84e9a413b9 ARM: rockchip_defconfig: remove CONFIG_PHY_ROCKCHIP_DP
The driver is gone, stop selecting it.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I3f618e97ea5f2d2fed643ef090262bf6a905b8b9
2021-04-28 16:06:04 +08:00
Wyon Bi
4d65711cc6 arm64: dts: rockchip: rk3368: Fix edp node
Change-Id: I96c3579d1772653ea04f4a3febf1b97ac0402047
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-04-28 16:06:04 +08:00
Wyon Bi
756ee85799 arm64: dts: rockchip: rk3399: Fix edp node
Change-Id: I84cb4bc0954d4d249a094b34512cd6558d2a58b9
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-04-28 16:05:35 +08:00
Joshua
63f7ae0482 media: i2c: add s5k4h7 camera driver.
Change-Id: Id291ef9cbeb48401e546e0c1be8c49845d96bf92
Signed-off-by: Joshua <joshua.huang@rock-chips.com>
2021-04-28 14:42:44 +08:00
Joshua
ba44eef6c6 media: i2c: add s5kgm1 camera driver.
Change-Id: I1b1e044af4be17cbcd19c6d480963c304b214696
Signed-off-by: Joshua <joshua.huang@rock-chips.com>
2021-04-28 14:41:28 +08:00
Caesar Wang
687c246020 arm64: configs: enable optee for rockchip_linux_defconfig
Enable the configs and had TEE information as below:

root@linaro-alip:~# dmesg |grep optee
[    0.181303] TEE core: Alloc the misc device "opteearmtz00" (id=0)
[    0.181507] TEE Core: Register the misc device "opteearmtz00" (id=0,minor=63)
[    0.848626] optee: probing for conduit method from DT.
[    0.848657] optee: revision 3.6 (c38b1925)
[    0.849045] optee: initialized driver

root@linaro-alip:~# realpath /dev/tee*
/dev/tee0
/dev/teepriv0

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I2e818978c2b3203d859e169f10b86bee1bdac125
2021-04-28 11:01:06 +08:00
Finley Xiao
cd4f956b82 ARM: dts: rv1126: Adjust opp table for low performance chips
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ib8eb3392050b25c3ac8e969348e1cca85a212d08
2021-04-28 10:08:33 +08:00
Zefa Chen
b149896cbb media: i2c: imx415 add HDR exposure exception handling
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I76dea27e13442d5907cead4c7d7bd9d8b6e0696b
2021-04-28 10:05:57 +08:00
Zefa Chen
eac935caac media: i2c: add camera driver imx464
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iae18497edac0c4fdd24bd2f74a5348aa5271f4e4
2021-04-28 09:48:41 +08:00
Zefa Chen
6725889649 media: i2c: support get dcg ratio from sensor
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I47e07dc1bb282e0fb24db87f3802dd3ef93907a8
2021-04-28 09:45:04 +08:00
Yu Qiaowei
4d505d61eb video/rockchip: rga2: Add new features in compat_ioctl.
Some features are not updated to compat_ioctl, so add them.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Id89a0826a4125af97398200f7ce6e3cc73de4342
2021-04-27 17:45:49 +08:00
Yu Qiaowei
f598231499 video/rockchip: rga2: Fix the wrong judgment of err_get_sg.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Iec9ac3492642bb00e212b9c2862bf9fa1d8a964c
2021-04-27 17:45:49 +08:00