Commit Graph

615239 Commits

Author SHA1 Message Date
Shunqing Chen
268d47af69 drm/rockchip: rk618: if hpd status is disconnected, not to read edid
If dual display, software assumes the hpd status is always connected,
so if hpd status on hardware is disconnected, not to read edid.

Change-Id: I43b08b8f7a605089eac4cae6622a8830e2dd17c2
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2019-01-18 18:32:24 +08:00
Wenlong Zhuang
2078e9f763 media/cif: add csi host error interrupt handler for RK1808
Change-Id: I934cf09325fcb916c4a0fcffcf01ef869602d48f
Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
2019-01-18 16:06:03 +08:00
Wenlong Zhuang
3dc4f31060 arm64: dts: rockchip: rk1808 add csi host interrupt
Change-Id: Ic56e5052e244ffaa27456be6b8c5564fdbdb945b
Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
2019-01-18 16:05:30 +08:00
Wenlong Zhuang
d664b37548 media/i2c: virtual-camera: add a critical link frequency
Change-Id: I8c1faef80b0bb74a8711645bb697dcf4b87a4691
Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
2019-01-18 16:05:04 +08:00
Weixin Zhou
df807bb866 arm64: dts: rockchip: px30: add wide temperature config
Change-Id: I99af054eb795ac396f024595c83783669bef101d
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-01-18 15:37:11 +08:00
Wyon Bi
8e891e4751 drm/rockchip/rk618: dsi: Fix incorrect display mode in clone mode
Change-Id: Iaf89f600aa20c09710f3f8c634aeb5c4b34c236b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-18 15:35:52 +08:00
XiaoDong Huang
41b139417f arm64: dts: rockchip: rk1808: config RKPM_SLP_PMIC_LP
Change-Id: I8797d4259d948cb684ac346ea8c9dd8b94fe7a70
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2019-01-18 15:33:45 +08:00
Cai YiWei
48f87cc06c arm64: dts: rockchip: rk3368: add rkisp1 and mipi_dphy node
Change-Id: I2f355d4763a912787600814e5f7df1eb5f38d7b9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-01-18 15:32:03 +08:00
Cai YiWei
7ab3ea22e0 media: rockchip: isp1: Support for RK3368
Change-Id: Ia28e7981a5644a1d8e909a8efc5960645e2fb75a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-01-18 15:32:03 +08:00
Cai YiWei
ea5e2659fe dt-bindings: media: add rkisp1 for rk3368
Change-Id: I13e3baa69921c9db6e88e987aff84cbbbdc9974f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-01-18 15:32:03 +08:00
Cai YiWei
22e77c9842 phy: rockchip: mipi-dphy-rx: support for rk3368
Change-Id: I51cc5c4015bb3567bb19c08f0fb4ea422b13e937
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-01-18 15:32:03 +08:00
Cai YiWei
85702184a4 dt-bindings: media: add mipi rx dphy for rk3368
Change-Id: I39d531ef96e5abffa6071e4fd40b94d00a7cafc5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-01-18 15:32:03 +08:00
Simon Xue
af717260c4 PCI: rockchip: disable RIE in DMA Write Channel Control 1 Register
After comparing the test results with RIE enabled and disabled,enable
RIE may cause PCIe dma interrupt work unnormal.

More works need to dig it out

Change-Id: Ia25022332de92cf21287df155cd514a160d140bc
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2019-01-16 16:56:31 +08:00
Huibin Hong
1963f0ca19 serial: 8250_dw: new baud rate and clk solution
baud rate <=1500000, except 1152000, use 24MHz
baud rate > 1500000, and 1152000 use pll

Change-Id: I9f52fcafdf8cc3d32be78f8408ab75873ffff680
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-01-16 16:25:42 +08:00
Huibin Hong
6d93f4b6f8 serial: 8250_dw: uart wake up
Add wakeup-source to uart dts node to enable uart
wake up system when it receives data.

Change-Id: If4e82a4d3dbaca708209553dc3693089864c782f
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-01-16 15:04:30 +08:00
Finley Xiao
4276a57f58 arm64: dts: rockchip: rk3399-evb-rev3-android-lp4: Change 1080P to 400MHz
Change-Id: I1396e6fd4eb1f89292379b659c1c4f1d18f138a8
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-01-15 21:11:04 +08:00
Xing Zheng
5b3a80e61e ASoC: rk3308_codec: fix some skip grps errors
If we use the channels which are less than en_always_grps_num,
we don't need to set the flag to skip_grps which are not used.
And, the skip grps need to refer to mapped_grps

