Commit Graph

611892 Commits

Author SHA1 Message Date
Finley Xiao
69fb6b99a6 drm/rockchip: vop: Use Use pm_runtime_put_sync() in vop_crtc_disable()
The procedure of rpm_idle() is as follows.
rpm_idle
->rpm_suspend
  ->pm_genpd_runtime_suspend
    ->pm_clk_suspend
      ->clk_disable
    ->genpd_poweroff

Pm_runtime_put(dev) causes rpm_idle() to be queued up, when
pm_clk_suspend() is executed, the rockchip dmcfreq lock is
released, vop clocks may be closed while changing ddr frequency.
Use pm_runtime_put_sync() instead of pm_runtime_put(), so that
rpm_idle can be executed before the lock is released.

Change-Id: Ibf4ff70b65782427eaf0fe9f7566ebff602d3757
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-09-29 09:58:05 +08:00
Biswajit Paul
88f6853de6 ANDROID: kernel: Restrict permissions of /proc/iomem.
The permissions of /proc/iomem currently are -r--r--r--. Everyone can
see its content. As iomem contains information about the physical memory
content of the device, restrict the information only to root.

Fix sts testPocCVE_2015_8944

Change-Id: If0be35c3fac5274151bea87b738a48e6ec0ae891
CRs-Fixed: 786116
Signed-off-by: Biswajit Paul <biswajitpaul@codeaurora.org>
Signed-off-by: Avijit Kanti Das <avijitnsec@codeaurora.org>
(cherry picked from https://android.googlesource.com/kernel/msm
 commit 60c6b65403b4c9567b53baadca0740915f698ca8)
2018-09-29 09:51:29 +08:00
Joseph Chen
a572f1ce77 dt-bindings: suspend: rk3308: add pdm clk off control macro
Change-Id: I8f9d782e3676ccd0c866b24ba7a4da0df7f23029
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-09-28 17:11:42 +08:00
Jianqun Xu
0f542e8694 arm64: dts: rockchip: fix mapping address for rk3399pro-npu pmugrf
Change-Id: Ie0e11f6f2941d4730633b668c1be40b22850c359
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-28 17:04:55 +08:00
Jianqun Xu
9c80ebb806 arm64: dts: rockchip: fix mapping address for rk1808 pmugrf
Change-Id: Idf10c849052aba90b58120254bbc9bbebdc98937
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-28 17:04:47 +08:00
Wenping Zhang
87dc89966c arm64: dts: rockchip: rk3399: change the parameter of vdd_log.
There is a hardware mistake on firefly board, it will cause the
vdd_log is too low based on previous parameter, so we change the
pwm parameter to make sure the vdd_log is about 0.9v.

Change-Id: I2d63cfe201c02a1351eebae21d1c7d449385087e
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
2018-09-28 15:25:58 +08:00
Caesar Wang
9d1403971f arm64: rockchip_linux_defconfig: build the wifi as module by default
As the external/rkwifibt will callback the wifi module to instead of build-in
for linux.

Change-Id: Id6daabc21c06fb48e6fc1a74cc3d6ad1db6898f1
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2018-09-28 14:26:44 +08:00
Yao Xiao
475b05e523 net: wireless: bcmdhd: fix some issues for driver "1.579.77.41.9 (r)"
1. disable tuning during sdio sleep
2. add get_oob_irq_flags interface for request_irq(flags)

Change-Id: Ic77fd82fc3f93a813512ecceaed2c75fe204b750
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
2018-09-28 11:59:22 +08:00
Lin Huang
8bb6439867 arm64: dts: rockchip: enable npu on rk1808-evb
Change-Id: I4d29fdb582e115dcc8c6ae2ab5443d6cc8e388b4
Signed-off-by: Lin Huang <hl@rock-chips.com>
2018-09-28 09:18:37 +08:00
hertz.wang
80d974ae5a ARM: dts: rockchip: add dmic-pdm evb-v11 board on RK3308
Change-Id: I79b8ea7b384d90cb64d0d81ad1ed7266b3e0b8ae
Signed-off-by: Hertz Wang <wangh@rock-chips.com>
2018-09-27 19:31:01 +08:00
Hu Kejun
2a4d410ea5 media: i2c: ov13850: add 4224x3136 setting
Change-Id: I12397bb36ad7cdcf506b8d685a5131c5d2358318
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-09-27 19:30:11 +08:00
Hu Kejun
51d5a0f7d1 media: rockchip: isp1: change max value of isp input
Change-Id: Ie4d437d9a2e4ec965952707561c0950889dbbc01
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-09-27 19:30:11 +08:00
Huibin Hong
d20b0acc4a serial: 8250: add line error log
Change-Id: I69fe6f0c0857ade25e777be388fcab6261f1a533
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-09-27 17:37:40 +08:00
Lin Huang
3accb95349 arm64: dts: rockchip: support syr827 regulator on rk1808 evb
syr827 use for rk1808 NPU power suppply. The default voltage is 1.0v,
we need to set it to 0.85v when board boot up.

