Commit Graph

854119 Commits

Author SHA1 Message Date
Nickey Yang
a77a960706 ARM: dts: rockchip: rv11xx-evb-v10: fix vcc18_lcd regulator
vcc18_lcd is the power enable pin of dsi panel board, and it
also provides the rst signal of panel through RC circuit.
When we power on and change the pin directly, the rst will not
power down completely, resulting in the probability that the
screen cannot display after reboot.
so fix it.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Ifb47ea23a4bd2d9e41fd317d3c7777e158e54dec
2020-06-03 11:14:31 +08:00
Tao Huang
594b68feba rk: scripts: update mkbootimg/repack-bootimg/unpack_bootimg
AOSP 9f28439ba714 ("fix size of v3 boot header")
Revert 7261bb083a97 ("Check DTB image size for boot image header version 2 and above")
which failed to repack image without dtb.

Change-Id: I591c0c548229e16482352c94651740de3e0e8b76
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-03 10:54:15 +08:00
Tao Huang
76ada3f00a Revert "rk: add .checkpatch.conf to enable strict check"
This reverts commit 539930eb1c.

Change-Id: I399df04be7619fb05cdb78b00405ffd195b1b671
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-03 10:49:24 +08:00
Cai YiWei
eebf9acd6d media: rockchip: isp: fix link setup error
Change-Id: Ie357ae811627f861ba002d1de82adfe61d45b42f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-02 21:37:02 +08:00
Finley Xiao
5dedb0163a clk: rockchip: rv1126: Change parent clock for hclk and pclk pdbus
As dmac aclk comes from hclk pdbus, dmac pclk comes frome pclk pdbus,
dmac aclk should be an integer multiple of dmac pclk and the same
parent with dmac pclk. so let hclk pdbus and pclk pdbus only come from gpll.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia75c3613573f4a6818cbc18668a66736f011c695
2020-06-02 16:17:28 +08:00
Finley Xiao
9713c36a41 ARM: dts: rv1126: set dummy_cpll as fixed clk
If the parent of one clock is cpll and we set it as dummy clock, the
clock will be a orphan clock and the clk provider will register abortively,
as follows.

[    0.000000] rockchip_clk_of_add_provider: could not register clk provider

The cause of the error:
struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id,
                             const char *con_id, bool with_orphans)
{
        /* This is to allow this function to be chained to others */
        if (!hw || IS_ERR(hw))
                return (struct clk *) hw;

        if (hw->core->orphan && !with_orphans)
                return ERR_PTR(-EPROBE_DEFER);

        return clk_hw_create_clk(hw, dev_id, con_id);
}

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7053cd4e0a028a1556c774601d5c01578ee5b1ac
2020-06-02 16:17:28 +08:00
Guochun Huang
5f31e9caba Revert "drm/rockchip: calculate lanes and rate for Main Link Lanes"
This reverts commit 7dd63e4010.

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: If587600bc616c841cd2ce2be94e5aee289170149
2020-06-02 16:15:22 +08:00
Sugar Zhang
79e0f95365 dmaengine: pl330: Remove the burst limit for quirk 'NO-FLUSHP'
There is no reason to limit the performance on the 'NO-FLUSHP' SoCs,
cuz these platforms are just that the 'FLUSHP' instruction is broken.
so, remove the limit to improve the efficiency.

Change-Id: I6a975f48fedcf4a693d093f91294d33724ef5745
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-06-02 14:52:19 +08:00
Huang zhibao
ab63e41354 ARM: dts: rockchip: rv1126-ai-cam-ddr3-v1: add gpio led support
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I1ab82dbf23b90fa11e62176cd47313fa0a50ffdd
2020-06-02 10:40:05 +08:00
Elaine Zhang
71962a7660 clk: rockchip: rk3036: fix up the sclk_sfc parent error
Change-Id: I0903161f34de8f309392bec6926348ffe37ba2f6
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-06-02 09:23:32 +08:00
Cai YiWei
39ac365aec media: rockchip: isp1: fix compile error
Change-Id: I9b814e784c71d85ac870169adef5cbfc683d12b3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-02 09:18:10 +08:00
Huang zhibao
1e0a25a657 ARM: configs: rv1126_defconfig: enable LEDS_TRIGGER_TIMER
For RV1126 AI Camera Demo Board

Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Id99a019a377eb1d436a183c0c81e974cba36d955
2020-06-02 09:15:03 +08:00
Tao Huang
766ae3eacd sysfs: symlink: export sysfs_delete_link()
Used by extcon.

