Commit Graph

615756 Commits

Author SHA1 Message Date
Lin Huang
c48522ca13 arm64: dts: rockchip: rk1808-compute: enable dmc
rk1808 compute stick is sensitive with power consumption, so
enable ddr dvfs, and set ddr frequency to 784MHz.

Change-Id: Ib08ec090af8fe7b276102ffb818aa9c4c0c8b82e
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-05-08 17:15:41 +08:00
Weixin Zhou
427e3f1c23 arm64: dts: rockchip: rk3399pro-evb-lp4-v11: add for lpddr4 board
Change-Id: Id0119197d65a661f810fabbd637e32f0cef6245a
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2019-05-08 14:41:27 +08:00
Hu Kejun
36090c85ad media: spi: rk1608: update version to v0.1.2
Change-Id: I28afc788b30fcebb991df893ced74684d2a97b3c
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-05-08 10:09:07 +08:00
Cai YiWei
b33c1469f0 media: rockchip: isp1: add dmarx patch
support read 8/16bit bayer raw and yuv422 format
from memory to isp.

Change-Id: I771a1a9c366a6721323815e811668472996a3355
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-05-07 10:26:41 +08:00
Cai YiWei
9e759868d7 media: rockchip: isp1: enable af awb irq
enable AWB AF irq, to send measurement alone.
AEC and HIST need to get together, do it in
frame end.

Change-Id: I7d955eccfd4080865fa4c4f260a1e3c44f9585e1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-05-07 10:04:40 +08:00
Cai YiWei
14c2ab1cc2 media: rockchip: isp1: fix diff isp ver to get frame num
Change-Id: Ibfbd97afd61c199c544698963aa9b1795ec5daf8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-05-07 10:01:17 +08:00
Caesar Wang
c350a364a9 arm64: dts: rockchip: Reorganization of rk3399 Excavator dts for linux
Fix the things that explain as below:

* Fixes the panel displaying is abnormal during booting up.
  As the edp driver of uboot adds the reset with the Initialization,
  The wrong gpio configure will had been abnormal things, and sync the edp
  configure with android.
* Re-tuning the code is more intuitive.
* Remove duplicate code.

Change-Id: I302787ced74c07561655d9f27c81ee6a0afd4d08
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-05-07 09:58:14 +08:00
Caesar Wang
c3c6c4068e arm64: dts: rockchip: move the common things to the rk3399-linux.dtsi
In order to reduce the duplication of code, let's move the common things
to the rk3399-linux.dtsi.

Change-Id: I066d99642190cfcbe1c8d16d05849297176f9e6b
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-05-07 09:58:14 +08:00
Ziyuan Xu
c201a3aeb6 arm64: config: make wifi driver as module for px30/rk3326 linux
Change-Id: Iffec136b461140a4066edd93b3d4a652f9f6b178
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2019-05-07 09:55:30 +08:00
Weiwen Chen
c8f542ad44 ARM: dts: rockchip: rk3126c: rename linux dts
Change-Id: I31c3b66ca89c611af6925d4eddb5ad339bbacc43
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
2019-05-06 16:26:14 +08:00
Hu Kejun
7d6c982db6 media: spi: rk1608: load preisp firmware in parallel to write sensor global setting
Change-Id: I13cf8ad712a22592f6af0236f0717c35c611003a
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-05-06 16:18:18 +08:00
Hu Kejun
d1f1930878 media: spi: rk1608: skip write aec ioctl before stream on
Change-Id: I421369296f766446ddbeb87f3d43d3bcb5a0087d
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-05-06 16:18:18 +08:00
Lin Jinhan
ee082ae4f6 crypto: rockchip - add px30 crypto aes/des support
cipher mode list:
  aes:      ecb/cbc/xts
  des/3des: ecb/cbc

