Commit Graph

611860 Commits

Author SHA1 Message Date
Leo Wen
fc53d1ceca ARM64: config: rockchip_linux_defconfig: make isp1 work as default config
Change-Id: I4ff3160790595a4c8e80366c954b4c15fae82b69
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-09-25 17:55:07 +08:00
Leo Wen
0c7cf2f4fb arm: dts: rk3288-evb-rk808-linux: support isp1&ov13850 node
Delete cif_isp10 and all cif_isp10_cameras node

Change-Id: Ied1f36e6392eaa7d0cf32a491bb42072a9dd6233
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-09-25 17:52:50 +08:00
Leo Wen
48168c0eb2 ARM: config: rockchip_linux_defconfig: Remove CIF_ISP10 config
Change-Id: Id517cd9b504e68d6f9926d43b6fa648b54c0a59d
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-09-25 17:52:10 +08:00
Jianqun Xu
c66df52cd6 arm64: dts: rockchip: rk3399pro-evb fix unit name coding style
Change-Id: I61dd03496ec7d4d3a775223630c68d7dacdd0410
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-25 14:46:14 +08:00
Jianqun Xu
58a3749bc5 arm64: dts: rockchip: rk3399 fix node unit name coding style
Fix node unit name coding style, such as unit name vs reg, or
unit name vs format.

Change-Id: I8a3e28cc1949acc23622a4a1a20e4ab1479bf512
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-25 14:43:37 +08:00
Shunqian Zheng
7b5af51ada ARM: dts: rockchip: enable vpu for px3se evb board
Change-Id: Ifb4d782f4765c2266bf1417cc52a2985ee34934c
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-09-25 10:26:14 +08:00
Shunqian Zheng
ff259c4fc1 ARM: dts: rockchip: Add vpu function for rk312x
Add the vpu_combo and two sub devices, vpu and hevc,
both of which with iommu attached.

Change-Id: I32b931dc3d967e6569a53e8119434bca2c16f381
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-09-25 10:25:17 +08:00
Caesar Wang
61a515ac93 arm64: dts: rockchip: fixes the dmc for rk3399-excavator-sapphire
This patches fixes the vop bandwidth control on rk3399 excavator
sapphire board.

Fixes: 739d1ab1c9
("arm64: dts: rockchip: enable the dmc for rk3399 sapphire excavator")

Change-Id: Icad42cfc4e883668dc3987f1a5561a781d0591b8
Reported-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-09-21 15:47:22 +08:00
Finley Xiao
d66b155307 clk: rockchip: rk3308: Fix spi clock's name
Change-Id: Id15d23786eed3e0105ad4f53858421a222e680d9
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-09-21 15:12:54 +08:00
Weixin Zhou
7b544df052 arm64: dts: rockchip: rk3399pro-evb correct power supply
Modify the rk3399pro-evb power supply according to the latest
rk3399pro evb hardware designe.

Change-Id: I198a03460038639ed753202aad41377835cc30e4
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-09-21 09:37:46 +08:00
Wang Panzhenzhuan
0a185632e9 arm64: dts: rockchip: move camera node config to dts for rk3326-863-lp3-v10
Move rkisp1 and gc0312/gc2145, cif and cif_sensor
node config to dts level not in dtsi.

For rkisp1 and gc0312/gc2145 don't need by rk3326-863-lp3-v10.dts,
otherwise it causes 8.0 863 machine camera register failed;
And cif with cif_sensor don't need by rk3326-863-lp3-v10-avb.dts,
otherwise it causes 9.0 863 machine camera register failed;

So need to modify rk3326-863-lp3-v10-avb.dts and
rk3326-863-lp3-v10.dts separately for camera node configs

