Commit Graph

854085 Commits

Author SHA1 Message Date
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
Ding Wei
7e2e3d6b78 video : rockchip: mpp: issue for delay work timeout and isr handle
if task entry into the state of isr or delay work, the other cannot
entry again.

Change-Id: I953798de4a57829c4734709f7167d6eab167482b
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-05-25 18:27:39 +08:00
Tony Xie
bfb2ae12fe ARM: dts: rv1126: Add bus_soc node.
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: I6f48015cc502ed4121535cd0809d2795a1344772
2020-05-25 18:20:39 +08:00
William Wu
41bbf7d333 usb: gadget: uvc: add a new attribute uvc_num_request
This patch adds a new uvc attribute "uvc_num_request" to
set the number of uvc requests. And the maximum limit is
set to UVC_MAX_NUM_REQUESTS (8), the default value of
uvc_num_request is set to UVC_NUM_REQUESTS (4).

Change-Id: I69d6a4d6547a81b67ce447f271c7a5103671767e
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-05-25 18:20:39 +08:00
William Wu
4ed232cead usb: dwc3: core: increase the DWC3_ISOC_MAX_RETRIES to 50
If usb gadget isochronous run in a high load and high bus latency
system, it may fail to start a transfer for isochronous endpoint,
and retry 5 times is not enough. This patch increases the retry
times to 50.

Change-Id: Id95a2b4fb09c3103a1da456b6ccb54ed24d03197
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-05-25 18:20:39 +08:00
Ding Wei
b3bf1a31b8 video: rockchip: mpp: fix issue for grf_info is null
Change-Id: I6250029fc3e34d4c5888c7d6c95cdb5164586308
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-05-25 18:20:39 +08:00
Hu Kejun
9c1a6c96d1 media: rockchip: isp: add missing dpcc1/dpcc2
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I1fad9f1d6b9274a9218c00022f17a60b5b421468
2020-05-25 18:20:39 +08:00
Hu Kejun
c88917006d media: rockchip: isp: set tmo_en/mge_en by hdr mode
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I2a116e6a1db44b5665347b0bcf11e6e2cbc844e2
2020-05-25 18:20:39 +08:00
Wyon Bi
cc3b756fa7 clk: rockchip: px30: Add CLK_SET_RATE_PARENT for clk_i2s0_tx_out_pre
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I18e86d31ece992af568fca12c9af2b04f327dd67
2020-05-25 18:20:38 +08:00
Zefa Chen
c3d392507e media: i2c: os04a10 support conversion gain switch control
Change-Id: If5af4eeeab88a28a0a4676733e38bbfcef56e224
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2020-05-25 18:20:38 +08:00
Zefa Chen
3e0d014bd0 media: i2c: imx347 fixed exposure issue
Fix HDR frame rate, correct Tline
support conversion gain control

Change-Id: I7c9c8a6b81206f46d2d3f3f4e0580e7831b32fd3
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2020-05-25 18:20:38 +08:00
Zefa Chen
e34fc5b233 include: rk-camera-module: add cmd for conversion gain
Change-Id: If756567d63696131e8c67d14fd08d751f58c443d
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2020-05-25 18:20:38 +08:00
Zefa Chen
bb3f6ea126 media: i2c: imx347 HDR2X raw10 fixed fps to 25
Change-Id: I5abeb676f40e1a96e06e3cd6b084a8587bb797a8
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2020-05-25 18:20:38 +08:00
Weiwen Chen
ec8a19f069 ARM: dts: rv1126: Add rv1126-evb-ddr3-v10-spi-nand.dts for spi nand board
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ib01ffdb6f01dc62cca4f00c74afb77f8d8fc4042
2020-05-25 18:20:38 +08:00
Jianqun Xu
5fd8f9a859 serial: 8250: fix compile warning by unused dma_err
drivers/tty/serial/8250/8250_port.c: In function 'serial8250_handle_irq':
drivers/tty/serial/8250/8250_port.c:1882:6: warning: unused variable 'dma_err' [-Wunused-variable]
  int dma_err = -1;
      ^~~~~~~

Fixes: 68ae37643a ("serial: 8250: support rx dma mode only")
Change-Id: I8c4ca9390777f7e8b07d5c6c329f005546c7d5fd
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-25 18:20:38 +08:00
Sandy Huang
c5bcd2bb7c drm/cma-helper: fix compile error for cpp update to bpp
Fixes 7c7b813de3 ("drm: add support for 10bit yuv format")
Change-Id: I53a397dbc3c222a74aed65d06c1b8806b6bec15c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-05-25 18:20:38 +08:00
Jon Lin
6f477f5527 ARM: configs: rv1126_defconfig: Enable SPI Nand MTD
Change-Id: I5cec3f173bd33dac6c3c57f2c423fe5c959ae650
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
2020-05-25 18:20:38 +08:00
Cai YiWei
9ef4ce87f2 media: rockchip: update isp ispp work mode
Isp transfer to ispp support quick or one frame mode
date support fbc or no fbc, set mode to node before
open ispp dev, default is one frame yuv422 fbc mode.
For the mode:
BIT(2): enable quick
BIT(1): enable yuv422
BIT(0): enable fbc
For example to quick yuv422 fbc mode:
echo 7 > /sys/module/video_rkispp/parameters/mode