Change-Id: I46e8f698a099dd9d4e9a81afb6f3a992dadfd79f
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-05-06 16:12:29 +08:00
Lin Jinhan
3655df1bc6 dt-bindings: crypto: rockchip: add support for px30
Add DT bindings documentation for the px30 crypto drivers.

Change-Id: I15a7ce60cc56c5690d5d2640e78358060f4efa80
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-05-06 16:12:29 +08:00
Lin Jinhan
413dac552c arm64: dts: rockchip: px30 add crypto node
Change-Id: Ib8026ce7dd008d303decd61c41ec26b08b8782b1
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-05-06 16:12:29 +08:00
Lin Huang
258acc22f0 arm64: dts: rockchip: add rk1808 toybrick compute-stick board
Change-Id: I8efd2d00437c989711687a83f7b9fb89100d0f66
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-05-06 16:10:28 +08:00
Lin Huang
d53f045453 arm64: dts: rockchip: rk1808-compute: enable tsadc on compute stick board
note that if trigger over temp irq, the shutdown pin output high level.

Change-Id: I7931223d83da06aadebba7c35789d5e09cc201f5
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-05-06 16:08:33 +08:00
Finley Xiao
03e647d881 arm64: dts: rockchip: rk1808: Add wide-temperature configure
Change-Id: Idcf7ffc4b536e443c439330a5e2e5ff5707a88e4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-05-05 18:44:55 +08:00
Zhihua Wang
49ac171f5f ARM64: configs: rk1808_linux_defconfig: select F_UVC
Change-Id: I65acfb69351a5d881680d3f24c27782d3acd2337
Signed-off-by: Zhihua Wang <hogan.wang@rock-chips.com>
2019-05-05 18:44:18 +08:00
Finley Xiao
68ae2c9a62 arm64: dts: rockchip: rk1808: Add rk1808k dtsi for wide temperature chip
Change-Id: Icf3eebf09276a8cd8917f46cf921d60e7dd9c9ec
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-05-05 18:43:58 +08:00
Hu Kejun
680e8025a6 media: i2c: imx317: add 3864x2174_30fps setting
Change-Id: Ie24e896060a8467293c650ee465ccbb7bd016e05
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-05-05 17:29:22 +08:00
Bian Jin chen
3c0324bd60 arm64: dts: rockchip: rk3399pro-evb-v11: Separate android firmware
Split DT source files to separate out android firmware for Android Pie & Oreo

Change-Id: I361fae033c5191e371a9499bd5c712958abb98b5
Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
2019-04-30 14:05:54 +08:00
Wang Panzhenzhuan
64b245a09b dt-bindings: media: i2c: Document add ov2680
Change-Id: Ib1acb84e4a21a8dc380fc1b556b3b5dfcf6692ae
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-04-30 11:53:02 +08:00
Wang Panzhenzhuan
abcc0b4c71 media: i2c: add sensor ov2680
Change-Id: Ia08879044569f4a656b6fa1e0eb78f336b34a1bd
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-04-30 11:50:41 +08:00
Wyon Bi
f324dff252 drm/rockchip: dsi: Send turnaround request after a read request for dsi1
dphy_tx1 need to manually handle turn around request to generate the BTA.

Test on RK3288

Change-Id: I0f552e57d1bea26aec3431f870773fbee3a705b9
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-04-30 11:47:55 +08:00
Shawn Lin
5ecc90c53c mmc: core: retry CMD1 in mmc_send_op_cond() even if the ocr = 0
According to eMMC specification v5.1 section 6.4.3, we should issue
CMD1 repeatedly in the idle state until the eMMC is ready even if
the mmc_attach_mmc() calls this function with ocr = 0. Otherwise
some eMMC devices seems to enter the inactive mode after
mmc_init_card() issued CMD0 when the eMMC device is busy.

Change-Id: I7f91d9c20ab75842f00b3c9edfb738715963af6f
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2019-04-30 11:47:33 +08:00
Finley Xiao
c43cd9e00c soc: rockchip: system_monitor: Fix NULL pointer dereference when register
If system monitor is disabled or the driver is failed to probe, a NULL
pointer deference will happen as follow.

