Commit Graph

615113 Commits

Author SHA1 Message Date
Wyon Bi
0ffced2e17 dt-bindings: display: rockchip: rgb: add rk3368 compatible string
Change-Id: I105319043f8d67943aa0d8ac70cadc5441065e2f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-03 10:35:54 +08:00
Wyon Bi
496b550894 phy/rockchip: inno-video-combo-phy: Only reverse sample clock direction in lvds mode
Change-Id: Ieff673dcf8d0459127d9ebe0f4c65818590b28ea
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-03 08:40:18 +08:00
Sean Young
06311511c2 UPSTREAM: kfifo: DECLARE_KIFO_PTR(fifo, u64) does not work on arm 32 bit
If you try to store u64 in a kfifo (or a struct with u64 members),
then the buf member of __STRUCT_KFIFO_PTR will cause 4 bytes
padding due to alignment (note that struct __kfifo is 20 bytes
on 32 bit).

That in turn causes the __is_kfifo_ptr() to fail, which is caught
by kfifo_alloc(), which now returns EINVAL.

So, ensure that __is_kfifo_ptr() compares to the right structure.

Change-Id: I7b5c8415a6bb8f54bbc8ec50fa98e1803cda3ce8
Signed-off-by: Sean Young <sean@mess.org>
Acked-by: Stefani Seibold <stefani@seibold.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
(cherry picked from commit 8a866fee39)
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2019-01-02 19:16:19 +08:00
Randy Li
7feaeeb9ff iommu/rockchip: assign driver iommu ops to domain
It would help the other driver to install the DMA ops for
itself.

Change-Id: I4c7283bbd8889650684630e169696133fdc6801a
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2019-01-02 18:53:02 +08:00
Liang Chen
fad451203d MALI: bifrost_for_linux: optimize opp-table for rockchip SoCs
Change-Id: I33e029a58880c3a54f36e9c5d7d94ce2394404b7
Signed-off-by: Liang Chen <cl@rock-chips.com>
2019-01-02 18:52:27 +08:00
Sandy Huang
be55b3581e arm64: rk1808_x4_linux_defconfig: enable vir camera and display
Change-Id: I6a9dd5e77bc873a021edf3146de55d1d2f80749b
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-01-02 17:28:08 +08:00
Sandy Huang
dd19dcb61a drm/rockchip: csi tx: add host reset and path mode config
1. get csi tx path mode from dts config.
2. for some unknown reason, we must reset csi tx host before enable,
   otherwise will appear the following error:

   [drm:rockchip_mipi_csi_irq_handler] *ERROR* Header fifo overflow raw
   [drm:rockchip_mipi_csi_irq_handler] *ERROR* Payload fifo overflow raw

Change-Id: I4dd49fc0ddecfcef4d88f24b7a22bef5c349b146
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-01-02 17:28:07 +08:00
Sandy Huang
00000ab556 arm64: dts: rockchip: add board dt file for rk1808 x4 evb second
the first rk1808 at x4 evb board use rk1808-evb-second.dts, the other
three rk1808 use rk1808-evb-second.dts

Change-Id: Ia766787eabf9d276204414137821aff3782e63fc
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-01-02 17:28:07 +08:00
Sandy Huang
41885786f6 arm64: dts: rockchip: rk1808-evb-x4: enable display module
Change-Id: Id30b1c72d664b9ea0c0d32c5f8a8fae67ba29d28
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-01-02 17:27:55 +08:00
Sandy Huang
86f1eb7210 drm/rockchip: vop: update default pdaf work mode
rk1808 cascade must set default pdaf work mode, after all
the chip csi rx and tx enale, the userspace will change to
normal mode.

Change-Id: I0ce18dc944bd55dbdb0812737affb11104e2f7a8
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-01-02 17:19:43 +08:00
Sandy Huang
4cd2da42a7 drm: set wait_for_completion_timeout for commit clean up
no need to wait 10000ms for time out. because even the 24fps
panel, the vsync time is 41ms.

