Commit Graph

615693 Commits

Author SHA1 Message Date
Hu Kejun
8dd6af1e8c media: rockchip: isp1: fix wrong RG10 format
Change-Id: Ibf4f36cd6e63b0cdf59237ad48b3847c403e0dc3
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-22 09:15:37 +08:00
Ziyuan Xu
4c7a6d2fcc arm64: dts: rockchip: mount /root read-write on boot for rk3326-linux
fixup mount error on debian:
[    1.990120 ] EXT4-fs (mmcblk1p8): mounted filesystem with ordered
data mode. Opts: (null)
[    1.990932 ] VFS: Mounted root (ext4 filesystem) readonly on device
179:8.

Change-Id: I58cc93c9ce9ba964d75c97298b75a4786812dab9
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2019-04-19 17:55:39 +08:00
Zain Wang
b83e6f4491 mfd/fusb302: add input event for Accessory insert
Change-Id: Ifbdbadbb198146f1dc904c33bf9948c4316fc8d5
Signed-off-by: Zain Wang <wzz@rock-chips.com>
2019-04-18 19:55:27 +08:00
Zain Wang
a8db81c450 mfd/fusb302: Add Type-C Audio Accessory support
Change-Id: I7b7c1fe7ecc30ded6149c3d0d4e1f82ee9cc52c9
Signed-off-by: Zain Wang <wzz@rock-chips.com>
2019-04-18 19:54:58 +08:00
Ziyuan Xu
9ea341b2c3 arm64: dts: rockchip: fixup error vccio1 for rk3326-evb board
Change-Id: I143ca3ce81f0dcdf43ebdb88558d33a735708945
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2019-04-18 19:49:29 +08:00
Ziyuan Xu
c91de400b1 arm64: dts: rockchip: fixup error vccio1 for px30-evb board
Change-Id: Idc430da4b561a60048dada48524a88e5ad87db08
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2019-04-18 19:49:29 +08:00
Zefa Chen
1a09644b47 media: i2c: fixed gc2385 gc5025 gc8034 exposure issue.
Change-Id: I2db0d30fba278be17dd49c57451f55894d282bc3
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2019-04-18 19:48:21 +08:00
Finley Xiao
70efa933b8 soc: rockchip: system_monitor: on/off cpu according to temperature
Change-Id: Ie2c55dd4c11700c0446cf0abec7e580f6abda8fe
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-18 10:34:43 +08:00
Finley Xiao
23d17d970d soc: rockchip: Add system monitor driver
Change-Id: Ie5aef98acf6bcbaf319d75a9b34dd834e25a1d32
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-18 10:34:43 +08:00
Finley Xiao
ef0f5ec27c PM / devfreq: Add support for policy notifiers
Change-Id: I6feff0c15d8685db91c8780ce90c4b31925f5abe
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-18 10:34:43 +08:00
Finley Xiao
1c9e46fb38 PM / devfreq: rockchip_dmc: Don't adjust to user limits
Since devfreq_add_device() and update_devfreq() already takes care of this.

Change-Id: Ie90c1d28f681cfbc946362e303a61bdf3578ccd6
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-04-18 10:34:43 +08:00
Wang Panzhenzhuan
528ddecf98 arm64: dts: rockchip: rk3368-xikp-avb: camera pinctl default pull down
fix rk3368 xikp machine camera PIC_SIZE_ERR in first start state

Change-Id: I1466ca8d8ba7543e2c1c84d4180a3a165e95e8a9
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-04-18 10:31:05 +08:00
Yu YongZhen
a7b083f964 arm: Makefile: pack logo when CONFIG_DRM
Change-Id: I11ce5935ddff13618776a82faae56670f31b1d51
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
2019-04-18 10:30:21 +08:00
Ziyuan Xu
30e227faa3 arm64: config: remove non-related for px30/rk3326
Change-Id: I42de5c57cf32c146b02c1e11213e4d84ea9d41f2
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2019-04-18 10:22:16 +08:00
Shixiang Zheng
5b0c290364 gvideo/rockchip: rga2: alter some print level for debug
Change-Id: I776a07416ddc36d473cd9ed39aa6fbf900facce7
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2019-04-17 16:14:36 +08:00
Lin Huang
092cfaa84b arm64: dts: rockchip: rk1808-compute: add rk1808-compute board support
Change-Id: I6838f60b6cf95a4e7d7105cc4127536c9219349b
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-04-16 21:57:10 +08:00
Lin Huang
98ea1addcd arm64: rk1808_linux_defconfig: enable i2c_gpio driver
Change-Id: Ibf034d2697f94b588c676278042da1d8b0b4d1c2
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-04-16 21:57:10 +08:00
Shunqian Zheng
9c9959669c arm64: dts: rockchip: assign max spi clock for rk3326-rk1608
rk1608 can run at max spi speed with rk3326. This patch
set spi to 50MHz with external clock 100MHz and rsd = 1.

