Commit Graph

859373 Commits

Author SHA1 Message Date
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
Herman Chen
9c01dab556 video: rockchip: mpp: Handle double quote in log
When there is double quote in last git log mpp Makefile will report
error. Add more subst to handle the double quote.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Ifa34a89cf917a5837987e5bbf61def9ed37a2f4f
2020-10-23 09:07:51 +08:00
Finley Xiao
30c2580e53 nvmem: rockchip-efuse: Add mutex lock for rk1808 efuse read
The rk1808 efuse read has some issues when several threads start to read
efuse through nvmem file node.

Thread1                                    thread2
1. timing_init
2.  write auto_ctrl
3.    delay                                  timing_init
4.      read status                            write auto_ctrl
5.        if error goto to timing_deinit         delay

The thread1 will read no finish bit and then goto error, the user will
see a "Input/Output Error".

The thread1 do timing deinit will cause thread2 halt on read status, and
the user will never success to do read efuse again.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I3f462afd844686aac153acc0c33215fbd96827a3
2020-10-23 09:05:51 +08:00
Shawn Lin
d8734f4980 arm64: rockchip_defconfig: Enable CONFIG_MMC_SDHCI_OF_DWCMSHC
DesignWare based SDHCI controller will be used for eMMC on some
Rockchip platforms such as RK3568.

Change-Id: I4a1c83f8a04c888d1279b1f5ef3aff34d602ea0f
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-22 17:48:14 +08:00
Shawn Lin
22b0348057 arm64: rockchip_defconfig: Enable CONFIG_PHY_ROCKCHIP_SNPS_PCIE3
Change-Id: I0ac0959c9a4c8b2bef29305a11863c8baedce572
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-22 17:45:41 +08:00
Shawn Lin
bb41896896 PCI: rockchip: dw: extention for newer 3.0 IP
Change-Id: I99363d4b90fd1a9412601ecb41aa1333c1fbd5a1
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-22 16:43:04 +08:00
Finley Xiao
e0a50431c6 soc: rockchip: opp_select: Convert opp rate unit to MHz
Fixes: a7bddb708d ("soc: rockchip: add CONFIG_ROCKCHIP_OPP for rockchip_opp_select.c")

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ib70b8b8d7a03471fef53fca995fc9b2414ddce91
2020-10-22 16:41:03 +08:00
Finley Xiao
35b5fa9412 ARM: dts: rockchip: rv1126-evb-v12: Add board irdrop config for venc
The output voltage is 25mV higher than the opp voltage on v10 board,
and they are almost the same on v12 board, so add 25mV for 500MHz and 600MHz.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Idaa48447804ca156cea1e1f77bd23b669e2c489b
2020-10-22 16:40:34 +08:00
Finley Xiao
db19ed05a8 ARM: dts: rv1126: Add 'rockchip,evb-irdrop' for rkvenc opp table
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ifa977c183bbbef6a133f5da92692f78ef7c79521
2020-10-22 16:40:34 +08:00
Shawn Lin
4bc789c2cc arm64: dts: rockchip: add PCIe support for RK3568
Change-Id: If1fc4901941dc6822354d9c9a80f1fbb95cf8319
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-22 16:36:15 +08:00
William Wu
3fefaf4ac8 arm64: dts: rockchip: Add usb2 phy nodes for RK3568 Soc
Change-Id: I20f7520d02972c853f4de2c526072e94d8343ec9
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-10-22 16:33:49 +08:00
William Wu
9d2daf8ca1 dt-bindings: phy: rockchip: Add binding for rk3568 usb2 phy
Change-Id: Id4ba6f05ba830a7fd3065532ab5ffdb4828676f7
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-10-22 16:33:49 +08:00
Allon Huang
ce85b21fc3 ARM: dts: rv1126: rkcif node quotes GRF
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I0e9e1fa58f0e7558d7516056b1822d0638960720
2020-10-22 15:56:17 +08:00
Allon Huang
b0342bc168 media: rockchip: cif: support bt1120 single path
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I325e477157f53e656fc184784b56534ee4ecbf64
2020-10-22 15:56:17 +08:00
Ren Jianing
00feea4350 phy: phy-rockchip-naneng-usb2: fix NULL pointer risk
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: Ib3713c15b7623bba57f0dd55d0096785b6b3f8bd
2020-10-22 15:48:05 +08:00
Shawn Lin
85abcd6ea6 phy: phy-rockchip-snps-pcie3: Initial support
This patch adds initial support for snps pcie 3.0
phy.

Change-Id: I23d0750a60ffde30f434e1c676916d4bc4772400
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-22 14:54:14 +08:00
Shawn Lin
74e2fe20d2 phy: add PHY_MODE_PCIE_BIFURCATION support
Bifurcation mode is tunable lanes which could be devided
into different individual combination.

Change-Id: Ie6a10694d3c4fd5da1a5673d58424de797f3622b
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-22 14:54:14 +08:00
Yifeng Zhao
a829648072 arm64: dts: rockchip: add naneng combo phy nodes for RK3568
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I85cbf3f7f104e0b0c37a57517dcbb0fc22500623
2020-10-22 14:36:29 +08:00
John Keeping
2989301f4e UPSTREAM: usb: gadget: f_uac2: fix packet size calculation
The packet size for USB audio must always be a multiple of the frame
size, otherwise we are transmitting a partial frame which omits some
channels (and these end up at the wrong offset in the next packet).
Furthermore, it breaks the residue handling such that we end up trying
to send a packet exceeding the maximum packet size for the endpoint.

Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Signed-off-by: John Keeping <john@metanate.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I8181ce167a4c80a0e80bb51003f3e4ec8fa4b92d
(cherry picked from commit 6b02af3465)
2020-10-22 11:53:47 +08:00
Sandy Huang
44a4467552 drm/rockchip: remove DSI special assign
these flags will be used by other output interface, so remove
DSI special assign.