Change-Id: Ieac54c39cec1f2eae70e0d41829cc0ea1b6a3eb2
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2018-09-21 09:34:56 +08:00
Lin Huang
baf27a4e96 arm64: dts: rockchip: enable console-ramoop on rk1808 evb
Change-Id: I87ad3b269c77f3df65973cc75350448b6b2eb729
Signed-off-by: Lin Huang <hl@rock-chips.com>
2018-09-20 14:17:00 +08:00
Sandy Huang
30ee5a90a5 drm/rockchip: vop: restore BCSH state when exit from suspend state
when vop enter suspend state all the register will be restore to init
value, so when resume we need to config the BCSH register, and the
vop->mode_update parameter can indicate this condition.

Change-Id: Ifd5e7eb406e0ac56c11f74391290348600211e89
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-09-19 20:45:10 +08:00
Jianqun Xu
5d79e2190f arm64: dts: rockchip: fix unit name without reg property error for rk1808
This patch will fix the warning:
Warning (unit_address_vs_reg): Node /usb@fd000000 has a unit name,
but no reg property

Change-Id: I64d306172e76b8b03772e1e40d173ba991080400
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-19 18:17:21 +08:00
Lin Huang
68e9669b30 arm64: rockchip_linux_defconfig: enable console-ramoops
Change-Id: Iac724f137c29b6814b4947f9c571f76ea5220923
Signed-off-by: Lin Huang <hl@rock-chips.com>
2018-09-19 15:36:11 +08:00
Felipe Balbi
d250b6bf0e BACKPORT: usb: gadget: composite: make sure to reactivate function on unbind
If a function sets bind_deactivated flag, upon removal we will be left
with an unbalanced deactivation. Let's make sure that we conditionally
call usb_function_activate() from usb_remove_function() and make sure
usb_remove_function() is called from remove_config().

Change-Id: I4d7a70560961da90561a7999ac4e58a294c1a0cf
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit 0e3e97526a)
2018-09-19 10:03:18 +08:00
Sandy Huang
40a0fea3e4 arm64: dts: rockchip: Add support rgb888 output for rk3308b
Change-Id: I4b9e50fe28b11602886d57098bfa2573d3a307e4
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-09-19 10:03:04 +08:00
Cai YiWei
31f1ae9d0c media: soc_camera: ov9750 fix flip and exposure bug
Change-Id: I7f90247dd3f2be32c26b68a4f074b20d09e06cb2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-19 09:27:42 +08:00
Sandy Huang
a7f87ae9f6 drm/rockchip: vop: fix kernel panic when calc bandwidth
error log:

[   35.638112] Internal error: Accessing user space memory outside uaccess.h routines: 96000005 [#1] PREEMPT SMP
[   35.638996] Modules linked in:
[   35.639287] CPU: 3 PID: 226 Comm: surfaceflinger Not tainted 4.4.126
[   35.639873] Hardware name: Strides RK3399 Development Q7 Board Rev
[   35.640483] task: ffffffc0f100ec00 task.stack:ffffffc0eeaac000
[   35.641011] PC is at vop_crtc_bandwidth+0x22c/0x310
[   35.641448] LR is at vop_crtc_bandwidth+0x118/0x310
[   35.641883] pc : [<ffffff80084af988>] lr :[<ffffff80084af874>] pstate: 60400145
[   35.642526] sp : ffffffc0eeaafad0
[   35.642821] x29: ffffffc0eeaafad0 x28: 0000000000000020
...
[   35.780538] [<ffffff80084af988>] vop_crtc_bandwidth+0x22c/0x310
[   35.781057] [<ffffff80084a87b4>] rockchip_drm_atomic_commit+0xb0/0x1d0
[   35.781634] [<ffffff8008491678>] drm_atomic_commit+0x64/0x70
[   35.782140] [<ffffff8008492b08>] drm_mode_atomic_ioctl+0x5d0/0x6a0
[   35.782683] [<ffffff8008476b30>] drm_ioctl+0x2e4/0x400
[   35.783145] [<ffffff80081d0db0>] do_vfs_ioctl+0xa4/0x7d8
[   35.783616] [<ffffff80081d1540>] SyS_ioctl+0x5c/0x8c
[   35.784055] [<ffffff80080832f0>] el0_svc_naked+0x24/0x28
[   35.784528] Code: 7100113f 54ffff41 f9412ca0 f9400000 (f9400002)
[   35.785256] ---[ end trace b3812e3405f44f95 ]---
...

Change-Id: I695c9628b155294adcf5135f82e4af901ce1b82c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-09-18 16:35:13 +08:00
Wyon Bi
7492ded5db drm/rockchip: vop: Silence debug messages
[    0.543299] rockchip-vop ff460000.vop: invalid resource
[    0.543346] rockchip-vop ff460000.vop: failed to get vop cabc lut registers
[    0.543686] rockchip-vop ff460000.vop: unable to request PWM
[    0.543717] [drm] no mcu-timing node found in /vop@ff460000
[    0.543762] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)

