Commit Graph

859407 Commits

Author SHA1 Message Date
Cai YiWei
bfdc2e9135 media: rockchip: isp: resolution write directly to reg for first dev
Change-Id: I75f2aced1de968eb0bb16f9643b93bb5709550c3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-28 19:00:46 +08:00
Allon Huang
591e626b0e media: rockchip: cif: fix compile warning in rkcif_assign_new_buffer_oneframe
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Iba2422c099d9ebadd8eb8da28a4693c80f57883a
2020-10-28 16:06:16 +08:00
Ding Wei
f28a4dea35 video: rockchip: mpp: add feature for show support devices
usage:
    cat /proc/mpp_service/support_device

Change-Id: Id5403c2d7ae1f43578d9f216e51dcdbf4996d2fc
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-27 18:24:22 +08:00
Yifeng Zhao
4c18d0c66b drivers: mtd: nand: rockchip: add mtd ooblayout config
Fix "No oob scheme defined for oobsize" issue for Some
NAND devices.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I76eb57becd6d01060d770e7f969bc693bf694bc0
2020-10-27 18:24:05 +08:00
Ding Wei
89ad830065 video: rockchip: mpp: add iommu pagefault handle for rkvenc
method: When iommu read/write pagefault is caused by insufficient buffer,
map a 4K buffer to keep the hardware running normally, so as to avoid
hardware timeout.

Change-Id: Ib55f92e5e63224f789c2e9dbeba51d413a600d3c
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-27 18:23:50 +08:00
Finley Xiao
d5d6b8da7b ARM: dts: rv1126: Add 25mV for CPU 1200MHz
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ibf6faf3ed890817af6ce58cb78f2d049e59d15d9
2020-10-27 16:44:05 +08:00
Ding Wei
ac51c391bc arm64: dts: rockchip: rk3568: Add video codec relative node
nodes: vdpu, jpeg_dec, vepu, rkvdec, rkvenc.

Change-Id: I4dce947d1bdee272618cc073ceebccb04d5f818a
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-27 14:52:43 +08:00
Yifeng Zhao
bcb5409b23 drivers: mtd: nand: rockchip: fix a error while make
make error info: "error: passing argument 1 of 'nand_scan' from
incompatible pointer type [-Werror=incompatible-pointer-types]".

Fixes: 4c9539a319 ("mtd: rawnand: Pass a nand_chip object to nand_scan()")
Change-Id: Ifb513a4f4466d64bfb88a220ba584220abedde8c
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
2020-10-27 14:51:20 +08:00
Zhenke Fan
5095455d72 ARM: dts: rockchip: add rv1126-rmsl-ddr3-v1 dts for RMSL212-1001 module
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I0e79edc365faf4475830fa08e8a2841ea6880984
2020-10-27 14:39:33 +08:00
Zhenke Fan
abbd2dbcf3 ARM: dts: rockchip: add rv1126 rmsl dtsi for RMSL212-1001 module
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I9c5219b260cd80df859445dbbdc5f0accbc4b39d
2020-10-27 14:38:32 +08:00
Zhenke Fan
bd0a9e391b ARM: dts: rv1126-pinctrl.dtsi add spi config for 1608
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I003c9e9cbaefbd26aa41186f9c2865b053de080e
2020-10-27 14:37:45 +08:00
Liang Chen
a4549fb26f arm64: dts: rockchip: rk3568: fix typo
Change-Id: I03f893eab1fe2fea450928e4ff00fdc6293c87c6
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-10-27 11:26:25 +08:00
Shawn Lin
c1c539112f arm64: dts: rockchip: rk3568 add emmc for evb
Change-Id: Ic5846f32d39ffbcddd5378508cee15012cd10589
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-27 10:58:19 +08:00
William Wu
def55da6eb phy: rockchip: inno-usb2: add usb2 phy support for rk3568
RK3568 has two USB 2.0 PHYs, and each PHY has two ports, the
OTG port of PHY0 support OTG mode with charging detection
function, they are similar to previous Rockchip SoCs.

However, there are three different designs for RK3568 USB 2.0 PHY.
1. RK3568 uses independent USB GRF module for each USB 2.0 PHY.
2. RK3568 accesses the registers of USB 2.0 PHY IP directly by APB.
3. The two ports of USB 2.0 PHY share one interrupt.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Id05718e25a20abdf9a4cb353b0fb94f0cb8b2d75
2020-10-27 10:33:10 +08:00
Allon Huang
1a83aabaf7 media: rockchip: cif: set reset timer monitor default mode as trigger
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I6d2a17cdc8e616e8de65bf556bc8bd15e7c843b1
2020-10-27 10:30:46 +08:00
Wu Liangqing
ec31568046 driver: input: screentouch: gslx680_pad support gsl3676
Change-Id: Ief57b851254f18132972e963df83cc9494368f52
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-10-27 10:29:59 +08:00
Wyon Bi
f3772f357c drm/rockchip/rk628: dsi: Fix volatile register offset
Change-Id: Icc6775a9ff4b4bf267866a242b7427f8b228a23c
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-26 19:33:18 +08:00
Wyon Bi
09554ef0e9 drm/rockchip/rk628: combtxphy: Mark regcache as dirty in power on reset
HW registers were reset to default values during power on reset.