Fixes: 513c60a1ba ("extcon: Add named extcon link")
Change-Id: I5e0e5ab18ecd0e967797a3a8fb52c5f283468643
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-01 15:49:29 +08:00
Tao Huang
7d1e90baf2 net: wireless: rockchip_wlan: rtl8822bs: Fix gcc warning
Change-Id: I6ddc96c8fc3b376e9b3aac541c9398e1dee771d3
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-01 15:49:29 +08:00
Tao Huang
9d81c25455 net: wireless: rockchip_wlan: rtl8821cs: Fix gcc warning
Change-Id: I2652111b1c6329405c86a2bcdabf6e2900d47400
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-01 15:49:29 +08:00
Tao Huang
1d4274d5a5 net: wireless: rockchip_wlan: rtl8723cs: Fix gcc warning
Change-Id: Ie430d798bee86111079f3d9248e445aac2de69a2
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-01 15:49:29 +08:00
Tao Huang
6ee070a357 rk: gcc-wrapper.py ignore km_apphint.c:230
trigger by gcc 9

Change-Id: I1e6718fba642b010eecbd7e9107dbb44e36bd9a4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-01 15:49:28 +08:00
Cai YiWei
c46c287f56 media: rockchip: ispp: stream link enable default
Stream link enable all and async output default.
Setting following to enable stream sync output,
user need to on/off stream link.
echo Y > /sys/module/video_rkispp/parameters/stream_sync

Change-Id: Ib8be75862e8770c7c5dd368dfd7c4879f45a807e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-01 14:51:35 +08:00
Cai YiWei
ccc9c32708 media: rockchip: sync frame id and timestamp for isp and ispp read back mode
Change-Id: I0c7c8dc9ce574680332936f83e034ae8787aa687
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-01 14:51:03 +08:00
Cai YiWei
7b01e68c33 media: rockchip: isp: using long frame id to sync
For read back mode, sof id is refer to long frame id,
so image frame id should using long frame id.

Change-Id: I725f047ebdc8939efd1921dac5a568bfb91b0a9a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-01 14:49:10 +08:00
Cai YiWei
f7f571cf6c Revert "media: rockchip: isp: rkisp1 rename to rkisp"
This reverts commit 87184fa353
Reason for old platform, so isp1 version alone

