Commit Graph

598721 Commits

Author SHA1 Message Date
dalong.zhang
6c629fe42a camera: rockchip: camsys driver v0.0x21.8
Change-Id: Ib0fed5df3edfe4dae042999e71c50d67a490f88e
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-12-06 20:09:32 +08:00
Mark Yao
ed7a71b986 ARM64: dts: rk3399: sapphire: add uboot logo support for android next
Change-Id: If206ba4d67f3609e56fe0bfe1f4063e0616ba50a
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-06 18:39:44 +08:00
Elaine Zhang
7bd6c00e01 ARM: dts: rockchip: rk3288: add qos node
when pd power on/off, the qos regs need to save and restore.

Change-Id: Idd6854022fb25538e82238f25a650a687e918a56
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2016-12-06 18:35:33 +08:00
Zorro Liu
0a868c9579 arm64: dts: rk3399-sapphire-excavator-linux: add fiq_debugger node
Change-Id: I6d2c97a06a7c252eec47ab3b1e686b1799780171
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2016-12-05 21:29:40 +08:00
Luo wei
c88222e493 hid: rkvr: add 0x110 key event used for touchpad
Change-Id: I8a57bbddcf1115414c1567aa05c4c19ecb1ce02c
Signed-off-by: Luo wei <lw@rock-chips.com>
2016-12-05 20:48:07 +08:00
Bin Yang
15d0aa3c47 arm64: dts: rockchip: enable isp node for rk3399-mid-818-android-next
Change-Id: Ic6d489ab7a65cf9ec3c7d03b00541f946cb57b84
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
2016-12-05 20:42:53 +08:00
Bin Yang
625abf44e6 arm64: dts: rockchip: Add RK3399 Excavator dts for drm
Change-Id: I8da4f4bc4a903e4e3702f6e5dbedb72cd5ee627f
Signed-off-by: Cody Xie <xkd@rock-chips.com>
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
2016-12-05 20:42:18 +08:00
Dan Carpenter
f9afe485c7 UPSTREAM: PCI: rockchip: Indent an if statement
The if statement wasn't intended.  Add a tab.

Change-Id: I33e4fce2cc2052dc45c3c7a2617586cdd6a6b664
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
(cherry picked from commit 08015ee0ff)
2016-12-05 20:18:31 +08:00
Huang, Tao
45cd824a30 Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4-android: (315 commits)
  Linux 4.4.35
  netfilter: nft_dynset: fix element timeout for HZ != 1000
  IB/cm: Mark stale CM id's whenever the mad agent was unregistered
  IB/uverbs: Fix leak of XRC target QPs
  IB/core: Avoid unsigned int overflow in sg_alloc_table
  IB/mlx5: Fix fatal error dispatching
  IB/mlx5: Use cache line size to select CQE stride
  IB/mlx4: Fix create CQ error flow
  IB/mlx4: Check gid_index return value
  PM / sleep: don't suspend parent when async child suspend_{noirq, late} fails
  PM / sleep: fix device reference leak in test_suspend
  uwb: fix device reference leaks
  mfd: core: Fix device reference leak in mfd_clone_cell
  iwlwifi: pcie: fix SPLC structure parsing
  rtc: omap: Fix selecting external osc
  clk: mmp: mmp2: fix return value check in mmp2_clk_init()
  clk: mmp: pxa168: fix return value check in pxa168_clk_init()
  clk: mmp: pxa910: fix return value check in pxa910_clk_init()
  drm/amdgpu: Attach exclusive fence to prime exported bo's. (v5)
  crypto: caam - do not register AES-XTS mode on LP units
  ...