For example, if:
  rockchip,en-always-grps = <1 2 3>;
  rockchip,adc-grps-route = <2 1 3 0>;

The DUT startup and capture 2ch at first, we just open grp2
and set skip_grp[2]=1.
Then, if we capture 4ch, we just skip grp2, open grp1, and
set skip_grp[1]=1.
To capture 6ch: we skip grp2/grp1, open grp3 and set skip_grp[3]=1.
To capture 8ch: we skip grp2/grp1/grp3 and open grp0.

Change-Id: I88c0b220ce0e714abafda1be3c895ad1c5c9ddca
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-01-15 18:32:06 +08:00
Chen Jinsen
2cca713bde ARM: dts: rk3288: update rk3288-evb-android-rk808-edp and rk3288-th804 boards
- Separate android firmware node to dts files
- Add rk3288-evb-android-rk808-edp-avb.dts and rk3288-th804-avb.dts Android P

Change-Id: I9436ff0bd60fd15d2e669f08e1585cda27973414
Signed-off-by: Chen Jinsen <kevin.chen@rock-chips.com>
2019-01-15 14:08:23 +08:00
William Wu
ae184efcee usb: uas: ignore UAS for Seagate Expansion Portable Drive
The Seagate Expansion Portable Drive HDD (idVendor=0bc2, idProduct=2321)
is reported to fail to work on rockchip platforms with the following error
message when do read/write operation by dd command:

xhci-hcd xhci-hcd.11.auto: Ring expansion failed

According to tkaiser's suggestion[1], we can try to increase the kernel's
coherent-pool memory size to fix this issue. The kernel coherent-pool memory
size was limited at 256KB by default. When set the DEFAULT_DMA_COHERENT_POOL_SIZE
to 1MB, the error "Ring expansion failed" can be fixed, but it still not
work with the other error message:

xhci-hcd xhci-hcd.12.auto: ERROR Unknown event condition 34 for slot 1 ep 3 , HC probably busted
sd 0:0:0:0: [sda] tag#16 uas_eh_abort_handler 0 uas-tag 17 inflight: CMD OUT
...
scsi host0: uas_eh_bus_reset_handler start
xhci-hcd xhci-hcd.12.auto: ERROR Transfer event for disabled endpoint slot 1 ep 6 or incorrect stream ring

Falling back to USB mass storage can solve this problem, so ignore UAS
function of this HDD.

[1] https://forum.armbian.com/topic/4811-uas-mainline-kernel-coherent-pool-memory-size/

Change-Id: I0d817cc3aaea548c2060b323c3077c6cbbd3bb6e
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-01-14 16:28:14 +08:00
Nickey Yang
5fb9572e8c arm64: defconfig: enable inno comobo phy for rk3326 linux
Change-Id: I54a7a8ffc3869deadf41143d01540392ff5fb179
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2019-01-14 10:26:04 +08:00
Nickey Yang
e8b4cd6b4c arm64: defconfig: enable inno comobo phy for px30 linux
Change-Id: I90d349e2b5f94a5d00b7c48af4b2a542ad9a4850
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2019-01-14 10:26:04 +08:00
Liang Chen
ae16222939 arm64: dts: rockchip: add efuse node and info for RK1808 SoCs
Change-Id: I5ab0c408e7db0cb12c002c3e52fd3ac57bcb5c21
Signed-off-by: Liang Chen <cl@rock-chips.com>
2019-01-11 14:58:57 +08:00
Liang Chen
e7daa24b40 nvmem: rockchip-efuse: add support for rk1808-efuse
This adds the necessary data for handling efuse on the rk1808.

Change-Id: I78b66db1fdc22430ab93b07ad3c7cea3355a7f6e
Signed-off-by: Liang Chen <cl@rock-chips.com>
2019-01-11 14:42:16 +08:00
Liang Chen
1dcb4dabcf dt-bindings: nvmem: rockchip-efuse: add description for RK1808 SoCs
Change-Id: I76c56b0c9709d849c87a059d7e67d67ae98ddbb5
Signed-off-by: Liang Chen <cl@rock-chips.com>
2019-01-11 14:42:16 +08:00
Cai YiWei
00ebe2a499 media: i2c: tc35874x: reconfig csi after stop stream
stop stream just close data output, csi phy state maybe not ok
for next start stream. so reset and config csi during stop stream.

