Commit Graph

854514 Commits

Author SHA1 Message Date
Caesar Wang
157eabcdd5 arm64: dts: rockchip: Add px30-evb-ddr3-v11-linux dts for px30
Add the px30-evb-ddr3-v11-linux.dts for new panel on px30 evb boards.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I3f9acdd5f31c666487b1a51f611aa406ca553645
2020-07-27 10:24:45 +08:00
Caesar Wang
45b05dbe15 dt-bindings: Add rockchip px30 evaluation board for linux
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I71a076e63461dde6e39755feada34d2cca166849
2020-07-27 10:24:44 +08:00
Caesar Wang
8e81b94bb1 arm64: dts: rockchip: use ports to link DSI node and panel for px30 evb linux board
Fixes: d3d4f3e92d ("arm64: dts: rockchip: use ports to link DSI node and panel")

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I25328b4ac95fc88c0bbfa64c2a0dfd33040a8f63
2020-07-27 10:24:44 +08:00
Ziyuan Xu
e410ab063c arm64: dts: rockchip: px30-evb-ddr3-v10: correction sw1/2 for rk809
Change-Id: Ib3e66f5e3965151c0a47d2b523ddc3724db884b5
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2020-07-27 10:01:20 +08:00
Weiwen Chen
9fd62062bf dma-buf: export the function set release callback
Fix if CONFIG_DRM_ROCKCHIP config module compile.

ERROR: "dma_buf_set_release_callback" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined!
ERROR: "dma_buf_get_release_callback_data" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined!

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ic2de2b500990b6a818a976ffb87e538bb0cb9f11
2020-07-27 09:51:15 +08:00
Lin Jianhua
42733c56ee ARM: configs: add rv1126-facial-gate.config for rv1109 facial gate
make ARCH=arm rv1126_defconfig rv1126-facial-gate.config

Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Change-Id: I31719cb84af3d5ca12acec44df2976cdaf43e246
2020-07-27 09:48:10 +08:00
Lin Jianhua
d2713bf0a9 ARM: dts: rockchip: Add rv1109-evb-ddr3-v12-facial-gate
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Change-Id: I38e17a2b546b46bc6f6e3ebc88c33e8bcc733ef3
2020-07-24 17:34:38 +08:00
Frank Liu
376d89f836 media: i2c: add gc2053 sensor driver
Signed-off-by: Frank Liu <frank.liu@rock-chips.com>
Change-Id: I171e535d362c3c4e8daa2adaa4e4ec58dfb322aa
2020-07-24 17:32:33 +08:00
David Wu
c727de5059 i2c: rk3x: Clean start in rx_only mode
In rx only mode, if start is rewritten, a repeat start signal
will be generated, which may affect some peripherals.

Fixes: 42f500840d ("i2c: rk3x: Remove start state and irq")
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I1bdc6ee669bfcbd60e25abf723596791c59a9231
2020-07-24 15:55:53 +08:00
Caesar Wang
2765488245 arm64: configs: enable bifrost and otp for rockchip_linux_defconfig
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I9e5d0be46fe48ccb65c530548e77c4617a045d21
2020-07-24 15:31:26 +08:00
Caesar Wang
01a5b9fd17 arm64: dts: rockchip: Add rockchip,avs of cpu property on rk3326 linux boards
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I54e47d57e04db17871d3b639ff0ca94f8cd7aa90
2020-07-24 15:30:51 +08:00
Caesar Wang
bf1fb1ba8d MALI: bifrost_for_linux: adjust source codes for kernel v4.19
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Icd0b7085a5e19d8c40b7c2762b2286c89af0197c
2020-07-24 15:30:35 +08:00
Cai YiWei
a17a958f85 media: rockchip: isp: fix no work for internal read back case
Change-Id: I00722d7cd0f6e5011ea24c14cbdd7a5437a82eb4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-07-24 11:17:34 +08:00
XiaoTan Luo
6d25c622a5 ASoC: es8323: fixed es8323 suspend error
it produces a lot of heat when es8323 suspend, and fixed it.

Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I26c9a5dacc15f4b9a5ca323993d4986848c6be7d
2020-07-24 10:11:43 +08:00
XiaoTan Luo
099866c7c7 ASoC: es8323: fixed adc record error
it has a high probability that es8323 record error, and fixed it.

Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I57509a2f5ee04045bb2618a7c7ec11440030c4dc
2020-07-24 09:52:42 +08:00
Ding Wei
bf5afbeaf9 video: rockchip: mpp: fix error for hand writing
Change-Id: If8483dfa7e4b432128d1139b69f9d414c5d04a22
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-07-23 19:41:49 +08:00
Sandy Huang
d7bc7fe3a6 Revert "drm/drm-prime: cache dma_buf import context"
This reverts commit 09d07c8016.