Change-Id: I161836eca3f93d954028e06e4175db6c6d7ec734
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-01-02 17:19:27 +08:00
Huibin Hong
a997ba744c serial: 8250: add /dev/ttySx when uart is enable
before the patch:
ls /dev/ttyS
ttyS0 ttyS1 ttyS2 ttyS3 ttyS4 ttyS5  ttyS6 ttyS7

after the patch:
ls /dev/ttyS
ttyS3  ttyS4  ttyS6

Change-Id: I844523408751cb579bbfb50fafb7923d5c2cafdf
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-01-02 15:33:21 +08:00
Tao Huang
782ea01b34 arm64: rockchip_linux_defconfig: update by savedefconfig
Change-Id: I8c6e2b1c9f026b740188cab25dbd1557a085d3a4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-01-02 15:30:54 +08:00
Tao Huang
024d62f90f arm64: rockchip_linux_defconfig: enable ROCKCHIP_PVTM
Change-Id: I9075eb058bb5c2393758c94271879d85f3287cef
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-01-02 15:30:40 +08:00
Finley Xiao
e68f7ba094 arm64: dts: rockchip: Enable pvtm for rk3399 linux
Change-Id: Ic669992b98b12ec490fd0cfacb7264fb483a12d4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-01-02 14:35:46 +08:00
Finley Xiao
4dbb13551a soc: rockchip: opp_select: Fix return value when pvtm list is null
Change-Id: I8b767ddbe0f6156ceff746ead3ed86e3e1d55be4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-01-02 14:29:19 +08:00
Hu Kejun
26d92177fc media: rk-isp10: add timestamp to vb buffer
Change-Id: I4549465811737caf00332fb2ca32c4d36f072728
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-01-02 12:03:06 +08:00
Hu Kejun
de08c9ce95 media: rockchip: isp1: support query version by module parameter
Change-Id: Iadae8543cb2c6f617c47ec04ed59c3d252f65377
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-01-02 12:02:45 +08:00
Hu Kejun
2555c66ab1 media: rk-isp10: fix cproc en bit is affected by cifisp_cproc_config
Change-Id: I4714ac726f58fde1459da8c29196aeb4175abe34
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-01-02 12:02:45 +08:00
Hu Kejun
32a1aba091 media: rk-isp10: enable SYS_STATUS_ISP status
Change-Id: Ida81e6f029251a56baa32ee001bcb9c8bc9ca8f0
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-01-02 12:02:45 +08:00
Rimon Xu
8830cdabf0 driver: video: rockchip: set vepu clk in power on/off.
In order to achieve 1080P30 performance in the presence of MJPEG
decoding and H264 encoding, it is necessary to raise the clk_core
to 300M.

Change-Id: Ifc9861d02694ce55d1176d5d4ad41c40a1d4e034
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
2019-01-02 11:27:43 +08:00
Jon Lin
8f8c737d65 drivers: rkflash: add hash check to map block and vpc block
1.If the validation fails, the data is discarded and the data is
restored to avoid the abnormal data written when the power lost
leading to system crash.

Change-Id: I83590ed44d98b02c3fc2eee108a38b46275613c0
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-01-02 08:55:22 +08:00
Wyon Bi
f602af4105 arm64: dts: rockchip: rk3326-evb-lp3-v10-robot-linux: Update display nodes
Change-Id: I1a9bc4e855a78ba629e6078cc46f20264174d298
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-02 08:26:14 +08:00
Leo Wen
c017392add drm/rockchip: vop: use win1 for ui instead of win0 in px30 vopb.
PX30 vopb have win0, win1 and win2 layers.the formats they support below:
Win0:   XR24 AR24 XB24 AB24 RG24 BG24 RG16 BG16 NV12 NV16 NV24 NA12 NA16 NA24
Win1/2: XR24 AR24 XB24 AB24 RG24 BG24 RG16 BG16