Change-Id: Ic2eea6058249c294a5a4c036c87bf0b655986025
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-01-11 14:05:36 +08:00
Cai YiWei
22fcda3e9d media: i2c: ov5695: to speed up stream on
reduce 1296x972 regs.
reg list write change to continue instead of one by one.
TODO: to i2c write faster, config i2c to 400k.
clock-frequency = <400000>; to i2c node.

Change-Id: I4294cb9ba37bd1e2550a122ff45420a66911ebd9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-01-11 14:05:36 +08:00
Cai YiWei
626ba6d88f media: rockchip: isp1: to speed up stream off
current frame end to stop mp or sp, and next
frame to close, will take a frame time.
change to stop immediately and current frame end
to close.

Change-Id: I7d1b8fa23d13de1ee637d076ee0e75cbcb62e7e6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-01-11 14:05:36 +08:00
Shunqing Chen
986b222eda power: rk817-battery: add rk809 charger psy support
There is no dc detect pin in the hardware design,
dc charge only detect by rk809 vdc pin.

Change-Id: I17075bcf23b966e9d2e0a8a5daeedf26e253818d
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2019-01-11 14:03:11 +08:00
Wenlong Zhuang
e36ce4c933 media/i2c: virtual-camera: support more link-frequencies
Change-Id: Ia30280b01523e799487ac45b0d000a0ee8dc88f2
Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
2019-01-11 10:27:01 +08:00
Simon Xue
4ec40689cc PCI: rockchip: add PCIe uDMA transfer debug node
cat /sys/kernel/debug/pcie/pcie_trx

Change-Id: Idfdd9176ad55af4c7c0029bf1581f036d798bebc
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2019-01-10 17:56:19 +08:00
Simon Xue
b43575b260 PCI: rockchip: recover PCIe uDMA transfer parameter
Change-Id: Iddc7fe154bebd2cbd46645bf519cce1f42815286
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2019-01-10 17:56:19 +08:00
Zorro Liu
6395f07d89 driver: input: sensors: fix mma8452 gsensor data convert err
Change-Id: Icd754e9606dc8b0d1d44e932dd19cf113c79c3d6
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2019-01-10 16:33:00 +08:00
Finley Xiao
62b7ebee85 arm64: dts: rockchip: rk3399-evb-rev3-android-lp4: Add vop-bw-dmc-freq
This patch also enables dmc auto freq.

Change-Id: Ic9de96c38190490dee2bdbdf86a2d8e8844ba9d5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-01-10 16:31:34 +08:00
Zheng Yang
e514e77bdc drm/bridge: synopsys: dw-hdmi: audio software reset after setup
When playing NLPCM audio, such as AC3, HDMI is pluged in, it's
better to reset audio fifo and sync audio clock by reselect
audio input interface. Or sink may not recognize NLPCM format.

Change-Id: I9112bc9aa1f57041e15b5be563ecb96c44644807
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-01-10 16:17:55 +08:00
Lin Huang
2c300d471c arm64: rk1808_x4_linux_defconfig: enable CONFIG_REGULATOR_RK808
enable rk808 related config, so we can adjust voltage on rk1808x4
board.

Change-Id: I28ba4da20176a4e7f10afeb4e7c1389f4aa920ed
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-01-10 11:04:55 +08:00
Wyon Bi
a6bfa021e8 drm/rockchip: dsi: Add dpi_pld_wr_err error handling for esd recovery
Change-Id: Id9302aab7f73d1661ccbf2e3329cdd44b22df59b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-09 19:00:07 +08:00
Zorro Liu
581df2cde9 arm64: dts: rockchip: add nandc node for rk3368-xikp and rk3368-p9 boards
default disabled