Change-Id: Iff92f045668069272d7d56d4439783ee72db1cf2
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2019-04-16 14:15:12 +08:00
Shunqian Zheng
d6051ffa16 arm64: config: enable rk1608 preisp for px30/rk3326
Change-Id: I218cb822db9991f268faa6bf1549f9022ef24230
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2019-04-16 14:14:03 +08:00
Shunqian Zheng
d23dd261dd media: spi: rk1608: use low spi freq before rk1608 initialization
rk1608 spi can not run at high speed (>40M) at boot time. It needs
initialization before switching to spi max speed.

Change-Id: I27e17d32271012fd48c7feeb8e4939082439b978
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2019-04-16 14:13:33 +08:00
Nickey Yang
2d36048f1c drm/rockchip: framebuffer: add rockchip_fbdev_blank
Current rockchip-drm does not go to unlock and free
logo memory when fbdev is initialized.
That will cause the display application with linuxfb
platform unable to get the display buffer when boot.
So fix this.

Change-Id: I6b4652d642656c640e5b536b199e623f4f1bc3ef
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2019-04-16 09:09:19 +08:00
Yiqing Zeng
ad49eb8249 media: i2c: add soi jx_h65 sensor driver
Change-Id: I83b565a411a2bf4281d69c593b2e35e2aa44436d
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
2019-04-15 19:40:53 +08:00
Lin Huang
071f1aebae arm64: rk1808_linux_defconfig: enable GT1X touch screen config
Change-Id: Ida1b1f99cafed1ae48537fdba26a728a96edc576
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-04-15 15:50:52 +08:00
Lin Huang
ddd5393ba4 arm64: dts: rockchip: rk1808-evb: create lcd_pwr regulator
Since touch screen and panel both use LCD_PWR_EN to enable
power, create lcd_pwr regulator so touch screen and panel
both can quote it.

Change-Id: I5400637c3ae9e684c58effcd5eae1fdc1672780a
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-04-15 15:50:04 +08:00
alpha lin
88af3cfd91 rockchip/rk3288: bugfix, incorrect clock operate on hevc
On rk3288, vpu clock should be raised when 4k h.264 decoding,
but on previous judgement branch code, judgement do
not distinguish vpu or hevc would make incorrect clock
raise when hevc running.

Change-Id: Idb8e5a9dde1e8eb063658c9610ac839c8c69b6ce
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2019-04-12 18:21:01 +08:00
Wang Panzhenzhuan
3a2b113d58 ARM: dts: rockchip: rk3288-th804-avb: camera pinctl default pull down
fix rk3288 camera PIC_SIZE_ERR in first start state

Change-Id: I52f9d348dd521b1d34b78adca740205ce52704bf
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-04-12 18:20:21 +08:00
Wang Panzhenzhuan
5b397694df media: i2c: gc2145: fix cts PIC_SIZE_ERR
fix following cts stuck:
android.hardware.cts.CameraTest#testVideoSnapshot
error log:
rkisp1: CIF_ISP_PIC_SIZE_ERROR (0x00000001)
rkisp1: isp icr v_statr err: 0x48
rkisp1: Too many isp error, stop isp!

Change-Id: Icd1102a045eb6b6eef631be8fe1968e6b74408b3
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-04-12 17:40:43 +08:00
XiaoDong Huang
f9768f08f3 arm64: dts: rockchip: rk1808: disable peri ms and sram auto CS
Dfs, flash, reboot test will be failed if peri ms
and sram auto CS are enabled. So disable them first
and we will continue to analyze the reasons.