Change-Id: Id4f0c400b931d0f97801b9a70760d9ebd351ce4e
Signed-off-by: Lin Huang <hl@rock-chips.com>
2018-09-27 15:35:43 +08:00
Huibin Hong
d3b277129e serial: 8250: fix cpu and dmac access uart fifo at the same time
If cpu frequency was 1.0 GHz, bluetooth music is unstable. But it
is stable when cpu frequency is 400 MHz. Although I had test the
uart dma driver many days on rk3088, maybe the cpu frequency was low,
and I couldn't produce the issue. In one word, the code is unlogical.
The new logic is that increase the fifo water level, if dmac bursts
before it, wait until dmac finishes and read the rest data.
If dmac doesn't burst after it, then read data from fifo directly.

Change-Id: I6fec42a0895df8a0faeba97d05fd36b761744fa2
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2018-09-27 14:58:37 +08:00
Finley Xiao
fc182ebc51 arm64: dts: rockchip: rk3308: Add rockchip,evb-irdrop for cpu and dmc
Change-Id: Id080d97f1d6bb0e7fe5b65322cb4289e3b7f44be
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-09-27 14:19:46 +08:00
Sugar Zhang
937cd237b3 arm64: dts: rockchip: get vad audio buffer from sram node
Change-Id: Ib1583475d3de57ed6ac69153519057a999feb0a0
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-27 10:09:38 +08:00
Sugar Zhang
2a60fe4c97 ASoC: rockchip: vad: get the audio buf from sram node
Change-Id: If352ff39aa23e461e440fc3f2f87f8a0fa868870
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-27 10:09:34 +08:00
Sugar Zhang
41fc10da8d arm64: dts: rockchip: rk1808: enable rk809 sound and vad sound for i2s
Change-Id: I671db6107e1486312411b44b4fb8ac352400be1a
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 19:14:42 +08:00
Sugar Zhang
888aeb879a arm64: dts: rockchip: rk3308: remove unused name for vad
Change-Id: I6664e715bf93ad54671254374f710ffa9746c065
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 19:14:22 +08:00
Yao Xiao
3c66f60d13 net: wireless: update bcmdhd driver to "1.579.77.41.9 (r)"
Change-Id: I5b5a30393157192fd8c1c033169931e7d5b03df0
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
2018-09-26 18:48:53 +08:00
Sugar Zhang
f8df3865b8 arm64: dts: rockchip: add i2s-tdm, i2s, pdm, vad for rk1808
Change-Id: I13d6da81713704d3ee53e12d801882eeef6d5e64
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 14:54:45 +08:00
Sugar Zhang
068c68fe34 ASoC: rockchip: vad: add compatible for rk1808
Change-Id: I2db2aae91746408f4a18674b4c57376e0552197b
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 14:52:56 +08:00
Sugar Zhang
6673feafa0 arm64: configs: rk1808_linux: remove non-existent spdif* driver
Change-Id: Iead2b7181cd6d6200c2a9982de77f284ebd34d3a
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 12:10:02 +08:00
Sugar Zhang
511aa3e1ec arm64: dts: rockchip: px30: drop incompatible name for i2s0_8ch
Change-Id: Iee0ef921389a8cddf908896785370fd75f138ec8
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 12:01:53 +08:00
Sugar Zhang
7b0b783d5a ASoC: rockchip: i2s-tdm: add compatible for px30
Change-Id: I8c6584fe62eae44197bbd18e86544e278a3b7021
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 12:00:46 +08:00
Sugar Zhang
9f20288e59 ASoC: rockchip: i2s: add compatible for rk1808
Change-Id: If495454e1fd8d2f5920f81d19fbf4cf56c979166
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 12:00:46 +08:00
Sugar Zhang
1d62242355 ASoC: rockchip: i2s-tdm: add compatible for rk1808
Change-Id: I0996c320b12b8eb29f88cc5b8fe96d64db55fac6
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 12:00:46 +08:00
Sugar Zhang
3c736a8a3c ASoC: rockchip: pdm: add compatible for rk1808
Change-Id: I152c5bf193ad5654d08d193b4ea45931b8d4f910
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 12:00:46 +08:00
Sugar Zhang
c7bf0d5658 clk: rockchip: rk1808: fixup wrong id-name for HCLK_I2S1
Change-Id: I10254f5c6144443d614a34d75d2400c22c448514
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-26 12:00:46 +08:00
Yao Xiao
f167118953 net: wireless: rtl8723ds: fixed some issues
1. fix disconnection during suspend/resume
2. fix unable to wake during suspend

Change-Id: I3e1d535e7cee536a253446dc482d85f54a612323
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
2018-09-26 11:50:36 +08:00
Leo Wen
aa8bacf821 arm64: dts: rk3399-sapphire-excavator-linux: support isp1&ov13850 node
Delete cif_isp10 and all cif_isp10_cameras node

Change-Id: I6f5bf3ae7001fcb456a02abbb3ef327ffedc3b76
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-09-25 17:55:07 +08:00
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