Commit Graph

601569 Commits

Author SHA1 Message Date
Finley Xiao
2d299c096e PM / devfreq: rockchip_dmc: Avoid glitches due to slow CPU
We weren't giving enough time for DMC to change frequencies
when the CPU was running slow.

Change-Id: I84e1a4ad7b5ccddafb0016f3d5d6eef147a58591
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-05-17 11:45:45 +08:00
Finley Xiao
08e0c3fbe7 PM / devfreq: Lock CPU online/offline in rockchip_dmcfreq_target()
To protect against races with concurrent CPU online/offline, call
get_online_cpus() before change frequency.

Change-Id: I5b97cd7eff6a1c4828ab30bc165fb2aa8b460bb3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-05-17 11:45:40 +08:00
wlq
f7770d6f9f arm64: dts: rk3368: p9: set mipi_dsi_host delay 200ms
Change-Id: Ibed9c624072f590ed2aeee8529e133a505624e8d
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2017-05-17 09:11:39 +08:00
Xu Jianqun
62c8548527 arm64: dts: rk3368-sheep: add rk818 battery node
Change-Id: I7e0f0ea93a2019ea022c9fe8e72f412af0ec6be9
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2017-05-16 19:33:25 +08:00
Rocky Hao
d45dae1a3a arm: dts: rk322x-android: update shut mode and enable this module
gpio is not connected by default and we suggest cru mode as the default
shut mode.

Change-Id: I74593092b145e51e5f5b52ab028e650b7fe67f5e
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-05-16 18:35:17 +08:00
Rocky Hao
27e21f7945 arm: dts: rockchip: rk322x: update tsadc's frequence setting
update freq of tsadc's working clock as 32768 hz, if not set, tsadc
will work at a default frequence.

Change-Id: I04f3ee230819af1fce44518b5cbee7700c4d67fd
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2017-05-16 18:34:59 +08:00
Zorro Liu
00259d4643 drivers: inv_mpu: remove no use debug
Change-Id: Ife1fae1323e2ed262a2f7063e5bb313cb304033f
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-05-16 18:34:02 +08:00
Daniel Vetter
40c9d1c263 UPSTREAM: dma-buf: Add ioctls to allow userspace to flush
The userspace might need some sort of cache coherency management e.g. when CPU
and GPU domains are being accessed through dma-buf at the same time. To
circumvent this problem there are begin/end coherency markers, that forward
directly to existing dma-buf device drivers vfunc hooks. Userspace can make use
of those markers through the DMA_BUF_IOCTL_SYNC ioctl. The sequence would be
used like following:
     - mmap dma-buf fd
     - for each drawing/upload cycle in CPU 1. SYNC_START ioctl, 2. read/write
       to mmap area 3. SYNC_END ioctl. This can be repeated as often as you
       want (with the new data being consumed by the GPU or say scanout device)
     - munmap once you don't need the buffer any more

BackPort:
  upstream kernel change dma-buf api with the commit(831e9da
  dma-buf: Remove range-based flush), avoid effect too much to
  current kernel, Just compatible dma-buf api to current version.

v2 (Tiago): Fix header file type names (u64 -> __u64)
v3 (Tiago): Add documentation. Use enum dma_buf_sync_flags to the begin/end
dma-buf functions. Check for overflows in start/length.
v4 (Tiago): use 2d regions for sync.
v5 (Tiago): forget about 2d regions (v4); use _IOW in DMA_BUF_IOCTL_SYNC and
remove range information from struct dma_buf_sync.
v6 (Tiago): use __u64 structured padded flags instead enum. Adjust
documentation about the recommendation on using sync ioctls.
v7 (Tiago): Alex' nit on flags definition and being even more wording in the
doc about sync usage.
v9 (Tiago): remove useless is_dma_buf_file check. Fix sync.flags conditionals
and its mask order check. Add <linux/types.h> include in dma-buf.h.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1455228291-29640-1-git-send-email-tiago.vignatti@intel.com
(cherry picked from commit c11e391da2)

