Commit Graph

611905 Commits

Author SHA1 Message Date
Rocky Hao
75cd93cfa6 UPSTREAM: dt-bindings: rockchip-thermal: Support the RV1108 SoC compatible
Add a new compatible for thermal founding on RV1108 SoCs.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
(cherry picked from commit 1027d759c9)

Change-Id: I280b0dc88ff0ff00618617767b267846271fce61
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-30 14:54:46 +08:00
Frank Wang
50d19d6711 UPSTREAM: dt-bindings: update grf-binding for rv1108 SoCs
This patch adds the compatible of GRF and USBGRF for RV1108 SoCs.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 45a7d2ca83)

Change-Id: I236fffc72d4c02cdcae703d5123e712598f88285
2018-09-30 14:54:28 +08:00
Andy Yan
843bcf23ce UPSTREAM: dt-bindings: pwm: Add description for rv1108 PWM
Add device tree bindings document for PWM on Rockchip rv1108 SoC.

Change-Id: I3da3c47c5755f4673e4007fe5b708295f2d3e8bd
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 226d1005db)
2018-09-30 14:52:00 +08:00
Zorro Liu
33f6d1bdc9 arm64: dts: rockchip: add rk3399pro npu evb board file
Change-Id: I3db38258c857c8a263bc89bea0d5cbb871227d96
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-09-30 14:51:21 +08:00
Andy Yan
716209b527 UPSTREAM: spi: rockchip: add compatible string for rv1108 spi
The spi on rv1108 is the same as other rockchip based
socs, add compatible string for it.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 6b860e69e8)

Change-Id: Ia89f3d1392ae27ce36352d5601255a0aca9d1f8f
2018-09-30 14:46:30 +08:00
Andy Yan
9d0b8028e4 UPSTREAM: i2c: rk3x: add support for rv1108
Support for the i2c controller on rv1108 soc.

Change-Id: I1eac935446a34e3edb758f9ee81cb84660dfd01e
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 0dbb9634e5)
2018-09-30 14:45:55 +08:00
Andy Yan
bfbcdb65aa UPSTREAM: dt-bindings: i2c: rk3x: add support for rv1108
Add dt Document for i2c controller on rv1108

Change-Id: I299b27689737f288d9f9952d515576bcb524e38a
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit f14cb3e277)
2018-09-30 14:45:08 +08:00
Andy Yan
348c5cca10 UPSTREAM: dt-bindings: adc: add description for rv1108 saradc
Add device tree bindings document for saradc on
rockchip rv1108 soc.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit d95094207f)

Change-Id: I6710ea66df19775b59077a705fbc75d3c8e3c368
2018-09-30 14:44:32 +08:00
Andy Yan
5f5ebec796 UPSTREAM: ARM: rockchip: enable support for RV1108 SoC
Add a rockchip,rv1108 compatible.

Change-Id: I2ef5fc82cc0867c93be47e01fbb5fb2fc5fff451
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
[rk1108->rv1108 rename]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 51f6bfc78b)
2018-09-30 14:44:21 +08:00
Sandy Huang
8fa4b2a21d arm64: dts: rockchip: rk1808-evb: enable vop lite iommu
Change-Id: Ibbebf35d43e1c69b3af7ea004b60552812acd2ce
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-09-30 14:10:09 +08:00
Sandy Huang
b75178935f arm64: configs: rk1808_linux: enable drm modules default
Change-Id: I7a2cb31df8d7240c8fc26117e99ad9bde3af1969
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-09-30 11:56:02 +08:00
Zain Wang
a8599037a1 arm64: dts: rockchip: update rk3328-evb bootargs
Tried to correct the right things for buildroot:

* remove rockchip_jtag
* keep console as FIQ0
* add "root=" boot option
* "earlyprintk=uart8250-32bit" -> "earlycon=uart8250,mmio32"

Change-Id: I82fa22ca7e2198dbfacbbf3ac6e951a571c3811c
Signed-off-by: Zain Wang <wzz@rock-chips.com>
2018-09-29 17:27:39 +08:00
Zorro Liu
0681234c1d arm64: configs: rk3399pro_npu_defconfig: add gpio keyboard and regulater fan53555
Change-Id: I0302ab31cd0606b3775b7d1ac699f0dc80e57afb
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-09-29 15:35:08 +08:00
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