Change-Id: I1c78d5f9eb78c80a9a9cfe8c8d106c125fa0cba0
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-26 19:33:18 +08:00
Cai YiWei
39d22eaf73 media: rockchip: ispp: monitor thread to alive during work
Change-Id: I2c49787ef06f29ae6f279091ac5cf5c82371687c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-26 18:59:29 +08:00
Cai YiWei
eff09450e6 media: rockchip: ispp: using common dummy buf to save memory
Change-Id: Ic2cf3e6cfcced849380e15e198943f7ee994bcdb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-26 18:59:29 +08:00
Cai YiWei
79ce611311 media: rockchip: ispp: enable sharp dma to ddr default
disable sharp dma to ddr, sharp will goto idle early,
and sharp may be abnormal, output image error. Enable
default to fix this bug.

Change-Id: I2882394e461b257a1734342cf08a8a3ddc465360
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-26 18:59:28 +08:00
Cai YiWei
919dba16dd media: rockchip: ispp: waiting all modules to idle to free buf
Change-Id: Ic1f9f6c3be95eaacdbdc996c10e95c750d71d9a7
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-26 18:59:28 +08:00
Yao Xiao
6923560ba3 net: rockchip_wlan: bcmdhd_indep_power: decrease KSO_CLR timeout
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: I40387ed81c4fcab3596dc0c13773494927fe8334
2020-10-26 18:59:28 +08:00
Wang Panzhenzhuan
61866c3050 dt-bindings: media: i2c: Document add sc2239
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I7c9249305564a928fbd25d1f65f6b923097b9258
2020-10-26 18:59:28 +08:00
Wang Panzhenzhuan
6005841c43 media: i2c: add sc2239 driver
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ibe430f5a7398857f742f5fbc40f2b5c71cf529f0
2020-10-26 18:59:28 +08:00
Allon Huang
f2f0465268 media: rockchip: cif: init reset timer triggered source once
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I33c49b34063ce150791864dc051c6e91f7016dc9
2020-10-26 16:49:36 +08:00
Allon Huang
1d3fc458c8 media: rockchip: cif: reset csi frm_sync_seq in advance
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ib0da700048e42d5e62fed4b1f971ae8ebdf3035c
2020-10-26 16:49:36 +08:00
Allon Huang
a2b5f8e265 media: rockchip: cif: fix panic when frm1/frm0 end interrupt occur simultaneously
panic when frm1/frm0 end triggered simultaneously and only one buf in queue

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I4fb43e3ed0ed728db21d2b7b7fc92c5d8aa04aaa
2020-10-26 16:49:36 +08:00
Steven Liu
72fde4588a pwm: sysfs: Add PWM oneshot mode support
Allow a user to write pwm oneshot_count value. If oneshot_count == 0,
the pwm works in continuous mode. If 0 < oneshot_count < 256, the
pwm works in oneshot mode.

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Icbcea85dc1d625a4ac24fee4ab07f1e2421bde77
2020-10-26 16:23:58 +08:00
Steven Liu
88f8bc8e0f pwm: rockchip: Support pwm oneshot mode for specified number of cycles.
The oneshot_count value should be less than PWM_ONESHOT_COUNT_MAX.
If oneshot_count == 0, this pwm channel works in continuous mode.

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I45857fb5762e0365cce5278502479c580638e40c
2020-10-26 16:18:31 +08:00
Zefa Chen
d95ec2719f media: i2c: imx347 add function
1.support quick stream on/off
2.support mirror/flip

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I195a247dc4ba9fcdc695a3aefd572aefe377487f
2020-10-26 16:04:57 +08:00
Zefa Chen
a73b62eb59 media: add hall-dc-motor driver for camera iris
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic4207089ca6eb61895c57e8ddecadb7b2e382e7b
2020-10-26 16:04:00 +08:00
Xing Zheng
ca91761eb8 ASoC: es8311: Reset and clear registers avoid to record failed sometimes
Change-Id: I95a7725b3144f63b57737944b3b5a608fd5ed1e2
Tested-by: Jkand Huang <jkand.huang@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2020-10-26 16:03:03 +08:00
Jon Lin
1f720b9605 arm64: dts: rockchip: Add SFC node for rk3568
Change-Id: I892096b3bf40168975f87293f70cd6137128a8b4
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-10-26 16:00:19 +08:00
Liang Chen
ffaf63155e arm64: dts: rockchip: rk3568: modify parameters for fiq-debugger
1. set baudrate 1.5M
2. set interrupts number 252