Change-Id: I92916babe7fb0ab3bf3ce9dc966408f2e05fe83d
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-05-16 18:33:15 +08:00
Elaine Zhang
38a48567ae rockchip: clk: rk3368: remove the flag ROCKCHIP_PLL_SYNC_RATE for CPLL
to slove the display shaking, when uboot logo display to kernel show.

Change-Id: I5856581fabd0171be09993878ffb4ef1af0fb204
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-05-16 15:39:37 +08:00
chenjh
29e959968f firmware: rockchip: use 'nsec_ctx->und_lr' to deliver fiq break point's PC
'nsec_ctx->mon_lr' is not the fiq break point's PC, because it will
be override as 'sip_fiq_debugger_uart_irq_tf_cb' for optee-os to
jump to fiq_debugger handler. As 'nsec_ctx->und_lr' is not used for
kernel, optee-os uses it to deliver fiq break point's PC.

Change-Id: I5a831638e8228766d03d92674e3e29facdd116f8
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-05-16 09:27:25 +08:00
Elaine Zhang
3ea271934d arm64: dts: rockchip: rk3328-evb: add clk dts node for rk805
Change-Id: I30f061a8325d7207133bfd0ab7d82b79664262cf
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-05-16 09:23:09 +08:00
Elaine Zhang
c6049d3c44 arm: dts: rk3229-echo-v10: add clk dts node for rk805
Change-Id: Idff25c5e311f282c67f8dbabbd104019f19bbb6a
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-05-16 09:22:57 +08:00
Elaine Zhang
356a1db8fe mfd: rk808: add rk808-clkout mfd cell for rk805
support rk805 two clk output,xin32k and rk805-clkout2.

Change-Id: If4f820f53feaf6ab2804f4acd0cce925667b7bc0
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-05-16 09:22:49 +08:00
Huang, Tao
95bc3a8935 Revert "arm64: rockchip_defconfig: enable CONFIG_IKCONFIG"
This reverts commit 28f4152aad.

For pass Android 7.1 CTS:
android.security.cts.KernelSettingsTest#testNoConfigGz

Change-Id: I9bd7d4c6c06b7d43fa51a7f02eecca8cedc61c1d
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-05-15 16:11:44 +08:00
Huang, Tao
cbd1d90f72 Revert "ARM: rockchip_defconfig: enable CONFIG_IKCONFIG"
This reverts commit b90c069d1e.

For pass Android 7.1 CTS:
android.security.cts.KernelSettingsTest#testNoConfigGz

Change-Id: Ia45a95bbb9aafaf0b38b7bd4647f20878403eaae
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2017-05-15 16:03:41 +08:00
Xu Jianqun
c95e3c2086 arm: dts: rk3288: add dts for rk3288 evb with act8846 and edp
Change-Id: I861ebd4f6fbe04809f1d450d1a6fd139125c9f67
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2017-05-15 14:13:47 +08:00
buluess.li
7308df8748 arm64: dts: rk3399-android-6.0: use ion for iep
Change-Id: If3dd5da95abb462ac15d56de26aaeff1b95f5a65
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
2017-05-15 10:07:05 +08:00
Frank Wang
0e021c2e79 arm: dts: add gpio power-key support for rk322x SoC
Change-Id: I45d6e0ffe5444b26165324048c0e88d6fca19bab
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-05-15 10:06:27 +08:00
Zorro Liu
8d76d2ae34 ARM64: dts: rockchip: reduce cma size of rk3368-android
Change-Id: I33407879b63acfaf6da994a5c99633b3e2ad388b
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-05-15 10:04:49 +08:00
Zhangbin Tong
f19114808f soc: rockchip: add devinfo parser driver
Change-Id: I8e16d5ee8a1456de43e46e68bee60e7fb2a7b266
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2017-05-12 19:30:26 +08:00
Zhangbin Tong
703fbaa923 ARM64: dts: rk3399: android: add memory reserved for deviceinfo
Change-Id: Iff4cdc07f1a79d832af85dc23ed1001002fe2e6a
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2017-05-12 19:30:12 +08:00
Sugar Zhang
efca938da2 ARM: dts: rk322x: fix i2s1 pinctrl error
Change-Id: I29fa27ea159b86d3cdfbaf6d9c620e53bc52afd9
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2017-05-12 19:29:39 +08:00
Sugar Zhang
f35cb4ad31 ARM: dts: rk322x: add spdif node
Change-Id: Id8ccff720d3e42e0df8fa8fd5007127fa9af2147
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2017-05-12 19:29:26 +08:00
Sugar Zhang
8103ff1c22 ASoC: rockchip: add support for rk3228 spdif
Change-Id: I3f0ae976ef055086f48c2b95b5e45a9eac7487ad
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2017-05-12 19:29:20 +08:00
Mark Yao
624a79f144 drm/rockchip: vop: add line_flag 0/1 for ddr freq change
Change-Id: Icae9fe3d3600a478f68220545c17b393b4aff1ec
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-05-12 19:28:51 +08:00
zain wang
7cf052ec4d mfd: fusb302: Don't mistake meaningful packets for Good_CRC
If a partner port sends a packet at approximately the same time as we
send a packet, we may end up with the initial packet followed by the
GOOD_CRC reply in our HW FIFO. Don't automatically discard the first
packet in the FIFO. Instead, discard the packet only if it's a GOOD_CRC
packet. And, modify our get_message function to automatically discard
GOOD_CRC in search of a meaningful packet.