Change-Id: Ife20f25fb28acf0042a23b1edfc73705edc668db
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2019-04-12 14:52:26 +08:00
Liang Chen
13c3db9dca ARM: dts: rockchip: delete gpu 100MHz for rk3288
100MHz will hurt performance when app startup.

Change-Id: Ia55a5f53b101559b9d6b94ca98609f7072df6d86
Signed-off-by: Liang Chen <cl@rock-chips.com>
2019-04-12 10:12:57 +08:00
Hu Kejun
2ef019b1f1 media: i2c: add RKMODULE_LSC_CFG ioctl
Change-Id: I0076ec2c34f766ec803d113143c553cbc439142e
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-11 18:25:49 +08:00
Randy Li
f28e440e54 video: rockchip: vpu: fix the client type configure
The userspace would use the client type ioctl to make
a session work in secure mode, reuse the undefine
bits of the argument.

This patch would remove the secure mode setting from
the client type argument which was a mistake in a
previous commit, but without the secure mode applied,
nobody would know.

Change-Id: Ifaa976a0c9ab0c981b1f94f4978cd13a61adb0a7
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2019-04-10 16:23:23 +08:00
Yiqing Zeng
3e4999e45b media: i2c: update some regs for sc031gs to improve image quality
Change-Id: Iab9f187eafc7cc7bc5fba4e266bb002552d0d844
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
2019-04-09 20:57:38 +08:00
Liang Chen
0eb7707930 soc: rockchip: pvtm: fix wrong bit offset of ring sel for RK1808 SoCs
Change-Id: I476a9c77cf23b972eee6846e21eb1a3c6f263cca
Signed-off-by: Liang Chen <cl@rock-chips.com>
2019-04-09 19:52:17 +08:00
Xing Zheng
5a76592440 arm64: dts: rockchip: rk3308: keep ext micbias pull-down
Change-Id: I698fc1914139b5a19a10badd1671c0519bac6bd7
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-04-09 14:24:18 +08:00
Shixiang Zheng
a138e144d9 video/rockchip: rga2: fix a page count calc err
the driver has a bug in calc of page num when virtual
address may not 4k align

Change-Id: I65e8d3017a0365409a69e2edce12f2d302bca298
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2019-04-09 12:00:38 +08:00
David Wu
1df1aa9a81 arm64: dts: rockchip: Add dma support for rk3399 spi
The spi5 request number is at DMAC0, others are at DMAC1.

Change-Id: I16ce63617d841f867eb7c831a05145b808f2a1d3
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-04-09 11:59:08 +08:00
Hu Kejun
15d63d517d media: i2c: preisp-dummy: add module information and driver version
Change-Id: Ia695d90eda93bf15c986a19117e4560b688f5caf
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-08 18:19:12 +08:00
Hu Kejun
0aaf1ad626 media: spi: rk1608: change version number
Change-Id: Id4d80bae2494f8caf32eeac24d375aa476c1c2ff
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-08 18:19:05 +08:00
Hu Kejun
de8b82f0ae media: rockchip: cif: add version number
Change-Id: I75960c5d035b11fd9e8ef2a22d77f4337c826e96
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-08 18:18:57 +08:00
Hu Kejun
204ad3801e media: i2c: add driver version
Change-Id: I785a3f21711150e155888e9db8a99ff35b1e4bb6
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-08 18:18:07 +08:00
Hu Kejun
c152d99f40 media: i2c: vm149c: add driver version
Change-Id: I54559eed4bd0ccec36f8b2bd78b808c580b0f60b
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-08 18:16:45 +08:00
Elaine Zhang
b5b0d5415d clk : rockchip: rk1808: add CLK_OPS_PARENT_ENABLE flag for clk npu
Change-Id: I82a1cf3077c275644b9f293f53774e6bcace8e0f
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-04-08 18:15:34 +08:00
Dong Aisheng
f6692b2cea UPSTREAM: clk: core: support clocks which requires parents enable (part 2)
On Freescale i.MX7D platform, all clocks operations, including
enable/disable, rate change and re-parent, requires its parent clock on.
Current clock core can not support it well.
This patch adding flag CLK_OPS_PARENT_ENABLE to handle this special case in
clock core that enable its parent clock firstly for each operation and
disable it later after operation complete.