This makes all of these messages dev_dbg. They are still useful to debug,
but we do not need them filling up the kernel logs in normal operation.

Change-Id: I134585323b477c23a8085042602f5df592e619cb
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-09-18 15:07:03 +08:00
Tao Huang
016fb2e962 arm64: rockchip_defconfig: enable DEBUG_SET_MODULE_RONX
https://android.googlesource.com/kernel/configs
36b7268642c0 ("add memory-permission related configs")

These configs are already required as part of CTS.

Change-Id: If285686e5a917d68e94303f1485e31ff063ecc82
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-09-18 11:51:14 +08:00
William Wu
522a291e9b arm64: configs: rk3399pro_npu_defconfig: enable usb
This patch enables usb dwc3 gadget, configfs,
functionfs and usb 2.0 phy.

Change-Id: I194c7464286083426740aa82a907cc4aa0cb57b3
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-09-18 10:30:35 +08:00
William Wu
98749a24de usb: dwc3: rockchip: fix build error if !CONFIG_USB
This patch fix the following build error if CONFIG_USB
is disabled and only support dwc3 gadget mode:

dwc3-rockchip.c:894: undefined reference to `usb_add_hcd'
dwc3-rockchip.c:622: undefined reference to `usb_remove_hcd'
......
dwc3-rockchip-inno.c:268: undefined reference to `usb_remove_hcd'
dwc3-rockchip-inno.c:286: undefined reference to `usb_add_hcd'

Change-Id: Iaa51ccc642abf5741fcd0d918967954c840240d5
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-09-18 10:30:35 +08:00
Zhangbin Tong
c0d1dba5a9 arm64: rockchip_defconfig: Enable CONFIG_COREDUMP
vts-testcase/kernel/api/proc/KernelProcFileApiTest
had added tests for the core_pattern.

https://android.googlesource.com/kernel/configs
5ed73dc4d482 ("add missing configs")

CONFIG_COREDUMP and CONFIG_ELF_CORE are recommended for diagnostic
purposes.

came from android-recommended.config

Change-Id: I8400ffff1b5e025b4967a39536082fbcc4ec0859
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-09-18 09:59:26 +08:00
Zhangbin Tong
fae7964790 ARM: rockchip_defconfig: Enable CONFIG_COREDUMP
vts-testcase/kernel/api/proc/KernelProcFileApiTest
had added tests for the core_pattern.

https://android.googlesource.com/kernel/configs
5ed73dc4d482 ("add missing configs")

CONFIG_COREDUMP and CONFIG_ELF_CORE are recommended for diagnostic
purposes.

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
came from android-recommended.config

Change-Id: Ib16fcc6c126e8415976fea2d7e193565866bcf2d
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2018-09-18 09:56:17 +08:00
Zhangbin Tong
9305d4596e arm64: rockchip_defconfig: update by savedefconfig
Change-Id: Ib1efe54944aa0709b8de732ab631f51ae8fb299e
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-09-18 09:31:20 +08:00
Jianqun Xu
8260665f10 arm64: dts: rockchip: add dts file for rk1808-fpga
Add dts file for rk1808-fpga, enable fiq-debugger and
set the baudrate to be 1500000Hz.

