Commit Graph

603787 Commits

Author SHA1 Message Date
Wyon Bi
a5d7b429f4 ARM: dts: rockchip: rk312x-android: add route subnode
Change-Id: Ibab8290d4325e727e1a7b6bec9d20967261d3bf1
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-19 14:30:28 +08:00
Wyon Bi
ae8c318d1a ARM: dts: rockchip: rk312x: add support for dsi
Change-Id: Id77c3496b8548ea5bd0b9e6c9b32de7199494484
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-19 14:30:16 +08:00
Wyon Bi
76d1216b2c drm/rockchip: dsi: add support for rk3128
Change-Id: Idc36a7f847a5e23568dc629c3ea70dfd5adea4e6
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-19 14:29:46 +08:00
Wyon Bi
525eeb8fe4 phy: rockchip: mipi-dphy: add support for rk3128
Change-Id: I29578e117d187add559890871af5fcf1c537a460
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-19 14:29:22 +08:00
Wyon Bi
31ea603373 clk: rockchip: rk3128: remove CLK_IGNORE_UNUSED flag from clk_mipi_24m clock
This flag was in place to prevent important clocks from getting gated
while they had no users. Now that the driver supports clocks
properly, we can drop this.

Change-Id: Ied6ea7677ab38988c89100e3644d829cb5736356
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-19 14:29:01 +08:00
Joseph Chen
84445051da mfd: rk808: set rk816 interrupt status and mask register as volatile
Change-Id: I6b0b4d9bb5afcbe201973cf3406819465f26f648
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2017-10-19 14:27:02 +08:00
Steven Chen
a3befd2cc3 ARM: dts: rk3288-android: disable dmc auto-freq-en
Change-Id: Iaf43ad3f1eb17a431eda1d58d39aa4498de13b94
Signed-off-by: Steven Chen <cw@rock-chips.com>
2017-10-19 14:15:09 +08:00
Steven Chen
07ba151a3a ARM: dts: rk3288-android: add scene config for 4k 10bit video
Change-Id: I8fb2c966765854dbf25d0f39b44ffdf7886d212b
Signed-off-by: Steven Chen <cw@rock-chips.com>
2017-10-19 14:14:58 +08:00
Liang Chen
171dc94f71 ARM: configs: rockchip_defconfig: add CONFIG_INPUT_RK8XX_PWRKEY
Change-Id: Ie0e6b2ac5264c00dc49e6056fcf09419bfada2a7
Signed-off-by: Liang Chen <cl@rock-chips.com>
2017-10-18 17:46:44 +08:00
Wyon Bi
c9d26e763b PM / devfreq: rockchip_dmc: Fix compiler warning
drivers/devfreq/rockchip_dmc.c: In function 'rk3368_dmc_init':
drivers/devfreq/rockchip_dmc.c:649:7: warning: 'ret' may be used uninitialized in this function [-Wuninitialized]
drivers/devfreq/rockchip_dmc.c:639:6: note: 'ret' was declared here

Change-Id: I843b7a4a0804bcf02152ba3218dcefa26d047c95
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2017-10-18 14:32:48 +08:00
Mark Yao
248d0a0da2 ARM: dts: rk3288-android: force reserve vopb for hdmi
Only vop big support 4K resolution, and HDMI request it,

Beside resolution support, the other features are the same
on rk3288 vops.

Change-Id: I2446b5d6800e8da7388b71d87a7a3fd05c10f31f
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-10-18 11:06:30 +08:00
Mark Yao
a03c3bf4c1 ARM: dts: rockchip: firefly-rk808: clean up
Change-Id: I36ebd45dca45e5ee0a8e93376c22a2b97be215e4
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-10-18 11:06:09 +08:00
Mark Yao
b10524817b ARM: dts: rockchip: firefly: don't delete display node
Change-Id: Iba623a8afab69ee7ee542f81b2d7fd644a02d656
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-10-18 11:06:04 +08:00
Mika Penttilä
a508f5c317 UPSTREAM: ARM: 8544/1: set_memory_xx fixes
Allow zero size updates. This makes set_memory_xx() consistent with x86, s390 and arm64 and makes apply_to_page_range() not to BUG() when loading modules.
(cherry-pick from f474c8c857)

Change-Id: I96a846a30d34077a85f36289b7b935e02f725591
Signed-off-by: Mika Penttilä mika.penttila@nextfour.com
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2017-10-18 09:12:11 +08:00
Randy Li
aefa4a4728 drm/rockchip: free memory in vop bandwidth interface
The array won't be used again, it is quite safe to free
it there.

