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
Sandy Huang
3278d6531e
ARM: configs: rv1126_defconfig: disable CONFIG_ROCKCHIP_DRM_DEBUG default
...
Change-Id: I740f0df37a67c78b796bff4a4c47a7ede67d1606
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
2020-05-25 18:20:35 +08:00
Sandy Huang
1f99b824b1
drm/rockchip: vop: planelist should be control by CONFIG_ROCKCHIP_DRM_DEBUG
...
Change-Id: Ib44510e8087f42e3b30a00e6952241e3da599eea
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
2020-05-25 18:20:35 +08:00
Yao Xiao
3e576b7e9e
ARM: dts: rv11xx-evb-v10: add sdio_pwrseq and enable ext_clk for ap6xxx
...
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com >
Change-Id: Ie12c6cc5c4b424708fe30870156b2aa53765271a
2020-05-25 18:20:35 +08:00
Liang Chen
15699882be
ARM: dts: rk3288: adjust bin-scaling-sel table
...
Change-Id: I63003eb91df5353da67a343c80ff045f58822cbe
Signed-off-by: Liang Chen <cl@rock-chips.com >
2020-05-25 18:20:34 +08:00
Sandy Huang
146219a3db
drm/rockchip: gem: fix dma buffer double unmap error
...
Fixes: f17edd2d3b ("drm/rockchip: gem: add dma buffer map to iommu")
Change-Id: I6381bbacbe36a4c6373b4062626be23ceeaa9c54
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
2020-05-25 18:20:34 +08:00
Yao Xiao
16d779106e
net: rfkill-wlan: enable default ext_clk for wifi module
...
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com >
Change-Id: I18b1fa7c8e68fc4d49810e26e4285d353989c33d
2020-05-25 18:20:34 +08:00
Alex Zhao
2d7c6370ea
net: rockchip_wlan: rtl8723cs: fix some bugs
...
1.enable CONFIG_TXPWR_BY_RATE_EN
2.add 80211R support
3.fix EFUSE_MAP_PATH
Signed-off-by: Alex Zhao <zzc@rock-chips.com >
Change-Id: I4bbe4f78c707639e3f89070b8d6566d2ae897c9f
2020-05-25 18:20:34 +08:00
Alex Zhao
6350c43fae
net: rockchip_wlan: rtl8821cs: enable CONFIG_RESUME_IN_WORKQUEUE
...
Signed-off-by: Alex Zhao <zzc@rock-chips.com >
Change-Id: I5db0646d20840fcc3d01b4af8b0a5259ee8871d4
2020-05-25 18:20:34 +08:00
Alex Zhao
ff1b9f0113
arm64: dts: rockchip: rk3368-tablet: set sdio default sample phase to 90
...
Signed-off-by: Alex Zhao <zzc@rock-chips.com >
Change-Id: I2702cab3288a230616ab3d0f149b59f3d50f3232
2020-05-25 18:20:34 +08:00
Tony Xie
d0a76dd65c
PM / devfreq: rockchip_bus: remove the autocs keyword.
...
1、remove the autocs keyword.
2、use cfg-val instead of timer-us in rk1808.dtsi
3、remove bus-soc node in px30.dtsi
Signed-off-by: Tony Xie <tony.xie@rock-chips.com >
Change-Id: I0f4563476ad7e08ba8dd9d02097eb4448d024ecd
2020-05-25 18:20:34 +08:00
Andy Yan
e0d873e815
drm/rockchip: Convert MCU cmd from rgb565/rgb666 to rgb888
...
VOP wrongly treated MCU cmd as normal rgb data and pass it
to dither module when output mode is rgb565/rgb666, then
the cmd output from vop io is changed.
Here we convert the MCU cmd data from rgb565/rgb666 to rgb88,
so that we can get the original cmd data after dither module.
Signed-off-by: Andy Yan <andy.yan@rock-chips.com >
Change-Id: I7919dfb9d4f6279b82636d68cd7b211047bf1b46
2020-05-25 18:20:34 +08:00
Andy Yan
790c812deb
drm/rockchip: Disable dither for mcu interface
...
VOP MCU interface can't work right when dither enabled.
(1) the MCU cmd will be treated as rgb data then changed by
dither algorithm
(2) the dither algorithm works wrong in mcu mode
Signed-off-by: Andy Yan <andy.yan@rock-chips.com >
Change-Id: I401907e306928d590fddef9099f4a96dbfc7e0f2
2020-05-25 18:20:34 +08:00
XiaoDong Huang
7d70d14c7f
ARM: dts: rockchip: rv11xx-evb-v10: enable rockchip_suspend node
...
Change-Id: I9c2a83cf64f3667d75912b3a118012d9566edffe
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com >
2020-05-25 18:20:34 +08:00
XiaoDong Huang
d178e135e1
soc: rockchip: support rv1126 pm config
...
Change-Id: I91aaaab020dd04362c9f5ca3c585d22181df8be6
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com >
2020-05-25 18:20:34 +08:00
XiaoDong Huang
21d52845a5
ARM: dts: rockchip: rv1126: add rockchip-suspend node
...
Change-Id: I948b343220030982b019f63150cddcb2971dbe36
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com >
2020-05-25 18:20:34 +08:00
XiaoDong Huang
4702a46f04
dt-bindings: suspend: rv1126: add sleep mode config defines
...
Change-Id: I795ada46df0ecba55d675d709dcf2bf61265b43e
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com >
2020-05-25 18:20:33 +08:00
XiaoDong Huang
31d20737b0
ARM: dts: rockchip: rv11xx-evb-v10: fix sleep_pin config
...
Change-Id: Idacd5b3257d53aae8aa71eb464b1bc71580db55c
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com >
2020-05-25 18:20:33 +08:00
Nickey Yang
41fd458194
ARM: dts: rv11xx-evb-v10: adjust panel power on sequence for ili9881d panel
...
According to spec
The minimum time for VDDI/VSP on to reset high is 5ms,
The minimum time for reset to first command is 10ms.
So adjust them to save panel init time.
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com >
Change-Id: Ic6c4240c1d3657d05192a5f13eb4eb469e932191
2020-05-25 18:20:33 +08:00
Tao Huang
962d22e3c2
ARM: dts: rockchip: enable initcall async for rv1126-evb-ddr3-v10-tb
...
Change-Id: Ic8328ab176448a5794412811c4f9a8f43fd890a7
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
2020-05-25 18:20:33 +08:00
Zefa Chen
26861abfa6
ARM: dts: rv11xx-evb-v10: add cam_ircut
...
Change-Id: Ia4bdd66fb87476f0c21f97f3da5ffe0c635dbbe0
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com >
2020-05-25 18:20:33 +08:00
Cai YiWei
1e9c1e6669
media: rockchip: adjust isp and ispp init order
...
Change-Id: I6a84f99d37a4f4114aa7288903c5cfaa82e3adb0
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2020-05-25 18:20:33 +08:00
Finley Xiao
9d089eb791
ARM: dts: rv1126: Add assigned-clocks for rkvenc
...
Change-Id: I5590d91146ab13071f6b79e73980a72eaa087c6e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2020-05-25 18:20:33 +08:00
Finley Xiao
a23ba6b788
ARM: dts: rockchip: rv11xx board: Add regulator for rkvenc
...
Change-Id: If7cdd3173204606ae44fc532b5b89f50d23fc013
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2020-05-25 18:20:33 +08:00