Commit Graph

859428 Commits

Author SHA1 Message Date
Jyri Sarha
9555cc32ff UPSTREAM: drm/bridge: sii902x: Set output mode to HDMI or DVI according to EDID
Set output mode to HDMI or DVI according to EDID HDMI signature.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c42838073b83185a5cf9949caab3c70ee093b791.1558964241.git.jsarha@ti.com
(cherry picked from commit bceee9bb89)
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I2d81387000a5a3785a6b9e91adf251077391a3e1
2020-11-02 14:26:17 +08:00
Fabrizio Castro
39c14ed602 UPSTREAM: drm/bridge/sii902x: Fix EDID readback
While adding SiI9022A support to the iwg23s board, it came
up that when the HDMI transmitter is in pass through mode the
device is not compliant with the I2C specification anymore,
as it requires a far bigger tbuf, due to a delay the HDMI
transmitter is adding when relaying the STOP condition on the
monitor i2c side of things.

When not providing an appropriate delay after the STOP condition
the i2c bus would get stuck. Also, any other traffic on the bus
while talking to the monitor may cause the transaction to fail
or even cause issues with the i2c bus as well.

I2c-gates seemed to reach consent as a possible way to address
these issues, and as such this patch is implementing a solution
based on that. Since others are clearly relying on the current
implementation of the driver, this patch won't require any DT
changes.

Since we don't want any interference during the DDC Bus
Request/Grant procedure and while talking to the monitor, we
have to use the adapter locking primitives rather than the
i2c-mux locking primitives.

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Peter Rosin <peda@axentia.se>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Yannick Fertré <yannick.fertre@st.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1541505156-8097-1-git-send-email-fabrizio.castro@bp.renesas.com
(cherry picked from commit 21d808405f)
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Idb1a4b5d3c12b47d89693790fb03486ba0021ab5
2020-11-02 14:26:17 +08:00
Lin Jianhua
37bcf2634e ARM: dts: rockchip: Add rv1109-evb-ddr3-v13-facial-gate
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Change-Id: I2fb322cc88950b0b538fbd97d13e1cf42267f57a
2020-11-02 10:20:01 +08:00
Tao Huang
f95633e02b arm64: dts: rockchip: Fix usb2phy clk for rk3568
Fixes: 3fefaf4ac8 ("arm64: dts: rockchip: Add usb2 phy nodes for RK3568 Soc")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib5603aa1c610e3aa9225c2733c48da8941baaf63
2020-11-02 10:10:30 +08:00
Tao Huang
041cc34247 Revert "ARM: configs: rv1126_defconfig: enable ROCKCHIP_BUS_DEVFREQ"
This reverts commit 60005ae6b0.
Which make cpu unstable now.

Change-Id: Ib22d3ca75709f810a22d8754aac40cfab120022b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-11-02 09:53:03 +08:00
Zefa Chen
97365bb2d2 media: i2c: sensor driver support quick stream on/off
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic22acdf7617458d3a27eeb040e14ed60e05e1c90
2020-10-30 19:16:53 +08:00
Mark Huang
351c77f873 ARM: configs: Add rv1126-uvc-spi-nand.config
make ARCH=arm rv1126_defconfig rv1126-uvc-spi-nand.config

Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: I0ff024ad52b1a94e44cdccb3716f44a91f01e4ef
2020-10-30 19:11:45 +08:00
Guochun Huang
38ba7fc4b1 drm/rockchip: dsi: add rk3568 support
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I46fde807047123a23efaa56d4c0e941b2ce80640
2020-10-30 19:05:52 +08:00
Andy Yan
647ef72a42 drm/rockchip: Add vop output interface id
Before vop 2.0, the display sub system only
support one RGB/LVDS/eDP/HDMI/MIPI connector
for one vop, so we can find which output interface
should be enabled by output_type(DPI/LVDS/HDMI).

But for the VOP 2.0 display subsystem, we may
have two connector (LVDS/eDP/HDMI/MIPI) of the
same output_type(HDMI0,HDMI1) enabled at same time,
so the output_type is not enough to give the interface
information, we need to know HDMI0 or HDMI1, eDP0 or eDP1
should be enabled.

So we add output interface id here, every connector
driver should set it correctlly to tell vop driver
to enable the corresponding output interface.

Change-Id: Ic22863f0f18f160b0df7d8f4c3b71b17ef987ea9
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-10-30 19:01:56 +08:00
Wyon Bi
07d5225f75 arm64: dts: rockchip: Add edp device node for rk3568
Change-Id: I1870e078c11813ad242b6bdf8838908cb333c713
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-30 18:56:24 +08:00
Wyon Bi
1c5f91260f arm64: dts: rockchip: Add edp phy device node for rk3568
Change-Id: I57495a25bed36750b1a90d605cd04ad2350a10c7
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-30 18:51:22 +08:00
Liang Chen
1bdf8f7722 ARM: dts: rockchip: rk312x: adjust opp-table for chips with low performance
Change-Id: I6be525c33f6dfd9fc3724c37e88d288e6d2e921a
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-10-30 18:49:58 +08:00
Wu Liangqing
3fb89274c9 net: rockchip_wlan: fix clang compile error
drivers/net/wireless/rockchip_wlan/*/core/rtw_debug.c:45:44:
error: expansion of date or time macro is not reproducible [-Werror,-Wdate-time]
            RTW_PRINT_SEL(sel, "build time: %s %s\n", __DATE__, __TIME__);

Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I506498ea3013ee3458dc1f8d2a88d9aac76c149e
2020-10-30 18:36:05 +08:00
Simon Xue
b1d5730217 iommu/rockchip: add irq mask cb
Change-Id: I5d2d565340395fb3573c7f25d764ed9f66333aeb
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-10-30 09:20:50 +08:00
shengfei Xu
4ed3b978b0 arm64: dts: rockchip: rk3568: bring up secondary CPUs
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ibace3899afc0381ad147e9ba7e0e342c112afb8e
2020-10-30 09:13:06 +08:00
Zefa Chen
984595c7be media: i2c: sc2310 fixed bug
1.fixed time limit error
2.fixed gain conversion function
3.fixed test pattern error
4.add quick stream on/off

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id2f0701f6bc1a2e99a37d0400692d6f45649930b
2020-10-30 09:10:34 +08:00
Jon Lin
008340a82d drivers: rkflash: Change to use the api which the oob area available
Fixes: 69f3c341d9 ("drivers: rkflash: Support spinand non aligned read")
Change-Id: I3146cd574ac77c2d1a0b5b6563440d86766a0a9a
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-10-29 19:28:55 +08:00
Zhenke Fan
57cb778635 media: i2c: preisp-dummy: add preisp-dummy driver
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Iaea69ab976713d7fb7eb3c63baa1bb73643bf360
2020-10-29 18:29:22 +08:00
Ding Wei
fca74dc112 video: rockchip: mpp: add query hw_id via client_type
if device in session has initialized, return hw_id directly.
otherwise, return hw_id via client_type which user set.
cat /proc/mpp_service/supports-device will show the hw_id.

Change-Id: Ie5e7c0227774ff5cacc8654f048c1447857e9e9d
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-29 11:10:46 +08:00
Ding Wei
fff0f25956 video: rockchip: mpp: rename for read only procfs node
using "-" instead of "_", which means the node is read only.

Change-Id: If66764daca51f96bdccd5324e251fc9bd956691d
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-29 11:10:42 +08:00
Cai YiWei
f0a4f6e6c8 media: rockchip: ispp: fix monitor thread exit
Change-Id: Ia94fca25013170b89902c787585c38ecb8d6059a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-29 08:56:05 +08:00
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