Change-Id: I3bc201fbdead819cc47a08848acd66797c82e0f5
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2017-10-18 09:08:43 +08:00
Tao Huang
6432a58d1b Revert "cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions"
This reverts commit 273daee0be.

Needs to be reverted since system_server no longer has CAP_SYS_RESOURCE.

Change-Id: I121ac09db2f4f55349d1596c14315b98d246b3d7
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2017-10-17 19:10:13 +08:00
Huibin Hong
c28bfb3c34 spi: rockchip: set dma tx burst 8
If it is 16, and DMATDLR is 15, it would cause tx fifo
overflow.

Change-Id: I14592492be2ebd65ee47e916e25a60f0905d3eca
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2017-10-17 16:56:32 +08:00
Shawn Lin
1701f276af arm64: dts: rockchip: correct vqmmc voltage for rk3399 platforms
The vcc_sd is used for IO voltage for sdmmc interface on rk3399
platform have a limitation that it can't be larger than 3.0v, otherwise
it has a potential risk for the chip. Correct all of them.

Change-Id: I8d4ee2202fb32d30734c98a3b514c315e62859b4
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2017-10-17 14:40:27 +08:00
Yankun Zheng
9e295197d8 ARM: dts: rk3229-gva: modify wifi power pin for SoM hardware
Change-Id: Id18e0849076cd70f8f5e5b8b057face550f1ffc4
Signed-off-by: Yankun Zheng <zyk@rock-chips.com>
2017-10-17 11:06:16 +08:00
Alex Zhao
5fda03d4a9 net: rfkill: rockchip: add vbat_gpio to control the wifi power supply
Change-Id: I4746fd5c46c5e1a7df2bb18f80f5a8efee20605f
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
2017-10-17 11:05:46 +08:00
Tao Huang
053de347cd rk: remove unused PIE support
Change-Id: Ib7793724ef4e1c681898813e4ca5dd47a1960ae2
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2017-10-16 17:55:00 +08:00
Elaine Zhang
fba107bd06 clk: rockchip: rk3368: set clk parent npll to dummy_npll
npll is just for dclk_vop, others clk not allowed to set npll as parent.

Change-Id: I11e1770acab5486acaebafd56a0c57847f7f533c
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-10-16 17:25:42 +08:00
kenjc.bian
914276d56b ARM64: dts: rockchip: rk3368-android: Enable verity-boot on vendor partition node for Android Oreo Treble.
Change-Id: I5c247812d785183c59ec787e1a4cfe25e6b54397
Signed-off-by: kenjc.bian <kenjc.bian@rock-chips.com>
2017-10-16 10:27:42 +08:00
Wenping Zhang
ae4ed36190 ARM: dts: rockchip: improve bus speed of eMMC for rk3229-gva.
add mmc hs200/ddr mode support and increase the max clock frequence.

Change-Id: I7e81dfaf364d88a3e8bf0278a8f771a8179c6627
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
2017-10-13 18:13:03 +08:00
Huibin Hong
d7155171cb dmaengine: pl330: _loop_cyclic fix cycles of last loop
It has been tested by i2s, we can hear noise when play
music by unalign buffer size.

Change-Id: Ie52d5ac79c71df8fcec841d8801e24280831420e
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2017-10-13 10:43:44 +08:00
Jerry Xu
b6a5629d4d ARM: dts: rk3288-evb: modify the expression of the delay time for panel
Change-Id: Icc859a57caebde1eacefd27ba65f3e05f1466389
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2017-10-12 14:24:48 +08:00
Will Deacon
d86a4c8c46 BACKPORT: arm64/vdso: Fix nsec handling for CLOCK_MONOTONIC_RAW
commit dbb236c1ce upstream.

Recently vDSO support for CLOCK_MONOTONIC_RAW was added in
49eea433b3 ("arm64: Add support for CLOCK_MONOTONIC_RAW in
clock_gettime() vDSO"). Noticing that the core timekeeping code
never set tkr_raw.xtime_nsec, the vDSO implementation didn't
bother exposing it via the data page and instead took the
unshifted tk->raw_time.tv_nsec value which was then immediately
shifted left in the vDSO code.

Unfortunately, by accellerating the MONOTONIC_RAW clockid, it
uncovered potential 1ns time inconsistencies caused by the
timekeeping core not handing sub-ns resolution.

Now that the core code has been fixed and is actually setting
tkr_raw.xtime_nsec, we need to take that into account in the
vDSO by adding it to the shifted raw_time value, in order to
fix the user-visible inconsistency. Rather than do that at each
use (and expand the data page in the process), instead perform
the shift/addition operation when populating the data page and
remove the shift from the vDSO code entirely.

[jstultz: minor whitespace tweak, tried to improve commit
 message to make it more clear this fixes a regression]
Change-Id: Ib211fcb73106fd088bb3c43725df2b9264ab303d
Reported-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Tested-by: Daniel Mentz <danielmentz@google.com>
Acked-by: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Link: http://lkml.kernel.org/r/1496965462-20003-4-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from LTS linux-4.9.y
 commit 99f66b5182)
