Commit Graph

615095 Commits

Author SHA1 Message Date
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
shengfei Xu
ef95127303 power: rk817-battery: support rk809
A “battery fuel gauge” is integrated in the RK809. Using
the proprietary algorithms and the sensed battery current
and voltage, the gauge can accurately calculate the battery
capacity based on the charging/discharging characteristics
of the battery preloaded in the system. The gauge then sends
the battery capacity information to the processor through
the I2C interface.

Change-Id: I0be1f9ef48285c17d599753d65161e79b0a4c95a
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2018-12-28 17:08:47 +08:00
Algea Cao
249a6b8d19 drm/bridge: synopsys: dw-hdmi: Remove hpd_state judgment of atomic_begin and atomic_flush
There is no need to judge hpd status in atomic_begin and atomic_flush.
And this judgment may cause display error if TV make hpd status change
frequently.

Change-Id: I2ed87ef42b78a8faadc4bcc5b6b16d9390644903
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-12-28 15:15:31 +08:00
Lin Jianhua
04ad899534 arm64: dts: rockchip: rk3308: modify default pinctrl of tsadc from tsadc_otp_out to tsadc_otp_gpio
Some HW connect to peripheral reset circuit,
but uboot first select set pinctrl mode to default,
it result system reboot.

Change-Id: I79453dd4839e846138130e6488aca9c0f419fb38
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
2018-12-27 12:07:09 +08:00
Ziyuan Xu
6df92b2b23 iio: adc: support GPIO-controlled Multiplexers ADC
The rockchip saradc controller is too scanty for some products that is
requires at least x10 channels ADC. Generally, we can use a CMOS analog
switch to extend a multi-channel ADC, eg.sgm3699. It's a quad,
bidirectional, single-pole/double-throw (SPDT) CMOS analog siwtch.

This patch implements a multiplexer ADC controller using a number of
gpio pins and parent ADC channel. It's compatible with most of CMOS
analog switch. And it provides a direct mode to get a raw data of each
muxadc channel.

/sys/bus/iio/devices/iio:device1/
|-- in_voltage_adc_brush_raw
|-- in_voltage_adc_mid_brush_raw
|-- in_voltage_adc_move_l_raw
|-- in_voltage_adc_move_r_raw
|-- in_voltage_qyxs_raw
|-- in_voltage_qzxs_raw
|-- in_voltage_yxs_raw
|-- in_voltage_zxs_raw

Change-Id: If71636d45543430e616299e6a6b91084f4f315e6
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2018-12-27 12:03:53 +08:00
Finley Xiao
94cb450ab0 arm64: dts: rockchip: Add cpu opp table for rk3399k
Change-Id: Ie26d7ed67ca5f64b35d473421bed18ac7508d403
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-12-27 09:46:01 +08:00
Finley Xiao
b401d94803 arm64: dts: rockchip: rk3399: Add specification serial number for cpu
Change-Id: Ie48b09944ae3b294e3c7666bd9aa68706bdd4ba5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-12-27 09:46:01 +08:00
Finley Xiao
cd0ae453a5 cpufreq: rockchip: Implement get_soc_info() for rk3399 SoCs
Change-Id: I73519f717e79a1cc4e713e31ba8ee6c78567353f
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-12-27 09:46:01 +08:00
Shunqing Chen
f3d13938d8 drm/rockchip: rk618: set HDMI valid modes
Change-Id: I120f08cb3bb7340d1cdde6f50a275eed34e54f4a
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-12-27 09:17:29 +08:00
Cai YiWei
40ce742d63 media: rockchip: isp1: fix isp don't work if default sensor fmt greater than isp max size
Change-Id: I3c757c71ea2ea05b3b0330aa7f8e6eea8295be3a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-12-27 09:16:30 +08:00
Cai YiWei
3826d6b7e7 media: rockchip: isp1: isp V12 use csi2host
Change-Id: I55e83eb0b5674a968bef99227eacf1c388085844
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-12-27 09:16:30 +08:00
Cai YiWei
cf8f0f9b61 media: rockchip: isp1: update sensor info during streaming
Change-Id: I4813be92f62f258ff97facb9f7658c23fb1f4138
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-12-27 09:16:30 +08:00
Shunqing Chen
a6e9b4bc3f drm/rockchip: rk618: HDMI: add switch dev for audio
Change-Id: If54f7f989bda0130963f307f3781db393225a1be
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-12-27 09:15:47 +08:00
Wyon Bi
d919ba5349 drm/rockchip/rk618: scaler: Fix invalid dsp_frame_hst in calc_dsp_frm_hst_vst()
Change-Id: I58f3193ec910cb8954f7890eac8b5594a2a4ae39
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-12-27 09:08:45 +08:00
zack.zeng
f71d1437a7 media: i2c: add mono sensor sc031gs
Change-Id: I690ba934964fea8c1052ffdf10438016094baac6
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
2018-12-26 19:44:04 +08:00
Shunqian Zheng
f091b1ce05 arm64: dts: rockchip: remove regulator-always-on for px30 linux evb
DVP powers are controlled by sensor itself, removing always-on
propertity.

Meanwhile, the vcc_sd is boot-on according to schematic.

Change-Id: I5dbd1eb7a90c589434198d152cc2b9883c8acd24
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-12-26 18:39:41 +08:00
Shunqian Zheng
4144cce74b arm64: dts: rockchip: remove regulator-always-on for rk3326 linux evb
DVP powers are controlled by sensor itself, removing always-on
propertity.

Meanwhile, the vcc_sd is boot-on according to schematic.

Change-Id: I74809672b9ec7ae250243e47e7e700236d5b0839
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-12-26 18:39:23 +08:00
Chen Lei
6aacd99ecf clk: rockchip: rk322x: fix wrong mmc phase shift for rk3228
mmc sample shift should be 1 for rk3228, or it will fail
if we enable mmc tuning for rk3228.

Change-Id: I301c2a7d33de8d519d7c288aef03a82531016373
Signed-off-by: Chen Lei <lei.chen@rock-chips.com>
2018-12-26 18:38:02 +08:00
Wenlong Zhuang
a1ed5f4f10 arm64: dts: rockchip: rk1808-evb-x4: enable virtual camera, cif and mipi-dphy-rx
Init resolution 3840x720 and bus format MEDIA_BUS_FMT_SBGGR8_1X8
for virtual camera.

Change-Id: Id45f7deb3896ca230cfd3fc44238c0d62d79416a
Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
2018-12-26 18:35:22 +08:00