Change-Id: I1c92a69c245cbdf85ff6bc9ab23c6e46c51311c0
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-05-25 18:20:37 +08:00
Tao Huang
7e53f0162c ARM: dts: rockchip: Set reboot-freq to 1.2GHz for rv1126-evb-ddr3-v10-tb
Same as boot freq, prevent cpufreq drop to 816MHz which will make vdd_arm
drop to 0.725v.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1c0c95b2ec293e41fdfb68474d62b7aca568fe96
2020-05-25 18:20:37 +08:00
Finley Xiao
655d1dad27 ARM: dts: rv1126: Move opp-suspend to 816MHz
Increase the cpu frequency to 816MHz when cpu resume.

Change-Id: I135d4330b81cd5c4168bda94af1a8e7af42296a7
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-05-25 18:20:37 +08:00
Finley Xiao
0fc3465e84 ARM: dts: rv1126: Add reboot frequency for cpu
Change-Id: Ifa650393c6e08b9fab905e62fc05d92cefff0bc3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-05-25 18:20:37 +08:00
Finley Xiao
947403ae32 ARM: dts: rv1126: Add system monitor node
Change-Id: Ifb655c052b40c878ce48fb668c090e48043e5e2b
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-05-25 18:20:37 +08:00
Cai YiWei
1051f13867 media: rockchip: isp: enable normal read back mode by rx2 link
Change-Id: I0bfd9eac901072eaa685b814917ad09dbc7d00bd
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-05-25 18:20:37 +08:00
Finley Xiao
198e833164 nvmem: rockchip-otp: Add initialization for rv1126
Change-Id: I8cf5da4fc87927e140ac6cc9a7e0ec709908f1d9
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-05-25 18:20:37 +08:00
Tao Huang
ffbc642576 rk: scripts/mkimg: Support repack fit image
Change-Id: I82429ebf1989760c9bfd258debf416d55b4d2cf5
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-05-25 18:20:36 +08:00
Allon Huang
e41faf2861 ARM: dts: link ov4689 with rkcif by mipi on rv1126 evb
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I4a167869bbb60834a6053d4e7f2fd906ad637f50
2020-05-25 18:20:36 +08:00
Allon Huang
af648082b0 ARM: dts: add mipi-csi2 node for rv1126
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: If0489db7768ea90ae38f36621535f38ac6603075
2020-05-25 18:20:36 +08:00
Andy Yan
d536ce198d Revert "drm/rockchip: Convert MCU cmd from rgb565/rgb666 to rgb888"
This reverts commit 509d945c0ef72974cc18f0466cb4e6577a3c6c0e.

Use 79e05b456627("drm/rockchip: vop: Set mcu mode before setting output
mode and dither") as a better workaround.

Change-Id: I0e7fb791d9e14fb19e8f44c7d52eaf11d5d4401c
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-05-25 18:20:36 +08:00
Andy Yan
cb6bdbb874 drm/rockchip: vop: Set mcu mode before setting output mode and dither
When drive vop into mcu mode with mcu_hold enabled,
the following setting of output mode and dither will
not take effect until mcu_hold released.

So we can send mcu cmd at the default output P888 mode,
this give us a changce to avoid the cmd data to be changed
by dither module.

Change-Id: I6b0a23d2cfdacd9b81d0956bea6cedd2dcdde4f6
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-05-25 18:20:36 +08:00
Allon Huang
b2aba76340 ARM: dts: rv1126: add dclk for rkcif
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I2746099f136379b04ff8be6acab03f346f01d96e
2020-05-25 18:20:36 +08:00
Allon Huang
88d1b886cb drivers: media: platform: rockchip: cif: support vicap samples data with mipi for rv1126
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I3c62126cb1f64d0d627d1579fcf2d4d3b11cab0f
2020-05-25 18:20:35 +08:00
Xing Zheng
9c2c33fb10 ASoC: rk3308_codec: enable DAC HPOUT_POP_SOUND LINEOUT
We need to keep HPOUT_POP_SOUND enabled and powered VCM.

Reported-by: XiaoTan Luo <lxt@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I9cd5151dfa6f791985cd381616674df0348e2fcb
2020-05-25 18:20:35 +08:00
Xing Zheng
0864cabb2b ASoC: rk3308_codec: fix anomalous playback during switch HPOUT and LINEOUT
Remove the incorrect POP SOUND steps during switch HPOUT
and LINEOUT.

Change-Id: Ibce70c1c779838fb46fbba2dde00c4eb7ab0d715
Reported-by: XiaoTan Luo <lxt@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2020-05-25 18:20:35 +08:00
Weiwen Chen
813a815854 ARM: configs: rv1126_defconfig: enable build wifi module
Enable AP6XXX wifi module for rv1126/rv1109 evb board.

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I5293a8d4071716532a2d63f88e9c5c20ebd5fd36
2020-05-25 18:20:35 +08:00
Weiwen Chen
3515cd08d8 ARM: dts: rockchip: Add customized definition parameter for rv1126-evb-ddr3-v10-tb
Add rk.root2nd to mount second rootfs.
For example:
rk.root2nd=/dev/mmcblk0p7 or rk.root2nd=/dev/mmcblk0p7.ext4

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I976700bc86e44fcef31ebbe8796e3d8968234024
2020-05-25 18:20:35 +08:00