2017-10-11 10:25:20 +08:00
John Stultz
edba96e19d BACKPORT: time: Fix CLOCK_MONOTONIC_RAW sub-nanosecond accounting
commit 3d88d56c58 upstream.

Due to how the MONOTONIC_RAW accumulation logic was handled,
there is the potential for a 1ns discontinuity when we do
accumulations. This small discontinuity has for the most part
gone un-noticed, but since ARM64 enabled CLOCK_MONOTONIC_RAW
in their vDSO clock_gettime implementation, we've seen failures
with the inconsistency-check test in kselftest.

This patch addresses the issue by using the same sub-ns
accumulation handling that CLOCK_MONOTONIC uses, which avoids
the issue for in-kernel users.

Since the ARM64 vDSO implementation has its own clock_gettime
calculation logic, this patch reduces the frequency of errors,
but failures are still seen. The ARM64 vDSO will need to be
updated to include the sub-nanosecond xtime_nsec values in its
calculation for this issue to be completely fixed.

Change-Id: I84f455fc9adbb26c4130205d9ebe3683f638fc1d
Signed-off-by: John Stultz <john.stultz@linaro.org>
Tested-by: Daniel Mentz <danielmentz@google.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Link: http://lkml.kernel.org/r/1496965462-20003-3-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from LTS linux-4.9.y
 commit a53bfdda06)
2017-10-11 10:18:45 +08:00
Sugar Zhang
9f2572ec7f video: rockchip: hdmi: enable nlpcm audio case
Change-Id: I21034b9053c171c3503054c4b23d67b11a7f430a
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2017-10-10 16:03:57 +08:00
Yankun Zheng
d98c0f32ae input: touchpad: cy8c: modify interrupt level to falling
Change-Id: I76ecd950df00ff53dd677316f71b5083c6102cba
Signed-off-by: Yankun Zheng <zyk@rock-chips.com>
2017-10-10 11:29:52 +08:00
Hao Xiaowei
128eb5079c ARM64: dts: rockchip: rk3368-android: Add system/vendor partition nodes for Android Oreo Treble
Change-Id: If01bda29e9952164dd135c397a058bf67a5ea03b
Signed-off-by: Hao Xiaowei <hxw@rock-chips.com>
2017-10-10 09:38:48 +08:00
Liang Chen
3be9ee15fb ARM: dts: rockchip: add basic dts file for rk3128-fireprime board
Change-Id: I9a5e3c7a1f800533825d5bb20c996561431ee621
Signed-off-by: Liang Chen <cl@rock-chips.com>
2017-10-10 09:33:41 +08:00
David Wu
f838f63e15 ARM: dts: rockchip: Add gmac node for rk312x
Change-Id: I1b8b3041d5c020816a8afac117aed644c2d6e0e7
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-10-09 16:46:24 +08:00
Jason Song
a8facd8c95 input: touchscreen: gt9xx: compatible with gt9xxf.
Change-Id: Id428befa8db59870230865d1b5c11096c1ee5236
Signed-off-by: Jason Song <sxj@rock-chips.com>
2017-10-09 16:39:54 +08:00
David Wu
816a964571 ARM: dts: rockchip: Use default setting instead of up and down pull setting on rk312x
The rk312x soc's up and down pull setting is determined by the hardware.
So remove the wrong up and down pull setting, the pcfg_pull_none setting
is disabled the pull.

Change-Id: I2a2f33ab6b460806601ad5e1914a5e4eee013835
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-10-09 10:25:51 +08:00
David Wu
c4223b3000 net: stmmac: dwmac-rk: Add RK3128 GMAC support
Add constants and callback functions for the dwmac on rk3128 soc.
As can be seen, the base structure is the same, only registers
and the bits in them moved slightly.

Change-Id: I62617ad8d58ce3f19a1222e1494a89545d6ec45e
Signed-off-by: David Wu <david.wu@rock-chips.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-09 10:15:38 +08:00
David Wu
bb17dcd593 net: ethernet: stmmac: dwmac-rk: Add rv1108 gmac support
It only supports rmii interface. Add constants and callback functions
for the dwmac on rv1108 socs. As can be seen, the base structure is
the same, only registers and the bits in them moved slightly.