Only the win0 layer support NV12 format(video decode format).
So change to use win0 for video overlay layer and win1 for ui layer.

Change-Id: I7ef8bda4be908188700ca4d3f1df23a6336e02b2
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-12-29 18:08:01 +08:00
Leo Wen
0a796ae7be arm64: dts: rockchip: Add rk3326-linux evb v10 board for robot
This patch tried to define the rootfs type as the squashfs for robot linux sdk

Change-Id: I5357dfe46ec3a8c3feb7b8acfdacb29d935f80e8
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-12-29 18:07:34 +08:00
Wyon Bi
a946acfeed arm64: dts: rockchip: px30-android: enable video phy
Change-Id: I8b5c97cbb713e6d986cf03c5a6b1026077fa498b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:16 +08:00
Wyon Bi
5f178ae434 arm64: dts: rockchip: rk3326-linux: enable video phy
Change-Id: I3a4bf4cad9b0c686577878ad4cc99203b01859a0
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:15 +08:00
Wyon Bi
4fadd4c39c arm64: dts: rockchip: px30: Add support for video phy
Change-Id: Icfc90340972646a58b0ff6137a63d474d1171191
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:15 +08:00
Wyon Bi
1521458687 arm64: dts: rockchip: Update and clean up display nodes for px30/rk3326 boards
Change-Id: I4f51bb63ec0f6027a1019f49f0ac1a197ecf7e9e
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:15 +08:00
Wyon Bi
f792a2f718 dt-bindings: phy: inno-mipi-dphy: update DT binding to remove support for px30
Change-Id: I308f90656bfa89e99e19452bce687aaec0e824c2
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:14 +08:00
Wyon Bi
4f931787ca phy/rockchip: mipi_dphy: Remove support for px30
Change-Id: I17e3ade7131f999e3146dca5e3bba1c39261ab4d
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:14 +08:00
Wyon Bi
b8275ad5b9 drm/rockchip: lvds: Remove px30 phy code
Change-Id: Ie664883f25badd055b5e3020785793cfe97f4c76
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:13 +08:00
Wyon Bi
924d3ee192 dt-bindings: display: rockchip: lvds: add support for generic phy
This patch adds support for generic phy as an optional.

Change-Id: Idcb30be4a88a688be839b45a96d3b78258d63a7d
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:13 +08:00
Wyon Bi
fbc1bb1ae6 drm/rockchip: lvds: support generic phy interface
Change-Id: I4ba196ea83c9396c43201ba9b2fe223b5e76cdeb
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:13 +08:00
Wyon Bi
504459b7d8 dt-bindings: display: rockchip: rgb: add support for generic phy
This patch adds support for generic phy as an optional.

Change-Id: I3274d8f50fb5f06912d1f46cfb70252722b72223
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:12 +08:00
Wyon Bi
1b0421bebf drm/rockchip: rgb: support generic phy interface
Change-Id: Ia74a29ee0ac0c7322cc38faddff845d8c5cedfb3
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:12 +08:00
Wyon Bi
af76341c31 drm/rockchip: dsi: set phy mode before enable phy
Change-Id: I87507e508ca4afb467ab4ee1fa8050103a93606b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:12 +08:00
Wyon Bi
3640a8f066 arm64: rockchip_defconfig: enable CONFIG_PHY_ROCKCHIP_INNO_VIDEO_COMBO_PHY
Change-Id: I331690a4075680499fe90b1b16042925e93b75ed
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:12 +08:00
Wyon Bi
8c63ba97d0 phy/rockchip: Add support for INNOSILICON MIPI/LVDS/TTL Video Combo PHY
The Innosilicon Video Combo PHY not only supports MIPI DSI,
but also LVDS and TTL functions with small die size and low
pin count. Customers can choose according to their own applications.