Change-Id: I5d18a5e81558210117f627db0df1704de63e173d
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-10-26 15:58:53 +08:00
Shunqing Chen
05b8bba67f drm/rockchip/rk628: Add scaler functions.
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: Ia08c718e0a0967f69922f5a6ca11aacddcb09e2b
2020-10-23 19:07:21 +08:00
Ding Wei
3074bbc054 video: rockchip: mpp: add driver for jpeg and rkvdec2 decoder
Change-Id: Icf6d4599c3f4b931aa1ae68f8227b241f48f3a1e
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-23 18:14:24 +08:00
Ding Wei
a915998595 dt-bindings: video: mpp: add new video codec for Document
new codecs:
    "rockchip,rkv-decoder-v2"
    "rockchip,rkv-jpeg-decoder-v1"

Change-Id: I5a8d682345da0fc6c57f58cf6e9521145ed9074c
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-23 18:14:23 +08:00
Yifeng Zhao
d95f0b78c9 arm64: dts: rockchip: add sata support for RK3568
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Icddec5869b42f301655d1d9fbd55a5d661f3866b
2020-10-23 18:04:51 +08:00
William Wu
a7d08921b1 phy: rockchip: inno-usb2: refactor irq init for otg and host ports
Add common helper function rockchip_usb2phy_port_irq_init() for
both otg port and host port to init their own irqs. It can help
to reduce redundant code, and also fix a issue that the id irq
isn't enabled for otg port if the vbus_always_on flag is true.

This patch introduces a combined irq for some inno usb2 phys
which combined the irqs of otg port and host port. We will used
it for RK3568 later.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ifa74ec72e2b9d4ed62ee69e916b8ab2e8ae665b3
2020-10-23 18:02:15 +08:00
Yiqing Zeng
51e5955309 media: i2c: imx335 fix hdr ae error
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I6d9f0b66d4743ab55c35fca29c663a0072e7a37c
2020-10-23 18:01:32 +08:00
Alex Zhao
d53fca08a0 net: rockchip_wlan: support rtl8723cs to "v5.12.2-7-g2de5ec386.20201013_beta"
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I78bc95db41bda1c79d4c8231a36dad1260b64d14
2020-10-23 15:10:40 +08:00
Yifeng Zhao
b0e0081b64 arm64: rockchip_defconfig: Enable CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I3ea6a3b31dfbcab1ed4b636e5f17f9d3ff15c7b1
2020-10-23 14:17:20 +08:00
Yifeng Zhao
5d14e18ace dt-bindings: phy: rockchip: Add binding for rk3568 combo phy
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I91c850ac1ac6c55744f9910fd0a1d9073ef63849
2020-10-23 14:17:20 +08:00
Yifeng Zhao
fbf06e6017 phy: rockchip: add naneng combo phy for RK3568
This patch implements a combo phy driver for Rockchip SoCs
with NaNeng IP block. This phy can be used as pcie-phy, usb3-phy,
sata-phy or sgmii-phy.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I86726e7eee643ea4cb3fadc56b0ee729903afc4f
2020-10-23 14:17:20 +08:00
Zhen Chen
6017dfa725 MALI: rockchip: upgrade bifrost DDK to r25p1-01bet0, from r21p0-01rel0
In addition, rename some configs that have been used in drivers/gpu/arm/midgard.

Change-Id: I4244ea3ac7f039f182d5e58f677d9c31417188bf
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-10-23 12:13:16 +08:00
David Wu
83297698a1 arm64: dts: rockchip: Add gmac node for rk3568-evb
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I112dfd391fb447fff2eaa22665e9a77182ccd3b4
2020-10-23 10:04:20 +08:00
David Wu
ee6ed2ca1b arm64: dts: rockchip: Add gmac0 and gmac1 nodes for rk3568
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ie61ae5da109a448bc820f30110e0551482e51d15
2020-10-23 10:03:30 +08:00
David Wu
90c3d40cb7 arm64: dts: rockchip: Fix the gmac pin definition for rk3568
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I8ada5b5d548632f45e4d8106c440b97afd1fc056
2020-10-23 09:59:27 +08:00
David Wu
4b8a410e90 net: ethernet: stmicro: stmmac: dwmac-rk: Add RK3568 support
Add constants and callback functions for the dwmac on RK3568 soc.
As can be seen, the base structure is the same, only registers
and the bits in them moved slightly.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I26e8dbc172c7c14df230f531251e2cd23d78a787
2020-10-23 09:56:25 +08:00