In addition, due to interrupt latency, we can't rely on receiving one
interrupt per incoming packet. If our Rx FIFO is non-empty, assume that
it contains at least one packet.

Change-Id: Iaad80a4c55eea3e9e2791d81d7c5d28ce97bd2f5
Signed-off-by: zain wang <wzz@rock-chips.com>
2017-05-12 18:20:03 +08:00
Huang Jiachai
cc7d3ea78f ARM64: dts: rk3368: add rk3368-sheep-lvds.dts for sheep board
Change-Id: Iaf65b8c8f928397e1a3641a7521ee2efed230d31
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2017-05-12 17:05:44 +08:00
Frank Wang
31988f1cb9 arm: rockchip_defconfig: enable CONFIG_KEYBOARD_GPIO
This adds enable CONFIG_KEYBOARD_GPIO to support gpio-keys driver.

Change-Id: Ib2e127a3d017ad69b1bf6c0b0a795d0bce44af0e
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-05-12 15:53:42 +08:00
Mark Yao
73766c5da7 drm/rockchip: vop: correct rk322x vop define
Change-Id: If4c3b2e54f3621f7b1120401d9a049d780aa9b4f
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-05-12 15:52:57 +08:00
David Wu
c6c5035f57 arm: dts: rk322x: Add io-domain support for rk3229-evb and rk3229-echo-v10
The power domain of VCCIO3 is selected from maskrom,
so we don't need to configure it.

Change-Id: I11f87fe6f178943daa5ec9dcc22f4f505fe58163
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-05-12 14:23:23 +08:00
David Wu
0e45b77f43 arm: dts: rk322x: Add io-domain node
Change-Id: I1707bc7e4ed166b1aee14d69c7e25a57ab535d83
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-05-12 14:22:29 +08:00
David Wu
022e8fde89 PM / AVS: rockchip-io: Add rk322x io-domains support
Change-Id: Iaa91c932fdd9a9589945b0c6e19bc73517f7b322
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-05-12 14:22:14 +08:00
chenzhen
2a136076fd ARM: dts: rk3229-evb: enable GPU device
Change-Id: Ifab6284e56d1e833990b53d1aa555f55b520c955
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-05-12 11:23:53 +08:00
chenzhen
90fde4bee2 arm: dts: rk3229-echo-v10: enable GPU device
Change-Id: I4336bd134afea2b8ad55ebb104c877548c16b582
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-05-12 11:21:59 +08:00
chenzhen
eacaf9e9fa arm: dts: rk322x: add mali-400 GPU device
Change-Id: I4fb5d27a34e57bb17db2c79ffdc655223ce8c338
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-05-12 11:21:11 +08:00
chenzhen
5b3f63d637 ARM: rockchip_defconfig: enable driver for Mali400 GPU
Change-Id: Idcccf39fc0a5d2d340325e1b3445c8c0d3dcbcc3
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2017-05-12 11:20:50 +08:00
Finley Xiao
5a0677d99e ARM: dts: rk322x: add 'nvmem-cells' property for opp_table0
This patch adds nvmem-cells property to opp_table0 node so that
cpufreq driver can get cpu leakage value.