Support emmc and sdmmc for now.
Add clk_ignore_unused.

Change-Id: Ie2c3debd6f6f162a261061e5bcf6db5ab59b4c31
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-18 08:54:28 +08:00
Jianqun Xu
47cb97b08a arm64: dts: rockchip: rk1808 add support npu
Add npu node for RK1808 SoCs.

Change-Id: Ic6c3c6a1cdff75030871710808a5d248afe8ceb4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-18 08:54:10 +08:00
Jianqun Xu
ea63667dfb ARM64: dts: rockchip: fix pmda to dmac for rk3399pro-npu
Change-Id: Icf7c9f16155d573663c643b05d013ec90563a425
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-17 19:21:23 +08:00
Jianqun Xu
c27d08a4d8 ARM64: dts: rockchip: add clk for dmac node on RK1808 SoCs
Change-Id: Ia06485f3f0995f5f1cb83f36f59c4a78a4273bc2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-17 19:20:48 +08:00
Caesar Wang
6ee9465908 arm64: dts: rockchip: rk3399-sapphire-excavator-linux: fixes the incorrect pdn pin for rk3399 camera
This patch fixes that ethernet is abnormal without connecting the camera,
since the gpio3_a4 is reused by the gmac.

Change-Id: I39cd40f62d706491dac57eda2c43408c4a88e7a0
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-09-17 17:38:52 +08:00
Binyuan Lan
dd1fa389a9 arm64: configs: rockchip_defconfig: enable multi-dais
Change-Id: I16f55d42c36bb29258e9bff74b43cc240593f201
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2018-09-17 17:32:03 +08:00
David Wu
5eab040d77 arm64: dts: rockchip: Add pwm nodes for rk3308b
Change-Id: I4dd43c44e35af1ac40754fc47bb4a4d602b45c73
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-09-17 17:31:25 +08:00
Finley Xiao
4d3d65c13d clk: rockchip: rk3308: Modify parent clock of wifi
Change-Id: I30022ac45c7effc2bdd3b54180e0994cf6f41b7a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-09-17 17:31:25 +08:00
Finley Xiao
ea0d7ad774 clk: rockchip: rk3308: Add some new clocks
Add clock for pwm1, pwm2, can, owire.

Change-Id: Id9a9330da359c3d2c53ae0f0f2e41cf4ff495cc4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-09-17 17:31:25 +08:00
Sandy Huang
726122dc14 drm/rockchip: framebuffer: Add support /dev/graphics/fb0 read
For support some application only can support framebuffer display
framework and need to read display buffer from /dev/graphics/fb0.

besides, you need to add the following patch to get kvddr:

rockchip_gem_create_with_handle()@file:
drivers/gpu/drm/rockchip/rockchip_drm_gem.c

-rk_obj = rockchip_gem_create_object(drm, size, false, flags);
+rk_obj = rockchip_gem_create_object(drm, size, true, flags);

Change-Id: Iec83dba8295268ba418e802a1cf5eeccd3880ab5
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-09-17 17:30:57 +08:00
Hu Kejun
5ad14fc5e5 media: i2c: add vm149c driver
Change-Id: Ifcb8027907be60807794e659316ad5211f51ff6d
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-09-17 17:30:16 +08:00
Zhangbin Tong
05913c89e0 ARM: rockchip_defconfig: update by savedefconfig
Change-Id: I82d85bd7252ad362f63b52fafb0826a59e921bc8
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2018-09-17 14:30:42 +08:00
Cai YiWei
94b2ccefd0 media: rk-isp10: MP/SP burst config with resolution
memory base addresses are burst aligned with respect
to the configured burst length. configure different
burst length with different resolution.