Change-Id: Ifb57a691d55e108589b77037a9b9d88328cd9415
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-07-23 17:25:13 +08:00
Sandy Huang
1484f3cf59 drm/rocckhip: implement rockchip_drm_gem_prime_import
1. when import dma-buf we should compare dma_buf->ops with
rockchip_drm_gem_prime_dmabuf_ops;
2. drm_gem_prime_import_dev add some special change for ion alloc
buffer, we must remove them from drm_prime.c for gki.

so we implement rockchip_drm_gem_prime_import to instead of
drm_gem_prime_import.

Change-Id: Iab3260b5c3efb5634d411eb1e8620fb575aa063c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-07-23 17:25:03 +08:00
Nickey Yang
cc1f5b2bce ARM: dts: rv1126: correct cpu0_opp_table
fixed the maximum voltage value of CPU working at 408M

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Iaa730767007229295106d8f5e2ff7e1653f19aef
2020-07-23 16:05:51 +08:00
Allon Huang
269e1f16dc media: platform: rockchip: cif: get crop from sensor
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I728805a9e48c5a055c58fb33d382fadfb00777ec
2020-07-23 15:47:55 +08:00
Hu Kejun
54c024a548 media: rockchip: isp: fix can not report luma connected with some sensor
y state isr of next long frame of some sensor comes before frame end of short frame,
fix can not report luma connected with these sensor.

Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I9024bf330da178445aaff4aa8131dec6547e5ba5
2020-07-23 15:46:48 +08:00
Nickey Yang
bfd5509dc2 ARM: dts: rv11xx-evb-v10.dtsi update touch ic slave address
There is a  pull-up resistor added to the new touch board,
so the address of TP is changed to 0x14.
At the same time, switch the reporting coordinate method for
meet the requirement of QT using linuxfb.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I1e25f7e47b2b93ccb66b1c093241eb94afc1a574
2020-07-23 14:15:59 +08:00
Allon Huang
0abb8094e0 media: platform: rockchip: cif: run luma isr only when chip is rv1126
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I90dd9ef08279456b7fef8f0eaad1fe5fe767fbb2
2020-07-23 14:13:07 +08:00
Allon Huang
096bba0696 media: platform: rockchip: cif: disable vicap lvds function when stream off
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I9914c7466b313740208322091d653d189ad4d665
2020-07-23 14:12:55 +08:00
Allon Huang
2e3ebdadc4 media: platform: rockchip: cif: support subscribing lvds sof event
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I1c24c30050912f29e6ce1e4a4065575979b07de7
2020-07-23 14:12:46 +08:00
Cai YiWei
30e6e71506 media: rockchip: isp: tx timestamp match with fps
Change-Id: I2bc8e58ac09bde3b845d8c0a03f3193fd3179b97
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-07-22 14:12:29 +08:00
Cai YiWei
fb9c868033 media: rockchip: ispp: support sharp fbc rotation
Change-Id: Ide6b2adf289d03524b0105b3b7640c419e86fb2a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-07-22 14:12:00 +08:00
Shunqian Zheng
27e2f35d39 ARM: configs: add rv1126 robot defconfig
RV1126 robot defconfig removes some configs from rv1126_defconfig
which is not in use of robot boards, like BT, ethernet, LCD, VOP.

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Change-Id: I8f89e79e6b6e48005c8a4dca231ef7ea0a5a064a
2020-07-22 11:54:20 +08:00
Shunqian Zheng
2c5ca422ba ARM: dts: add rv1126 robot dts
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Change-Id: I44f95c6b05d66699fc3f388a2f96e548b3252f3c
2020-07-22 11:54:20 +08:00
Shunqian Zheng
b309af488c net: wireless: rockchip: rkwifi: bcmdhd: fix gcc8 warning
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux.c:6975:39:
warning: argument to 'sizeof' in 'strncpy' call is the same expression
as the source; did you mean to use the size of the destination?
[-Wsizeof-pointer-memaccess]
error, forbidden warning:dhd_linux.c:6975
   strncpy(drvname, info.driver, sizeof(info.driver));

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Change-Id: I8f39153a2df4bb2395cd9aac9bd763587f509713
2020-07-22 11:51:16 +08:00
Allon Huang
815ae888ae media: platform: rockchip: cif: add interface for getting sof in luma module
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I7f9102057c4a52427c4264e523a14ecdf54d971b
2020-07-22 11:48:52 +08:00
Nickey Yang
2825ffae0c input: touchscreen: gt1x: support config gtp_ics_slot_report
Configure gtp_ics_slot_report in dts node will use slot report
to report coordinate. QT use linuxfb backend can only receive
touch reports in this way.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I080d7752852e07bd8f93c86149af6021e2b0edbf
2020-07-22 10:38:00 +08:00
Allon Huang
a417316229 ARM: dts: rv1126: add lite vicap node
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I307b969adfc251469d0e3c5f422f0eca402458c2
2020-07-22 10:31:53 +08:00
Allon Huang
b4ac25e9ea media: platform: rockchip: cif: add lite vicap device
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I5251d677c6228cd6b09a0052cbb719a97c7fafd6
2020-07-22 10:28:43 +08:00
Allon Huang
00610f370e media: platform: rockchip: cif: support lvds for linear and hdr mode
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I1aa2ab86b16f16c535c39025603795afbb5e0e94
2020-07-22 10:21:27 +08:00
Allon Huang
74e1e1627e include : uapi: linux: camera: change struct rkmodule_lvds_cfg for lvds sync code parameters
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I4cdf7d7d4c4454f42de3614bdbc1c193f39616c3
2020-07-22 09:55:35 +08:00
Hu Kejun
17ed5ad9a6 media: platform: rockchip: cif: add luma device node
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I23f9c34930d2ac7d6ddcfa0d6e4334c417220d09
2020-07-22 09:43:22 +08:00
Allon Huang
80dc82ec94 media: platform: rockchip: cif: support rv1126 mipi interface for linear and hdr mode
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I073bdafe037498519bb5cd14cb6a64b26f5dd1f5
2020-07-22 09:26:33 +08:00
Caesar Wang
9835c70741 drm/rockchip: change the overlay for rk312x
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I3dfdff66a8903e1f7c710a3b5fea8fa43d2b0a07
2020-07-22 09:12:30 +08:00
Sandy Huang
1ae91d8954 Revert "drm/prime: add dmabuf begin/end cpu access"
This reverts commit 4b7491b317.
move dmabuf begin/end cpu access to rockchip drm drivers.