Change-Id: Ib7fa24d080f31084262d401ef3308879d0ffc99c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-01 14:48:23 +08:00
Alan Stern
c492b822ca UPSTREAM: USB: hub: Fix handling of connect changes during sleep
Commit 8099f58f1e ("USB: hub: Don't record a connect-change event
during reset-resume") wasn't very well conceived.  The problem it
tried to fix was that if a connect-change event occurred while the
system was asleep (such as a device disconnecting itself from the bus
when it is suspended and then reconnecting when it resumes)
requiring a reset-resume during the system wakeup transition, the hub
port's change_bit entry would remain set afterward.  This would cause
the hub driver to believe another connect-change event had occurred
after the reset-resume, which was wrong and would lead the driver to
send unnecessary requests to the device (which could interfere with a
firmware update).

The commit tried to fix this by not setting the change_bit during the
wakeup.  But this was the wrong thing to do; it means that when a
device is unplugged while the system is asleep, the hub driver doesn't
realize anything has happened: The change_bit flag which would tell it
to handle the disconnect event is clear.

The commit needs to be reverted and the problem fixed in a different
way.  Fortunately an alternative solution was noted in the commit's
Changelog: We can continue to set the change_bit entry in
hub_activate() but then clear it when a reset-resume occurs.  That way
the the hub driver will see the change_bit when a device is
disconnected but won't see it when the device is still present.

That's what this patch does.

Reported-and-tested-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Fixes: 8099f58f1e ("USB: hub: Don't record a connect-change event during reset-resume")
Tested-by: Paul Zimmerman <pauldzim@gmail.com>
CC: <stable@vger.kernel.org>

Link: https://lore.kernel.org/r/Pine.LNX.4.44L0.2004221602480.11262-100000@iolanthe.rowland.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
Change-Id: I046ff3904f4f56388a992eaa9049d3ab6d53c8a5
(cherry picked from commit 9f952e2629)
2020-06-01 14:27:31 +08:00
Wu Liangqing
d04aa4137d arm64: dts: rockchip: rk3399-evb-ind-lpddr4-android-avb and rk3399-sapphire-excavator-edp add route_hdmi for hdmi boot logo
Change-Id: I8de8846b6c35247850c9480219bc94c2d0ec3c89
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-06-01 10:17:18 +08:00
Zhenke Fan
79a09942a7 media: i2c: gc4c33: modify the gain effect
update the driver sw 00.01.04 to 00.01.05
add set 720P gain func
fix wbgain reg to reslove the color problem
change gain from 64x binning to 32x binning
add otp and dpc to remove the bad point

Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I57a17458583135f380ccd2f7d6bc5ba671516018
2020-06-01 09:53:00 +08:00
Sugar Zhang
55048c1f07 ASoC: rockchip: pdm: Add register default value.
Change-Id: I59e76b0faba31e4d7592d1cdbaeb30bfa037c527
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-06-01 09:42:33 +08:00
Cai YiWei
bfdb45a89b media: rockchip: isp: fix default link status
Change-Id: I173dd75902bf144e38c11f7d54afb320caafb7d6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-01 09:31:33 +08:00
Cai YiWei
6e74bb2732 media: rockchip: ispp: adjust stop order
Change-Id: Iaf699015d81fd8ccf3d2afd919eea0cf313a40c6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-01 09:26:56 +08:00
Wang Panzhenzhuan
0e0a8c0f93 arm64: dts: rockchip: px30-evb-ddr3-v10: enable camera configs
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I8fe405c0b82c102751f65cc718b84d502276f47d
2020-05-29 18:28:36 +08:00
Wang Panzhenzhuan
d5d7fd12a6 ARM: dts: rockchip: 3288-android fix CIF_ISP_PIC_SIZE_ERROR when use dualview
The defaultly SYS_STATUS_ISP & SYS_STATUS_DUALVIEW ddr rate 396MHz
is low when use dualview and open camera simultaneously;
it causes CIF_ISP_PIC_SIZE_ERROR, so raise it;

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I7c919404a31ac8b315b575ed4925e9268fa64eee
2020-05-29 16:54:22 +08:00
Mark Huang
385722628b ARM: dts: rockchip: rv1126-ai-cam-ddr3-v1: update camera-module-name
Change-Id: Id4435a92b9aa35496338eb7957a239426891a92d
Signed-off-by: Mark Huang <mark.huang@rock-chips.com>
2020-05-29 14:48:28 +08:00
Jianqun Xu
f6d7a01d49 soc/rockchip: disable force_jtag for RV1126 SoC
Change-Id: I4f9ba7762df9c538bf03ed3dcf0cdef74cec4892
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-29 11:49:32 +08:00
Tao Huang
55db69d112 ARM: configs: enable CONFIG_COMMON_CLK_PROCFS for rv1126-evb-ddr3-v10-tb.config
Change-Id: I6d647b8dc1b6cab02c9558ad020cec9adfc0428b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-05-28 20:18:49 +08:00
Elaine Zhang
df8a387b7b clk: add COMMON_CLK_PROCFS to support clk debug
Add /proc/clk/
summary: dump clk tree
rate: set clk rate by clk name
enable: enable/disable clk by clk name
parent: set clk parent

Change-Id: Iea0570e74a410a05b3bd29dcd2816dd1320d4ff5
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-05-28 20:08:26 +08:00
Hu Kejun
eb6c5d74a4 media: rockchip: ispp: support config fec in stream
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I3a76d6479a0d2df7808e4e9c42f2b10f8ed65265
2020-05-28 18:55:56 +08:00
Tao Huang
9e109a2600 ARM: dts: rockchip: reserve 32KB shared memory for rv1126-evb-ddr3-v10-tb
Reserve shared memory between Trust and Linux.

Change-Id: Ifb06c758f6e19d2c79fb3047a8ae2787576801f1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-05-28 09:37:46 +08:00
Zefa Chen
c154f7c2b4 media: i2c: rk_ircut: add entity flags to distinguish vcm and ircut
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iae2c60b8b904fdb574baf046c73d2058d1572f9a
2020-05-28 09:14:04 +08:00
Cai YiWei
cafbe5dcdc media: rockchip: fix isp and ispp frame id error
Change-Id: I8a4b80411a712b3e080ca95841d98c9891a8f4b6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-05-27 18:40:09 +08:00
Wu Liangqing
c0535e09de arm64: dts: rockchip: rk3399-evb-ind: set vdd_log compatible as regulator-fixed
fix:
[    0.454816] of_pwm_get(): can't parse "pwms" property
[    0.455277] pwm-regulator vdd-log: Failed to get PWM: -2
[    0.455762] pwm-regulator: probe of vdd-log failed with error -2

Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I0ca4f0ab2d2bde6e17507477f8b7c29882edab46
2020-05-27 18:37:14 +08:00
Cai YiWei
373ff84338 media: rockchip: ispp: fix fec image error
Change-Id: Ifcd6bf83f92624c9e14bbc48b1f7df11d698a401
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-05-27 17:47:14 +08:00
Jianqun Xu
1c83b7de94 ARM: configs: rv1126_defconfig: set CONFIG_CMA_SIZE_MBYTES=8
For RV1126 evb, total dma alloc is 1886 pages, about ~8MiB, so
reserved 8MiB for linux default cma pool.

Change-Id: I33c1d054c3862facb1eefc898aa79491864c4ae5
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-27 17:46:39 +08:00
Tony Xie
9d2c26a278 PM / devfreq: rockchip_bus: add support for rv1126.
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: I505d0aa047a347674ad54db18110876cb85937c0
2020-05-27 16:59:17 +08:00
Tony Xie
3bd4dd984b ARM: dts: rv1126: Add CPU idle states node.
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: Ifcf7ea4c04f46da6c82af524574453920b9c174d
2020-05-27 11:54:16 +08:00
Yu YongZhen
43e222d994 ARM: dts: rv11xx board: disable isp mmu
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
Change-Id: Ibf146f38398fbd5695db5f062f09a474963f4cd5
2020-05-26 19:54:23 +08:00
Jianqun Xu
359ab0d61e ARM: dts: rv1126: reserve 104MiB cma region for rkisp
Reserve 104MiB cma region for rkisp.

Change-Id: If86947071dc0b11ee70c23d7bf62e200e48214cb
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-26 16:26:46 +08:00
Jianqun Xu
fe9d706bb7 media: rockchip: isp: init reserved memory for isp device
Change-Id: I43744fd48e5791d7788bd1fc69e9870d97b95c3d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-05-26 16:19:55 +08:00
Jianqun Xu
dfe1c4c263 ARM: configs: rv1126_defconfig enable DMA_CMA
For ISP

Change-Id: Ibaf40f0e01516a47ca0b0285ae1e662cd5ddf29b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-26 15:51:52 +08:00
Hsin-Yi Wang
4c9b7614d2 UPSTREAM: fdt: Update CRC check for rng-seed
Commit 428826f535 ("fdt: add support for rng-seed") moves of_fdt_crc32
from early_init_dt_verify() to early_init_dt_scan() since
early_init_dt_scan_chosen() may modify fdt to erase rng-seed.

However, arm and some other arch won't call early_init_dt_scan(), they
call early_init_dt_verify() then early_init_dt_scan_nodes().

Restore of_fdt_crc32 to early_init_dt_verify() then update it in
early_init_dt_scan_chosen() if fdt if updated.

Change-Id: Ided4eb708f82e6a7d30526fcd80a8a25d35632b1
Fixes: 428826f535 ("fdt: add support for rng-seed")
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit dd753d961c)
2020-05-26 11:34:25 +08:00
Zefa Chen
dd5fed9716 media: i2c: os04a10 add debug interface for conversion gain
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I7d60390cc97746a1bb92d40f208c2c76e42ef62e
2020-05-25 19:40:54 +08:00
Zefa Chen
b5e5546377 media: i2c: imx347 add debug interface for conversion gain
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id90e2d7aaa46ecfcda06bd9c71706321159e9024
2020-05-25 19:39:09 +08:00
Hu Kejun
5b213a010d media: rockchip: move start/stop event for params to ispp for isp20
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I74e6056d253596019aea72d614afda7c13f23746
2020-05-25 19:13:00 +08:00