Change-Id: I611768ab699a7204a26899bb10c0cdcd6beeb820
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-17 14:30:03 +08:00
Cai YiWei
bce1227d90 media: rk-isp10: fix fmt select
if enumerate all the sensor fmt, don't find matching format
then should be forced to using the last one.

Change-Id: I15949ed66f583019a522ee56844e57813c6f6e49
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2018-09-17 14:28:28 +08:00
Binyuan Lan
a1dc65d39b ASoC: rockchip: rk817-codec: optimize the reset operation
Solve the problem of small recording amplitude in the first recording.

Change-Id: I268f56b1a2c5a16da958952fe06ce11ada1cf932
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2018-09-17 11:39:20 +08:00
Weiguo Hu
d2f3829d9d Bluetooth: rtk_btusb: update rtk_btusb to version 4.1.5
Change-Id: I62bbc6e6b26823ef24418961dab2d7b93768de4e
Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
2018-09-17 10:46:47 +08:00
Wyon Bi
fca44d3e4e drm/rockchip: dsi: support EoTp feature
In order to enhance the overall robustness of the system, DSI defines
a dedicated EoT packet (EoTp) at the protocol layer for signaling
the end of HS transmission. For backwards compatibility with earlier
DSI systems, the capability of generating and interpreting this EoTp
can be enabled or disabled.

Change-Id: Iddc7e82a7e3e47dea94846fbb771da8fddc0fda3
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-09-17 09:09:30 +08:00
ZhongYiChong
628af73a51 media: rockchip: rkcif: support get continuous memory from specific CMA region
If no IOMMU support for CIF, we prefer to alloc continuous
physical memory from our reserved CMA region than from system
reserved.

Change-Id: Icbe1f206593ffc10eba96e12f77f499455dbcd55
Signed-off-by: Zhong Yichong <zyc@rock-chips.com>
2018-09-17 08:55:41 +08:00
ZhongYiChong
a0568cbcb7 arm: dts: rockchip: rk312x: add cma_region reference for CIF
Because rk312x CIF has no IOMMU and it should use CMA memory,
adding the cma_region reference for CIF, so that it could get
the CMA memory from our reserved CMA region other than from
system default CMA region.

Change-Id: I7a52abce75a2a82d3068721ddbb10ed89796ac2a
Signed-off-by: Zhong Yichong <zyc@rock-chips.com>
2018-09-17 08:55:33 +08:00
Shixiang Zheng
5b498b9947 video/rockchip: rga: fix unsupported to scaling less than 1/2
Change-Id: Ic89ef40dd7c2a2a5f885009af72f9a5f6dadab83
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2018-09-14 19:06:54 +08:00
Jianqun Xu
b2da189521 arm64: dts: rockchip: add core dts file for rk3399pro npu
Add rk3399pro_npu.dtsi for RK3399Pro-npu.
- A35 *2/ arm-pmu/ timer/ pdma/ xin24m
- grf/ pmugrf/ cru/ rktimer
- qos/ pmu
- usb3
- tsadc
- i2c0
- uart2
- pinctrl

Change-Id: I2a692826274d6c66c728716865ceb0c27e35719c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-14 18:44:36 +08:00
Elaine Zhang
a79ff0ae89 clk: rockchip: rk1808: add aclk_dmac for dma
Change-Id: I22208521b4de30228e14d47dd5117582fbf888b6
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-09-14 18:44:31 +08:00
Jianqun Xu
97051b54af arm64: configs: rockchip: add defconfig for RK3399Pro npu
Add rk3399pro_npu_defconfig for RK3399Pro npu.

Change-Id: I25fac51ef61b1a1524e0fbf45a2694728d932106
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-14 18:32:01 +08:00
Binyuan Lan
6ed6151fbe arm64: dts: rockchip: add rk3326 ai-va v11 use i2s-dmic evaluation board
Change-Id: I005d9bac8ab0be82f7fd87b774fc4dc4269dad08
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2018-09-14 18:21:49 +08:00