Change-Id: Ie143cddf743012768ddae3bb791f720d2933fc52
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-07-21 17:59:18 +08:00
Sandy Huang
039b272443 drm/rocckhip: add support dmabuf begin/end cpu access
Change-Id: I82bf5b2bca4c3b9ee6b31f8541c627c4406a7242
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-07-21 17:59:18 +08:00
Cai YiWei
df47abdafa media: rockchip: isp: more isp state for debug
Change-Id: I3b47effb53080bfb751fc293567abd666917934e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-07-21 17:57:33 +08:00
Allon Huang
ddd2bba26f ARM: configs: rv1126_defconfig: enable CONFIG_VIDEO_ROCKCHIP_CIF
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ie52a8d7173006016de34bfe8cf3ccdb7e1ec85f0
2020-07-21 17:36:12 +08:00
Sandy Huang
4f4dcf8d82 drm/rockchip: use DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE
use DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE to instead of
DRM_BUS_FLAG_PIXDATA_NEGEDGE.

Fixes: d5272ec9bd ("drm/rockchip: use DRM_BUS_FLAG_PIXDATA_NEGEDGE to identify dclk polarity")
Change-Id: Ifaa376f1d71e77a83096c1e8fd8e1d245fea63d5
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-07-21 16:08:22 +08:00
Laurent Pinchart
f1de77acd6 UPSTREAM: drm: Clarify definition of the DRM_BUS_FLAG_(PIXDATA|SYNC)_* macros
The DRM_BUS_FLAG_PIXDATA_POSEDGE and DRM_BUS_FLAG_PIXDATA_NEGEDGE macros
and their DRM_BUS_FLAG_SYNC_* counterparts define on which pixel clock
edge data and sync signals are driven. They are however used in some
drivers to define on which pixel clock edge data and sync signals are
sampled, which should usually (but not always) be the opposite edge of
the driving edge. This creates confusion.