Change-Id: Iff9a32f4a9ba93ea76f07afcadfb683bac81c9cc
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2019-01-09 15:39:19 +08:00
Zorro Liu
eee8a63698 arm64: dts: rockchip: update bootargs for rk3368-xikp-avb and rk3368-p9-avb boards
Change-Id: I49f2348a8e2774c58afd743a6f7de4706aa10360
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2019-01-09 15:38:06 +08:00
Longjian Lin
5f582e90ef bluetooth: rfkill-bt: fix bt irq cannot wake host.
This issue is  caused by set wake_host_gpio to out put,
 so cancel set wake_host_gpio to out put

Change-Id: If776c1a9f54914cf0da728925fb8c8bbb5886155
Signed-off-by: Longjian Lin <llj@rock-chips.com>
2019-01-09 14:58:05 +08:00
Simon Xue
7ec0b63a75 PCI: rockchip: Support reset PCIe device dynamically
Now we have a way retraining the link in case link broken
during PCIe transfer by uDMA

Change-Id: Ica4a2dfff432515bd8d32e79b8fb9504de56e82d
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2019-01-09 14:37:03 +08:00
William Wu
6c2dc17d1e usb: dwc3: rockchip: use sysfs instead of debugfs
Debugfs may not support on some platforms. So remove
the debugfs and add sysfs interface. This patch also
change the name "rk_usb_force_mode" to "dwc3_mode".

Change-Id: I461919a02b1ee126c494f43f74af5295bb20c0a4
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-01-09 14:34:17 +08:00
Jeffy Chen
0b8c593910 BACKPORT: drm/bridge: analogix: Do not use device's drvdata
The driver that instantiates the bridge should own the drvdata, as all
driver model callbacks (probe, remove, shutdown, PM ops, etc.) are also
owned by its driver struct. Moreover, storing two different pointer
types in driver data depending on driver initialization status is barely
a good practice and in fact has led to many bugs in this driver.

Let's clean up this mess and change Analogix entry points to simply
accept some opaque struct pointer, adjusting their users at the same
time to avoid breaking the compilation.

Change-Id: Ie06ce63a5daae532df69d2447b0673b91032d61c
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Acked-by: Jingoo Han <jingoohan1@gmail.com>
Acked-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180110162348.22765-2-thierry.escande@collabora.com
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
(cherry-picked from 6b2d8fd98d)
2019-01-09 10:47:48 +08:00
William Wu
c8b8e8bd39 phy: rockchip-inno-usb2: fix some coding style issues
This patch fix some coding style issues reported by checkpatch.pl.

Change-Id: I6a0163fb849203e722dc0e462ddaf3f96cd080a7
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-01-09 10:22:32 +08:00
Finley Xiao
982038bc24 cpufreq: governor: userspace: Fix frequency error when suspend and resume
As policy->cur may be changed by thermal and cpufreq_suspend, the setspeed
may be changed after resume.

Change-Id: I6d4e0672ff39127c522f305719afd52806c31f48
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-01-09 10:21:16 +08:00
Wyon Bi
fd31310414 drm/bridge: lt8912: Use drm_add_modes_noedid instead of hard-coded mode
Change-Id: I7420a455c3e1928482e27f7ef9e3c996afe0c8a1
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-09 09:41:24 +08:00
Sandy Huang
15ee2dc07a drm/rockchip: vop: add hdmi pol config for px3se
if miss this commit will appear hdmi display abnormal at
some TV.

Change-Id: I09833db307dae9622319940ac4f773836db1de81
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-01-08 21:07:01 +08:00
Wyon Bi
a6a25fa17d arm64: dts: rockchip: Update lvds panel node
Change-Id: Iaa40aa73e3486d967c804e95c02bb27b8a27ff61
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-08 17:22:57 +08:00
Wyon Bi
e8f6fef95a ARM: dts: rockchip: Update lvds panel node
Change-Id: Ibe8e87a41d531f3efad7fccfc0de8dc4b34a73e7
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-08 17:22:57 +08:00
Wyon Bi
43d37874c0 dt-bindings: display: rockchip: lvds: support "dual-channel" property
Change-Id: I21c8f4a727b41eed6be39a10169c41bfd4c0e887
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-08 17:22:57 +08:00
Wyon Bi
157f85929e drm/rockchip: lvds: Set lvds dual channel according to "dual-channel" property from DT
Change-Id: I5ee46c0fe197fe9b22e3485e973875f81e2f2f9e
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-08 17:22:57 +08:00