Unable to handle kernel NULL pointer dereference at virtual address
00000048
pgd = ffffff80096b9000
[00000048] *pgd=00000000f6ffe003, *pud=00000000f6ffe003,
*pmd=0000000000000000
Internal error: Oops: 96000005 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.4.167 #86
Hardware name: Rockchip RK3399 Excavator Board edp avb (Android) (DT)
task: ffffffc00a368000 task.stack: ffffffc00a344000
PC is at rockchip_system_monitor_register+0x618/0x838
LR is at rockchip_system_monitor_register+0x778/0x838
pc : [<ffffff8008447dec>] lr : [<ffffff8008447f4c>] pstate: 80400145
...
7700: ffffffc0f13c4140 fffffffffffffffd 0101010101010101
000000000000000b
7720: 20303030353d7473 3d74696d696c5f6c
[<ffffff8008447dec>] rockchip_system_monitor_register+0x618/0x838
[<ffffff800884f87c>] cpufreq_init+0x388/0x3d8
[<ffffff8008846ee4>] cpufreq_online+0x1b0/0x66c
[<ffffff8008847440>] cpufreq_add_dev+0x3c/0x94
[<ffffff8008544810>] subsys_interface_register+0xd4/0xf8
[<ffffff8008847648>] cpufreq_register_driver+0x10c/0x1a8
[<ffffff800884f998>] dt_cpufreq_probe+0xcc/0xe8
[<ffffff8008547bf8>] platform_drv_probe+0x54/0xa8
[<ffffff8008545fb4>] driver_probe_device+0x188/0x26c
[<ffffff80085461c8>] __device_attach_driver+0x60/0x9c
[<ffffff80085444c0>] bus_for_each_drv+0x9c/0xbc
[<ffffff8008545d90>] __device_attach+0xc4/0x12c
[<ffffff800854633c>] device_initial_probe+0x10/0x18
[<ffffff80085453b8>] bus_probe_device+0x2c/0x8c
[<ffffff800854356c>] device_add+0x424/0x51c
[<ffffff80085479c0>] platform_device_add+0xa0/0x1e8
[<ffffff800854840c>] platform_device_register_full+0xa4/0xe4
[<ffffff8009218c50>] rockchip_cpufreq_driver_init+0xc4/0x328
[<ffffff800808356c>] do_one_initcall+0x188/0x1a4
[<ffffff80091e0e90>] kernel_init_freeable+0x228/0x22c
[<ffffff8008c1d4e8>] kernel_init+0x10/0xf8
[<ffffff80080832a0>] ret_from_fork+0x10/0x30