Create four new macros for both PIXDATA and SYNC that explicitly state
the driving and sampling edge in their name to remove the confusion. The
driving macros are defined as the opposite of the sampling macros to
made code simpler based on the assumption that the driving and sampling
edges are opposite.

Change-Id: I262d7c66791f5de18042e627b32c64851fcaf1ee
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
(cherry picked from commit a792fa0e21)
2020-07-21 16:03:00 +08:00
Zhichao Yu
b6597a7964 ARM: configs: Rename rv1126-evb-ddr3-v12-tb-emmc.config to rv1126-tb-emmc.config
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: Ifa96d0bfba6f4266fd297c9c1cbdde0b1155f8a2
2020-07-21 09:49:24 +08:00
Elaine Zhang
f188cd20eb net: can: rockchip: fix up the tx_id_mask bit error
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I1bb0b35abe53d37dfb99eeaf99416f0bc03cc70d
2020-07-21 09:29:27 +08:00
Sandy Huang
6ea8daccaf Revert "drm: fix some no need warning"
This reverts commit 455796818d.
and deal with this issue by following commit:
commit 1f525e2416b3 ("drm/rockchip: reset conn->state->best_encode")

Change-Id: I239296a0a618a3034c6502ca95050dd85da7b5fe
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-07-21 09:17:26 +08:00
Sandy Huang
dba4fb464a drm/rockchip: reset conn->state->best_encoder
reset conn->state->best_encoder, otherwise will dump the following
warning log at one crtc multiple connector platform:

WARNING: CPU: 6 PID: 61 at drivers/gpu/drm/drm_atomic_helper.c:225
set_best_encoder.isra.3+0x40/0xf0

[    1.520856] Call trace:
[    1.520868]  set_best_encoder.isra.3+0x40/0xf0
[    1.520896]  drm_atomic_helper_check_modeset+0x670/0xa60
[    1.520907]  drm_atomic_helper_check+0x1c/0xc0
[    1.520920]  drm_atomic_check_only+0x354/0x640
[    1.520932]  drm_atomic_commit+0x18/0x58
[    1.520960]  rockchip_drm_bind+0x12f0/0x18e8
[    1.520973]  try_to_bring_up_master+0x144/0x1a8
[    1.520985]  component_master_add_with_match+0xd4/0x130
[    1.520996]  rockchip_drm_platform_probe+0x178/0x2e8
[    1.521022]  platform_drv_probe+0x50/0xa8
[    1.521033]  really_probe+0x200/0x2b0
[    1.521043]  driver_probe_device+0x58/0x100
[    1.521054]  __device_attach_driver+0x90/0xc0
[    1.521064]  bus_for_each_drv+0x70/0xc8
[    1.521074]  __device_attach+0xdc/0x138
[    1.521097]  device_initial_probe+0x10/0x18
[    1.521107]  bus_probe_device+0x94/0xa0
[    1.521118]  deferred_probe_work_func+0x80/0xb8
[    1.521131]  process_one_work+0x1a0/0x418
[    1.521143]  worker_thread+0x1e4/0x3e0
[    1.521154]  kthread+0x12c/0x158
[    1.521166]  ret_from_fork+0x10/0x18
[    1.521189] ---[ end trace bb121b6492800165 ]---

Change-Id: I64a35a13819add55a565165198b1313f8cfc7597
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-07-21 09:17:06 +08:00
Sandy Huang
1656d858b1 Revert "drm/modes: add dclk invert config parse"
This reverts commit 4492caa259.

remove rockchip private flag.
use DRM_BUS_FLAG_PIXDATA_NEGEDGE to instead of DRM_MODE_FLAG_PPIXDATA.

Change-Id: I24ce988a84a4a5793f7eb3e26e51293988d854d0
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-07-21 09:16:29 +08:00