Change-Id: I6ede559deee14a0336e4037c709e5a36d4686c4a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-10-22 11:22:50 +08:00
Sandy Huang
8dbaff8f54 drm: of: add support dual lvds left and right mode
the lvds two channel can work independent, each lvds channel can
connector a singel channel lvds panel, so add left and right pixels mode
support.

Change-Id: I6136d31883693dc20935a47b2c4eb5b10135c312
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-10-22 11:22:50 +08:00
Jianqun Xu
262e7d8237 power: rockchip-io-domain: support rk3568
Change-Id: I097898c8f19dbd5f7caa1798bebd2506876cffc3
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-10-22 10:43:34 +08:00
Wang Panzhenzhuan
f5767ec5fa media: i2c: gc5035 fix vb & gain set issues
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I7cf1e61c574a4d31ee06da9d8eea7b6dbd32ae50
2020-10-22 10:23:00 +08:00
Hu Kejun
b252096154 media: rockchip: isp and ispp version to v0.1.9
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I82e2344df54448c2747c71c5daae8918c2147c54
2020-10-21 18:32:56 +08:00
Hu Kejun
af010aa87d media: rockchip: isp: skip frame when change hdr/normal mode
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I103653f36bbfcc310e9648715baf870db967c9c3
2020-10-21 18:32:56 +08:00
Hu Kejun
54e1a2cf73 media: rockchip: ispp: use fec share buffer to reduce buffer size
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ie59ce6dbedbbc1a60d5eb3e8a4216b2f4869140d
2020-10-21 18:32:56 +08:00
Hu Kejun
7dfb03af68 media: rockchip: isp: use ldch share buffer to reduce buffer size
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I243023a4d689f9f9a878095d8edaf8576bb26102
2020-10-21 18:32:56 +08:00
Ding Wei
3aa6c0bc71 video: rockchip: mpp: add command support info
show support cmd:
    cat /proc/mpp_service/support_cmd

Change-Id: I5ba150fcf2da797e32c8f5b38c8ff27886182460
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-21 18:25:01 +08:00
William Wu
e66cf88ee2 arm64: dts: rockchip: Add usb controllers nodes for RK3568 Soc
Change-Id: I003e434c95bb5a8f9d355cfb5637735a26dd9d65
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-10-21 18:11:27 +08:00
Liang Chen
a56d9f6eb9 arm64: dts: rockchip: rk3568: correct gic address
There is no GICC/GICH/GICV memory-mapped address for RK3568 SoC.

Change-Id: Ie128cc2e5994b703d1fba9df44216331ed3c6c54
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-10-21 18:11:02 +08:00
Biju Das
4505520aed UPSTREAM: drm: of: Fix double-free bug
Fix double-free bug in the error path.

Fixes: 6529007522 ("drm: of: Add drm_of_lvds_get_dual_link_pixel_order")
Reported-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: stable@vger.kernel.org
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1595502654-40595-1-git-send-email-biju.das.jz@bp.renesas.com
(cherry picked from commit 4ee48cc558)
Change-Id: I9dcf69801d75592bc6e721b40734cb766a29366c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-10-21 18:07:06 +08:00
Laurent Pinchart
24713d8860 UPSTREAM: drm: of: Fix linking when CONFIG_OF is not set
The new helper drm_of_lvds_get_dual_link_pixel_order() introduced in
commit 6529007522 has a fallback stub when CONFIG_OF is not set, but
the stub is declared in drm_of.h without a static inline. This causes
multiple definitions of the function to be linked when the CONFIG_OF
option isn't set. Fix it by making the stub static inline.

Fixes: 6529007522 ("drm: of: Add drm_of_lvds_get_dual_link_pixel_order")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191219103703.8547-1-laurent.pinchart+renesas@ideasonboard.com
(cherry picked from commit 528d06d41b)
Change-Id: I9dcf69801d75592bc6e721b40734cb766a29366b
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-10-21 18:07:06 +08:00
Fabrizio Castro
277fdbc035 UPSTREAM: drm: of: Add drm_of_lvds_get_dual_link_pixel_order
An LVDS dual-link connection is made of two links, with even
pixels transitting on one link, and odd pixels on the other
link. The device tree can be used to fully describe dual-link
LVDS connections between encoders and bridges/panels.
The sink of an LVDS dual-link connection is made of two ports,
the corresponding OF graph port nodes can be marked
with either dual-lvds-even-pixels or dual-lvds-odd-pixels,
and that fully describes an LVDS dual-link connection,
including pixel order.

drm_of_lvds_get_dual_link_pixel_order is a new helper
added by this patch, given the source port nodes it
returns DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS if the source
port nodes belong to an LVDS dual-link connection, with even
pixels expected to be generated from the first port, and odd
pixels expected to be generated from the second port.
If the new helper returns DRM_LVDS_DUAL_LINK_ODD_EVEN_PIXELS,
odd pixels are expected to be generated from the first port,
and even pixels from the other port.

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
(cherry picked from commit 6529007522)
Change-Id: I9dcf69801d75592bc6e721b40734cb766a29366a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-10-21 18:07:06 +08:00
Allon Huang
8d23446aea media: rockchip: cif: stop reset watchdog timer when stop multi streams in non-hdr
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I2c96d039c2248e39df5cf05b4d713386c858141c
2020-10-21 17:10:29 +08:00
Shunqian Zheng
4296e1fe9e media: i2c: jx_f37: fix copy-paste typo
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Change-Id: Ieb3f45b26121654d594fd8c6de23cfc39e294ab6
2020-10-21 14:06:12 +08:00