The patch part 2 fixes set clock rate and set parent while its parent
is off. The most special case is for set_parent() operation which requires
all parents including both old and new one to be enabled at the same time
during the operation.

Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
[sboyd@codeaurora.org: Move set_rate tracepoint after prepare_enable]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
(cherry picked from commit fc8726a2c0)

Change-Id: I8b71c9081a70b13f29a2c12a5b9eae5468c26ec4
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-04-08 18:15:34 +08:00
Dong Aisheng
53e7d7849b UPSTREAM: clk: core: support clocks which requires parents enable (part 1)
On Freescale i.MX7D platform, all clocks operations, including
enable/disable, rate change and re-parent, requires its parent
clock enable. Current clock core can not support it well.
This patch introduce a new flag CLK_OPS_PARENT_ENABLE to handle this
special case in clock core that enable its parent clock firstly for
each operation and disable it later after operation complete.

The patch part 1 fixes the possible disabling clocks while its parent
is off during kernel booting phase in clk_disable_unused_subtree().

Before the completion of kernel booting, clock tree is still not built
completely, there may be a case that the child clock is on but its
parent is off which could be caused by either HW initial reset state
or bootloader initialization.

Taking bootloader as an example, we may enable all clocks in HW by default.
And during kernel booting time, the parent clock could be disabled in its
driver probe due to calling clk_prepare_enable and clk_disable_unprepare.
Because it's child clock is only enabled in HW while its SW usecount
in clock tree is still 0, so clk_disable of parent clock will gate
the parent clock in both HW and SW usecount ultimately. Then there will
be a child clock is still on in HW but its parent is already off.

Later in clk_disable_unused(), this clock disable accessing while its
parent off will cause system hang due to the limitation of HW which
must require its parent on.

This patch simply enables the parent clock first before disabling
if flag CLK_OPS_PARENT_ENABLE is set in clk_disable_unused_subtree().
This is a simple solution and only affects booting time.

After kernel booting up the clock tree is already created, there will
be no case that child is off but its parent is off.
So no need do this checking for normal clk_disable() later.

Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
(cherry picked from commit a4b3518d14)

Change-Id: Idad6e0b3c7e5be87150698257f3fea15061a207e
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-04-08 18:15:34 +08:00
Dong Aisheng
5d94dd443d UPSTREAM: clk: introduce clk_core_enable_lock and clk_core_disable_lock functions
This can be useful when clock core wants to enable/disable clocks.
Then we don't have to convert the struct clk_core to struct clk to call
clk_enable/clk_disable which is a bit un-align with exist using.

And after introduce clk_core_{enable|disable}_lock, we can refine
clk_enable and clk_disable a bit.

As well as clk_core_{enable|disable}_lock, we also added
clk_core_{prepare|unprepare}_lock and clk_core_prepare_enable/
clk_core_unprepare_disable for clock core to easily use.

Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
(cherry picked from commit a6adc30ba7)

Change-Id: Ie4e31b0d6d638f74ee2304735ddec0eecb56d70e
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-04-08 18:15:34 +08:00
Hu Kejun
2c4f3a8ddd media: i2c: imx317: fix blank pixel in right side of picture
Change-Id: Ie36354342308b0b6c6434c5af67f98d7dc4aa459
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-04-08 18:12:06 +08:00
Shixiang Zheng
0550094bdb logo: add logo.bmp which has been converted to rle 8bit
Change-Id: I8ff0f67e81d7c3e6d82bbd179c2f5964b327cfd8
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2019-04-08 15:22:47 +08:00
Shixiang Zheng
cad3fd9d59 ARM: Makerfile: try using python script for auto convert bmp logo
Change-Id: I11730f39b317d1d267e60500f0228bb960e44cce
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2019-04-08 15:22:47 +08:00
Shixiang Zheng
54b39277fc arm64: Makerfile: try using python script for auto convert bmp logo
Change-Id: I7e3ced455f5f7d05b00558d2e7753168a68b7d7f
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2019-04-08 15:22:47 +08:00
Shixiang Zheng
ce0fe97e4e scripts/bmpconvert: add bmpconvert for auto convert bmpfile
Change-Id: Ic1be83af4de8b586b83c3398e42368106a4fd7e2
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2019-04-08 15:22:47 +08:00