Change-Id: I8743040d15d594dbef67439b18782e6f16e9683a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-29 19:28:15 +08:00
Hu Kejun
e32b80a797 media: spi: rk1608: support multiple output format to isp
Change-Id: Icc9c14891d6f7494a6d6cc4752dabcf07278d708
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-29 09:33:42 +08:00
Elaine Zhang
2797ba7e60 clk: rockchip: pvtm : fix up the of_match_table cross-border access
fix up the error log:
[    2.901537] ==================================================================
[    2.901625] BUG: KASAN: global-out-of-bounds in __of_match_node.part.0+0x30/0xa0
[    2.901655] Read of size 1 at addr ffffff900934ae08 by task swapper/0/1
[    2.901693]
[    2.901727] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 4.19.20 #11
[    2.901766] Hardware name: Rockchip RK3399 Evaluation Board v3 (Android) (DT)
[    2.901817] Call trace:
[    2.901863]  dump_backtrace+0x0/0x250
[    2.901909]  show_stack+0x14/0x1c
[    2.901942]  dump_stack+0xf8/0x170
[    2.901998]  print_address_description+0x54/0x238
[    2.902049]  kasan_report+0x294/0x2bc
[    2.902099]  __asan_load1+0x24/0x50
[    2.902154]  __of_match_node.part.0+0x30/0xa0
[    2.902188]  of_match_node+0x38/0x5c
[    2.902240]  of_match_device+0x48/0x4c
[    2.902294]  platform_match+0x60/0xe8
[    2.902341]  __driver_attach+0x40/0x10c
[    2.902392]  bus_for_each_dev+0x10c/0x134
[    2.902424]  driver_attach+0x30/0x3c
[    2.902454]  bus_add_driver+0x238/0x28c
[    2.902503]  driver_register+0x140/0x188
[    2.902559]  __platform_driver_register+0x7c/0x88
[    2.902619]  rockchip_clock_pvtm_driver_init+0x18/0x20
[    2.902666]  do_one_initcall+0x14c/0x47c
[    2.902702]  kernel_init_freeable+0x5ec/0x60c
[    2.902752]  kernel_init+0x10/0x110
[    2.902801]  ret_from_fork+0x10/0x18
[    2.902841]
[    2.902863] The buggy address belongs to the variable:
[    2.902925]  rockchip_clock_pvtm_match+0xc8/0x2e0
[    2.902944]
[    2.902991] Memory state around the buggy address:
[    2.903028]  ffffff900934ad00: 00 00 00 07 fa fa fa fa 00 00 00 00 00 00 00 00
[    2.903073]  ffffff900934ad80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
[    2.903126] >ffffff900934ae00: 00 fa fa fa fa fa fa fa 00 02 fa fa fa fa fa fa
[    2.903167]                       ^
[    2.903197]  ffffff900934ae80: 00 05 fa fa fa fa fa fa 00 00 00 00 03 fa fa fa
[    2.903230]  ffffff900934af00: fa fa fa fa 00 00 03 fa fa fa fa fa 00 00 00 06
[    2.903266] ==================================================================

Change-Id: Ie2bc926da76dfbb14ca6e250d7fe57e842939f79
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-04-29 09:24:38 +08:00
Kever Yang
5c2c20a5b3 arm64: dts: rockchip: update xin32k to fixed clock for px5-evb
We could use fixed-clock when there is a rockchip pmic(rk808
in px5-evb), or else kernel will yell with lots of warning in
clk_core_enable().

Change-Id: I04b666aa4aa6c1294aba2bf385aaa5374808bcf3
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-04-29 09:18:35 +08:00
Zhang Zhijie
ba00b5577e UPSTREAM: crypto: rockchip - fix scatterlist nents error
In some cases, the nents of src scatterlist is different from
dst scatterlist. So two variables are used to handle the nents
of src&dst scatterlist.

Change-Id: I97743f776255ce81d46e0493358dde8cd28e1dcf
Reported-by: Eric Biggers <ebiggers@google.com>
Fixes: 433cd2c617 ("crypto: rockchip - add crypto driver for rk3288")
Cc: <stable@vger.kernel.org> # v4.5+
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 4359669a08)
2019-04-28 10:35:12 +08:00
Wang Panzhenzhuan
468b365139 media: i2c: add sensor bf3925
Change-Id: Idae797f933fdac9c25cbf1ac30a548e3cdfe3867
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-04-28 10:31:27 +08:00
Hans Yang
0d519f5b5c ARM: dts: rockchip: rk3126c: add yingka 86v board support
support rgb-panel display normally and vpu

Change-Id: I773f52a7edff9ab5e9b2347c3bc069e862af06be
Signed-off-by: Hans Yang <yhx@rock-chips.com>
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
2019-04-28 10:07:25 +08:00
CanYang He
26e486af62 arm64: dts: rockchip: rk3399: lp4 frequency change to 416MHz 856MHz
1. use 856MHz in order to enable write dq odt, because Samsung lp4 write
dq odt can not enable when frequency under 800MHz
2. 416MHz and 856MHz is the frequency avoid disturb wifi 2.4GHz