Change-Id: I0e4a5f69af5cc967b5df0fb17a51c43cef9ea33f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:11 +08:00
Wyon Bi
4eab18d619 dt-bindings: phy: Document INNOSILICON MIPI/LVDS/TTL Video Combo PHY bindings
Change-Id: Ib9a2f3a4a5fe82b47ad3d85be1b553ad56b13641
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:11 +08:00
Wyon Bi
13f2196227 phy: add MIPI/LVDS/TTL modes to the phy_mode enum
This patch adds more generic PHY modes to the phy_mode enum, to
allow configuring generic PHYs to the MIPI/LVDS/TTL mode by
using the set_mode callback.

Change-Id: Ib6966828011aa52f1f133449f69df46c2001a57b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-29 16:41:11 +08:00
XiaoDong Huang
7be8a2eb28 arm64: dts: rockchip: rk3368: change default sleep mode to RKPM_SLP_ARMOFF
The power consumption is no visible difference between RKPM_SLP_ARMOFF_LOGPD
mode and RKPM_SLP_ARMOFF mode. But RKPM_SLP_ARMOFF_LOGPD mode will cost
more time in suspend/resume flow. So we'd better use RKPM_SLP_ARMOFF in
most products. Here, we change RKPM_SLP_ARMOFF_LOGPD to RKPM_SLP_ARMOFF
in dtsi, that's a good way to make most products to use RKPM_SLP_ARMOFF.

Change-Id: Iec541a6831022ded2dad4298fc470bec7bd978f6
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-12-29 14:17:59 +08:00
Weixin Zhou
a731f1a3c4 arm64: dts: rockchip: correct gmac phy_reset pin for 3399pro v10/v11 evb
Change-Id: Ibf63f5d5236ed3a196342f58370e4112fe5c0117
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-12-29 14:14:47 +08:00
Tony
085cd974b7 arm64: dts: rockchip: Fix typo and remove deprecated property for rk3328
clock-freq-min-max is deprecated, replacing with max-frequency.
changing "ciu-drv" to "ciu-drive", appears to be a typo.

Change-Id: I40218e6ea800aa983f22007e23e04e6364635dbe
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-12-29 14:12:33 +08:00
Elaine Zhang
35ae31482a thermal: rockchip: add pinctrl control
Based on the TSADC Tshut mode to select pinctrl,
instead of setting pinctrl based on architecture
(Not depends on pinctrl setting by "init" or "default").
And it requires setting the tshut polarity before select pinctrl.

Change-Id: Iac9ca05073b0181ee13b0048d0c2a54204f82bca
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-29 10:18:46 +08:00
Leo Wen
75b880e190 arm64: rk3326_linux_defconfig: add pvtm support
Change-Id: I5ff420df671342d3ef01323a0377c5f57aed106a
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-12-29 09:29:31 +08:00
Shunqing Chen
e06f7bb5fb drm/bridge: synopsys: dw-hdmi: set hdcp keepout active
Change-Id: Ie5718479bb267238c5461f3ed203ae43d75c46de
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-12-29 09:28:01 +08:00
Weixin Zhou
f13970e138 arm64: dts: rockchip: set sdmmc power off in suspend for rk3399pro evb
The vccio_sd keepon in suspend will causes 10ma power consumption to
increase if there is no serial cable connection.

Set vccio_sd and vcc_sd power off in suspend for rk3399pro evb v10/v11.

Change-Id: I935de4028bea5d03a0397b81bd63c99757155b4d
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-12-28 20:20:25 +08:00
Leo Wen
fb93d19476 ASoC: rockchip: rk817-codec: Add support S32_LE
Change-Id: I850fb7a2745320ff4e325905cdf2cab625419977
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-12-28 20:20:25 +08:00
Kever Yang
c1cf9c6b8d rockchip: sip: add static inline for sip_smc_lastlog_request()
Add static inline for sip_smc_lastlog_request() when
CONFIG_ROCKCHIP_SIP is not enabled.

Change-Id: I8fe46c36b115b4aa8a71a4101a7829e64aa08103
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-12-28 20:20:25 +08:00