Change-Id: Ic14c01a22a5e8a0356d6c0ef6bcca7bc6cad6b4b
2016-12-02 20:31:31 +08:00
Huang, Tao
51691b93c5 Revert "FROMLIST: PM / sleep: don't suspend parent when async child suspend_{noirq,late} fails"
This reverts commit 11b2dcefd8.
Fixed by 04c0800c73 ("PM / sleep: don't suspend parent when
async child suspend_{noirq, late} fails").
2016-12-02 19:53:55 +08:00
Huang, Tao
ff3e800bfc rockchip/vcodec: drop needless devm_clk_put
Also make sure clk is NULL if get failed.

Change-Id: I102175a108c6e7a91948d82cce97c1a1d88a071e
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-12-02 19:38:33 +08:00
Mark Yao
a0789a0c38 ARM64: dts: rk3399-android-next: default use vopb for primary display
Change-Id: I2655905aa3f63e19c8367701af36f462d399d2f3
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-02 19:10:41 +08:00
Mark Yao
a8091fbafa drm/rockchip: vop: skip config timing on vblank
Change-Id: I7aace5e26f6c9889c9e216f7b7233ec7e5530776
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-02 19:10:40 +08:00
Mark Yao
433e5da577 drm/rockchip: vop: fix display logo flash with line flag
Use standy with dsp_hold intr would effect display timing,
Some display controller can't not allow this, such as edp,
edp panel would flash with it.

Use line flag instead it seems good.

Change-Id: Iecf818c0dbd5a7833e6cec0da60fe3e693b3dc9d
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-02 19:10:39 +08:00
Tomasz Figa
b8c785afcf CHROMIUM: drm/rockchip: Clear interrupt status bits before enabling
The enable register only masks the raw status bits to signal CPU
interrupt only for enabled interrupts. The status bits are activated
regardless of the enable register. This means that we might have an old
interrupt event queued, which we are not interested in. To avoid getting
a spurious interrupt signalled, we have to clear the old bit before we
update the enable register.

BUG=chrome-os-partner:56378
BUG=chrome-os-partner:56580
TEST=while true; do backlight_dbus_tool --set --percent=0 && sleep 8 && backlight_dbus_tool --set --percent=100 && sleep 3 ; done

Change-Id: I1b8286097f3ba102663ee3a7566fd96492e12d26
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/382973
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-02 17:11:23 +08:00
Yakir Yang
0e61acfb30 FROMLIST: drm/rockchip: vop: export line flag function
VOP have integrated a hardware counter which indicate the exact display
line that vop is scanning. And if we're interested in a specific line,
we can set the line number to vop line_flag register, and then vop would
generate a line_flag interrupt for it.

For example eDP PSR function is interested in the vertical blanking
period, then driver could set the line number to zero.

This patch have exported a symbol that allow other driver to listen the
line flag event with given timeout limit:
- rockchip_drm_wait_line_flag()

BUG=chrome-os-partner:54785
TEST=Success to call rockchip_drm_wait_line_flag()

Change-Id: Id7605bada87c8ead0e549d4ff113ee49d29ad126
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
(am from https://patchwork.kernel.org/patch/9231675/)
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-on: https://chromium-review.googlesource.com/349084
Commit-Ready: Sean Paul <seanpaul@google.com>
Tested-by: Sean Paul <seanpaul@google.com>
Reviewed-by: Sean Paul <seanpaul@google.com>
2016-12-02 17:07:19 +08:00
Mark Yao
c69d9335f3 drm/rockchip: add loader protect ops to drm connector
Change-Id: Iae26ac5c994727b98db045ae00c62d641f31c4b1
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-02 17:06:56 +08:00
Mark Yao
44f714e435 drm/analogix: dp: remove some function which cause loader logo flash
Change-Id: I95c75702a15cd8fb5da0939c7e40a9e08ed362ff
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-02 14:15:23 +08:00
Mark Yao
6bfc3254cf drm/rockchip: boot_logo: ignore display route when it's not available
Change-Id: I093b4edeb17c8b1159220618a43f7552070c6001
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-02 14:14:52 +08:00
Mark Yao
fd5e84a4c1 ARM64: dts: rk3399-android-next: enable uboot charge display
Change-Id: I686a0ff43b39206e286fbd9c275c4b2d70f08b63
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-02 14:14:05 +08:00
Mark Yao
60f4bf97d6 ARM64: dts: rk3399-android-next: optimize display node
Change-Id: Icbbc34bc375f6b7106966b6ea40047cc8469594d
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-02 14:12:07 +08:00
Mark Yao
c0f3fdf9a2 drm/rockchip: boot_logo: support logo fullscreen or center display
Change-Id: I2f688b84172de015eb59187d0d3de06e6764346e
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-02 14:10:45 +08:00
Huang, Tao
3b31b9444d arm64: rockchip_defconfig: Use ext4 for ext2 file systems
also disable F2FS_FS_POSIX_ACL
save about 40KB size

Change-Id: I2a134966ece2a3f74014c059d2dd5bbccfe52b61
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-12-02 11:45:08 +08:00
Huang, Tao
406b0ea3dc arm64: rockchip_defconfig: remove some ramdisks compressed mode
disable
CONFIG_RD_BZIP2
CONFIG_RD_LZMA
CONFIG_RD_XZ
CONFIG_RD_LZO
CONFIG_RD_LZ4
for save about 20KB size.

Change-Id: I15614e3a300eca6a40c62da5af2ce5cbd0b6994f
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-12-02 11:45:07 +08:00
Huang, Tao
8b0e4d06d9 arm64: rockchip_defconfig: enable HZ_300
Change-Id: I19e780388de746dc8d7b6099663909fb2b20d107
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-12-02 11:45:06 +08:00
Huang Jiachai
3758e9ae07 video: rockchip: fb: update mirror for vr
Change-Id: Ibdd0e60991490115428ed04027cbaef717951d3b
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-12-02 11:45:05 +08:00
Huang Jiachai
a9a36e5f2c video: rockchip: fb: fix warning
Change-Id: Id15ac3f4f83fe788c9568f0acc78b8d4260c0579
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-12-02 11:45:04 +08:00
Randy Li
2f12c66521 video: rockchip: vpu: change the license to GPL v2
The proprietary license would make some kernel reasouces and
function unavailable.

Change-Id: Ibaea3e3389ab05dbd60adfcc0d7e3bba787415c4
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2016-12-02 11:45:04 +08:00
Randy Li
7211f1afbe video: rockchip: vpu: fix the makefile
Keeping the build result as a single module.

Change-Id: I9f33851d9f309c344804a81375a9417daab152f9
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2016-12-01 19:07:25 +08:00
Randy Li
1cace329a8 video: rockchip: vpu: use device tree to find out target SoC
Although the SoCs before RK3288 may not support device tree,
but it could keep forward compatible.

Change-Id: Id0e4ae3ee29ce7f45c6840cf6db5eb069c9502a5
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2016-12-01 19:04:06 +08:00
Mark Yao
cc5ac765a0 drm/rockchip: boot_logo: encoder atomic_check before enable crtc
We need update encoder output_mode and output_type before enable crtc.

Change-Id: If0c05b4d254dcac2abd6fc024fc3ffc1c5f02323
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-12-01 17:11:46 +08:00
dalong.zhang
8dee825732 camera: rockchip: camsys_drv v0.0x21.7
Change-Id: Id8d254f74b3eeb251d7369dc866f32f026d606df
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-12-01 10:06:34 +08:00
dalong.zhang
8768af65f5 arm64: dts: rockchip: rk3399-android-next: add isp
Change-Id: I8db91aae4dfd9c1b1ad39adb1e8377aba0c34fca
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-11-30 21:17:17 +08:00
dalong.zhang
0aa1636f87 ARM64: dts: rockchip: rk3399: add iommu for isp
Change-Id: Ic405ab5877355ed4128e3f473c21acdf5d026d1d
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-11-30 21:14:50 +08:00
Randy Li
60ff0ef3a1 ARM: dts: rockchip: enable the vpu service for rk3288 evb
Both VPU and HEVC service are enabled.

Change-Id: Id6dc1f0139636e8b2016b9194adddc3f87ec4e19
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2016-11-30 15:58:34 +08:00
Randy Li
6aebfdaedd ARM: dts: rockchip: add hevc vpu service for rk3288
Change-Id: I87a8c9df636e04b92948c87c27e82b43a67de184
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2016-11-30 15:57:16 +08:00
dalong.zhang
308a7ec7b3 camera: camsys_drv: v0.0x21.6 support drm
Change-Id: If0305388c5b445adbcf693504849a6be000e64a9
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-11-30 14:20:16 +08:00
dalong.zhang
2d41574b80 ARM64: dts: rk3399-evb-rev1-android: enable isp0&isp1
Change-Id: I88dda6f8e90f549ff1bbe791acec94eae30fdd45
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-11-30 14:19:42 +08:00
Tomeu Vizoso
f5202c54dd UPSTREAM: iommu/rockchip: Don't feed NULL res pointers to devres
If we do, devres prints a "invalid resource" string in the error
loglevel.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
(cherry picked from commit 8d7f2d84ed)

Change-Id: I3849bcaa4ceaea3247a8169b2a123a834011fbc5
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2016-11-30 14:10:39 +08:00
Jeffy Chen
dc7e965076 Revert "iommu/rockchip: fix bool operation error and probe warning"
This reverts commit e0492807e6.

Same issue fixed by upstream(e04928 "iommu/rockchip: fix bool operation
error and probe warning) which picked as (2e7026 "UPSTREAM: iommu/rockchip:
Fix "is stall active" check).

Conflicts:
	drivers/iommu/rockchip-iommu.c

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Change-Id: I56e61894b1da14bce78ae1b3d08158dfb5b027bb
2016-11-30 14:10:02 +08:00
Tomasz Figa
e1b2457124 CHROMIUM: iommu/rockchip: Fix TLB flush of secondary IOMMUs
Due to the bug in current code, only first IOMMU has the TLB lines
flushed in rk_iommu_zap_lines. This patch fixes the inner loop to
execute for all IOMMUs and properly flush the TLB.

BUG=chrome-os-partner:55135
TEST=compile

Change-Id: Ica2d4b0cc3d3cbc88c70ad541dc00883f1b4e90c
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/371098
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2016-11-30 14:09:04 +08:00
Mark Yao
da6e598940 drm/rockchip: vop: fix scale abnormal after window power on/off
Change-Id: Ifcaddf2f2b1c9c031bdf28ceb80468cfb79ce52b
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-11-30 11:57:54 +08:00
dalong.zhang
bd675aa1a3 camera: rockchip: porting ov8858&ov4689&ov2710 driver
Change-Id: Ia9a0a39d347a9fd506f493c6639785267233e0ac
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-11-30 11:55:35 +08:00
Jianqun Xu
910f9d73a1 ARM64: dts: rk3399: move opp tables to rk3399-opp.dtsi
Add a new dtsi file - rk3399-opp.dtsi, to configure opp-tables
for cpu, gpu and dmc.

Add rk3399-early-opp.dtsi for board with ES1, which need limit
frequency for cpu, gpu and dmc.

Change-Id: Ib57761fd5f405b0e79039d7a01e6e023d6f5dc2c
Reviewed-by: Finley Xiao <finley.xiao@rock-chips.com>
Reviewed-by: Huang, Tao <huangtao@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2016-11-30 11:24:23 +08:00
Randy Li
aba4c4996d ARM: dts: rockchip: add vpu service for RK3288
It is not harm to keep both vpu service and vpu v4l2 at the same time,
that the board file choose a driver implementation and interace to
be used.

Change-Id: If79deac5bf19395cfdca821f20486985e3034389
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2016-11-30 10:24:08 +08:00
Randy Li
0ea5e605ec ARM: dts: enable SD and GMAC at rk3288-evb
There is a bug in GMAC IP, it supports RGMII clock but not a speed
mode for it.

Change-Id: I8e5cca355c30920db37400901d3411eebca711ae
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2016-11-30 10:22:30 +08:00
dalong.zhang
8bffe04905 isp10: rockchip: v0.1.6
Change-Id: I1b702fb51d1baabd47f190fdafd79ecd22e18be0
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-11-29 21:11:43 +08:00
dalong.zhang
7bfa334454 ARM64: dts: rk3399-evb-rev3-android: enable isp0&isp1
Change-Id: Ib2d4f304e2fc4589d55e60d452571ed46e5dae4d
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-11-29 21:06:31 +08:00
dalong.zhang
0857d9c18f ARM64: dts: rk3399-evb-rev2-android: enable isp0&isp1
Change-Id: Ibd5244985eb707ca9119191cf019b56ae9055eb4
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-11-29 21:05:35 +08:00
dalong.zhang
dedd9545a1 ARM64: dts: rk3399-android: add isp0 node for isp10
Change-Id: I1324bd021ec87f10ad4b5fd200bdf83efd1dab66
Signed-off-by: dalong.zhang <dalon.zhang@rock-chips.com>
2016-11-29 21:05:25 +08:00