Change-Id: Ic39525de46762dfe867ecb86123be6fa7ccad95c
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-05-12 10:15:27 +08:00
Finley Xiao
2aba651b0a ARM: dts: rockchip: add efuse device node for rk322x
Add a efuse node in the device tree for the rk322x SoC.

Change-Id: I9a771c2065bb222b754f5a37b193edd4abb3f3a7
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-05-12 09:21:44 +08:00
zhangjun
66caccf5bc arm64: rockchip_defconfig: enable HDMI_ANALOG
Change-Id: Icae9ce3e01f063c8b6e169b9d386b6eeeed54961
Signed-off-by: zhangjun <zhangjun@rock-chips.com>
2017-05-11 20:10:24 +08:00
zhangjun
8244bcbb09 ASoC: rockchip: add machine driver for built-in hdmi and codec IC
this patch is used for rockchip built-in HDMI and audio codec
IC which are wired to the same i2s line(such as rk3368).
so we use a DAI link CPU to multicodecs.

Change-Id: Ibc5fdeb2091836dc28675aacdc099d76e0b7d752
Signed-off-by: zhangjun <zhangjun@rock-chips.com>
2017-05-11 20:10:19 +08:00
shengfei Xu
95619ffb23 dt-bindings: suspend: rockchip: add PMU_USB_LINESTAE_WAKEUP_EN config for wakeup
Change-Id: I73b992b57344f24eb37b360bc479264996ff72d1
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-05-11 19:34:55 +08:00
Finley Xiao
596289bbd2 PM / devfreq: rockchip_dmc: Fix error handling
It never has the mutex_lock counterpart before goto.

Change-Id: I937e79bc65433cb1c173fe0cb221e7d69586046c
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-05-11 19:29:19 +08:00
shengfei Xu
3ac2e75c72 arm: dts: rk3288-evb: enable rockchip-suspend node
Change-Id: I1bc5f75d3bf49b7f5a532d7dbe7206edc6932c36
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-05-11 19:27:37 +08:00
shengfei Xu
f8e9d466d2 arm: dts: rk3288: add rockchip-suspend node
Change-Id: Id5700548a6034248ed5ad3226dd652d0833eec13
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-05-11 19:27:17 +08:00
shengfei Xu
a791fa845f soc: rockchip: support rk3288 pm config
Change-Id: Icbd23af68bdf7a4fcad59a5d227988a13b2873af
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-05-11 19:27:13 +08:00
Finley Xiao
5258d700a1 nvmem: rockchip-efuse: add support for rk322x-efuse
This adds the necessary data for handling efuse on the rk322x.

Change-Id: Iadd37923f5949a03630a936d5a41b955d443b2d8
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-05-11 19:21:53 +08:00
Finley Xiao
4f60621439 ARM: dts: rk3229: add cpu-supply property for cpu node in evb board
This patch adds the cpu-supply property so that cpu can do dvfs

Change-Id: I6cfc1c8e467652ad9b748c6a9980b00006181910
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-05-11 19:21:36 +08:00
Finley Xiao
abdf89a8e3 ARM: dts: rk3229: add cpu-supply property for cpu node in echo-v1 board
This patch adds the cpu-supply property so that cpu can do dvfs

Change-Id: I5edff7fabd1de23407e8fcb7d70e3b0eeee2ee0e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-05-11 19:21:22 +08:00
Finley Xiao
ec7eb2f617 ARM: dts: rk3229: add a new cpu opp table
This patch adds some new frequencies for rk3229 boards

Change-Id: Ie35efc3f04350bcfd1eae31a72adfc9166bef781
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-05-11 19:21:10 +08:00
Finley Xiao
7d221db60c ARM: dts: rk322x: add operating-points-v2 property for cpu
This patch adds a new opp table for cpu

Change-Id: I59384ab8ab649ca4672adf64c52f16da76777ce4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2017-05-11 19:20:49 +08:00