Change-Id: I91e6c812b8e3dc640884d66b41490f5e588a3f28
Signed-off-by: David Wu <david.wu@rock-chips.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-09 10:15:23 +08:00
Finley Xiao
1b0eb8126b arm64: dts: rockchip: rk3368: Select L2 if cpub leakage is greater than 50mA
Change-Id: I3ad9dd015320312ef3851c686a909553b36e874b
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-10-09 09:05:13 +08:00
Finley Xiao
e6c4c43e0d arm64: dts: rockchip: rk3399-sapphire-excavator: add dmc and dfi nodes
If ddr frequency can be changed according to vop bandwidth,
change auto-min-freq to 200MHz is okay and 200MHz is enough
for 1080P@30fs and 1080P@60fps.

Change-Id: I522fecb1f97430344b0b67c9ee72a447528c6b76
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-09-30 18:25:55 +08:00
Jerry Xu
6806cf409f ARM: dts: rk3288-android: simplify the node of dsi0_in_vopl and edp_in_vopl
Change-Id: I4e53512c2d773ec1023e9d6b96e7959a0c04e636
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2017-09-30 17:07:59 +08:00
Wenping Zhang
5a67cd3445 ARM: dts: rockchip: amend fiq instead of irq debug for rk3229
This patch amends fiq instead of irq debug for rk3229 SoCs.

Change-Id: Ib910fb07c5836caf6c0ea73e7693cae2b2b7042d
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
2017-09-30 17:07:37 +08:00
Frank Wang
5e2a674e07 ARM: dts: rockchip: add reserved-memory for trust on rk3229-evb board
This change reserved 14M memory zone for OPTEE side on rk3229-evb board.

Change-Id: I4f25f556f3adb649a5ac248a46927a716a38b902
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-09-30 17:07:32 +08:00
shengfei Xu
ef06da2890 soc: rockchip: rockchip_pm_config: set the real pin number to ATF
If the gpio base is started from 1000, The real pin
number is "gpio number - 1000".

Change-Id: If9b627ce9689105d0cdb7314869d598b4132f486
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-09-30 15:47:07 +08:00
xuhuicong
727e0fe68d drm/edid: output common tv resolution and hdmi mode if no read the correct edid
Change-Id: Ib7379340e8c1d59382553d21b60165fe5fb371e8
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2017-09-29 16:59:09 +08:00
Randy Li
c0aed970b7 rockchip: video: vpu: fix the ioctl for all platforms
The command defines for the ioctl will be installed
into userspace in a header file.

The arguments of the ioctl is the unique at a platform.

Change-Id: Ia86a12c91cc4243fea24fc21cc0a9f77ec9fb2d6
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2017-09-29 10:28:01 +08:00
Jacob Chen
4a4a40b964 clk: rockchip: associate SCLK_MAC_PLL on rk3288
see:
http://elixir.free-electrons.com/linux/v4.8/source/Documentation/devicetree/bindings/net/rockchip-dwmac.txt#L32

Change-Id: Ibf94d88219b13f5dd16cfdeb02d1b255e695399f
Signed-off-by: Jacob Chen <jacob-chen@iotwrt.com>
2017-09-29 10:27:11 +08:00
Finley Xiao
83f6c09912 arm64: dts: rockchip: rk3399: add vop-bw-dmc-freq property for evb board
If ddr frequency can be changed according to vop bandwidth,
change auto-min-freq to 200MHz is okay and 200MHz is enough
for 1080P@30fs and 1080P@60fps.

Change-Id: I4fddb71ced34f4d217d7fc1b97ccf73e612683b0
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-09-29 10:26:03 +08:00
Algea Cao
8cef5391e1 ARM: dts: rk3288: add hdmi gpio pinctrl
To set hdmi ddc pin HI-Z when suspend.

Change-Id: I82b0a1b0a7ec1899c13c14cfc250d3d5d30c19d5
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2017-09-28 17:45:17 +08:00
Algea Cao
7ed0a48a76 drm: bridge: dw-hdmi: set hdmi ddc pin HI-Z when suspend
Set hdmi ddc pin HI-Z to save power.

Change-Id: Ic5e15cac43c486e7de6be8526daea9b36da68bc8
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2017-09-28 17:17:59 +08:00
Jerry Xu
8d2502bbf4 ARM: dts: rk3288: add rockchip,lane-rate for mipi dsi panel
give an example for client.

Change-Id: Ifd674dd4b2162dfb2ae6b90b272d502918b34890
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2017-09-28 16:50:20 +08:00