Change-Id: Icbcd2a78dbcbfe33bc3e5b0e296913dea4b28480
Signed-off-by: CanYang He <hcy@rock-chips.com>
2019-04-26 11:16:14 +08:00
Chuncheng Huang
4d23368e53 media: i2c: add dw9714
Change-Id: If329076cf39aa01d9a7b7ab4326e09ba0578c90f
Signed-off-by: Chuncheng Huang <hardy.huang@rock-chips.com>
2019-04-25 21:05:21 +08:00
Hu Kejun
108e05c271 media: rockchip: cif: clear unready subdevice when kernel boot complete
Change-Id: Ib53d8138dce1e9237cf40d776241eaa2ac05f816
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-25 21:03:32 +08:00
Finley Xiao
77e5e026b3 soc: rockchip: system_monitor: Add fb notifier
Change-Id: I8c3f2f145bb0c99d5aa8c28422606a6af1a82b09
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:40:52 +08:00
Finley Xiao
d832876e4f soc: rockchip: system_monitor: Add reboot notifier
Change-Id: Ic788ca9ba353c7d7c64e3e323698d8c23303eaa0
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:40:40 +08:00
Finley Xiao
93ae127a12 soc: rockchip: system_monitor: change cdev state according to system status
Change-Id: Ifff046a840adda8d2f17bf8545aeeeb8ed568216
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:40:02 +08:00
Finley Xiao
ee2ff57e04 cpufreq: rockchip: Remove unuse code
Change-Id: I9cef76097811d96e1197eb7c5ecdc48d9e1fc286
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:38:13 +08:00
Finley Xiao
60feaac72b Revert "thermal: Add thermal_notifier_list for thermal zone"
This reverts commit 60b250f9b6.

Change-Id: Idcca12204138da521cca87afea69d52ae795afcf
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:37:48 +08:00
Finley Xiao
716d661c5e soc: rockchip: opp_select: Remove unuse code
Change-Id: I7c3a9061f3ef436e498cbabd14c3d13b821d4fe8
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:37:05 +08:00
Finley Xiao
d098edd1a1 GPU: rockchip: Add gpu to system monitor
Change-Id: I2c487c6ec8a46705197ceb9c2130b448f839ed66
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:33:19 +08:00
Finley Xiao
2dd4533168 PM / devfreq: rockchip_dmc: Add dmc to system monitor
Change-Id: Ia544edd3caa33f005d332db2e3a113517fa4e9ca
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:24:57 +08:00
Finley Xiao
c635afa77c cpufreq: dt: Add cpu devices to system monitor
Change-Id: I5481e50dddc2f9a8888758d096e4c3f185df06dc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:24:31 +08:00
Finley Xiao
3f3593b1bc soc: rockchip: system_monitor: Remove unused kfree
Change-Id: If249c0b67e13fe61f7ac7aa2168784c412e35d4c
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:24:31 +08:00
Finley Xiao
b8005b0a3a soc: rockchip: system_monitor: Remove cdev from monitor_dev_info
Change-Id: I39b91c670c76f7c31f96988feddb5ed8d6946ad5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:24:31 +08:00
Finley Xiao
2e525c1a31 arm64: dts: rockchip: Add system monitor node
Change-Id: I77d9d047b87702d0633d80dc7f945c6672f2ccd5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:24:31 +08:00
Finley Xiao
1a2fd32715 thermal: power_allocator: Add support to change state by system monitor
Change-Id: Ib0ed0c5df3fbae078be7ec88e93ba69cee894286
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-25 19:24:31 +08:00
Hu Kejun
7750dbcd09 media: rockchip: isp1: clear unready subdevice when kernel boot complete
Change-Id: I497719e6e8f2ef25a9d6402c16733bf4318d06d7
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-24 20:57:46 +08:00