Commit Graph

862781 Commits

Author SHA1 Message Date
Sugar Zhang
056b14d319 ASoC: rockchip: i2s-tdm: Shift rate back to 0 ppm when restart
Change-Id: I42e0d316586b75a247c82eb579b92b1ec828532b
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-01-22 20:12:59 +08:00
Finley Xiao
a80881a184 soc: rockchip: opp_select: Fix division by zero warning
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ice0f6fab6b89d8f02881a67573376bbdbcebf2c6
2021-01-22 20:12:59 +08:00
Yu Qiaowei
aa49aaa78e video/rockchip: rga2: Modify the format of YUYV and RGB565.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Id1c1e77bddfc909c643f07b0ff0a9fa07059688b
2021-01-22 20:12:59 +08:00
Huang zhibao
e6b0d3b1a1 arm64: configs: add rk3568_nvr.config for nvr
make ARCH=arm64 rockchip_linux_defconfig rk3568_nvr.config

Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Ifda511ee6a0e964eccc53ffb405fbfa9eba48767
2021-01-22 20:12:59 +08:00
Huang zhibao
ba8400809e arm64: dts: rockchip: nvr: add rk3568-nvr-demo-v12-linux dts
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I7602f3a401f56bf6ab7b56c73f6687ed3cd2cdcc
2021-01-22 20:12:59 +08:00
ZiHan Huang
dceeebfdbb arm64: dts: rockchip: rk3568-evb6-ddr3-v10: support os04a10 ov5695 gc8034
Change-Id: I4904b1179293b90952ae6634903943e00ec1c400
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com>
2021-01-22 20:12:59 +08:00
Vicent Chi
38df211534 media: cif: add stream sequence conifg strategy
Change-Id: If6dca4ca1243f218f3e429a6628aae56a35d9058
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
2021-01-22 20:12:59 +08:00
David Wu
936357d72a UPSTREAM: net: stmmac: Fixed mtu channged by cache aligned
Since the original mtu is not used when the mtu is updated,
the mtu is aligned with cache, this will get an incorrect.
For example, if you want to configure the mtu to be 1500,
but mtu 1536 is configured in fact.

Fixed: eaf4fac478 ("net: stmmac: Do not accept invalid MTU values")
Change-Id: I0dc9fee8540fe76d1e583112bbe5326091b8a901
Signed-off-by: David Wu <david.wu@rock-chips.com>
Link: https://lore.kernel.org/r/20210113034109.27865-1-david.wu@rock-chips.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 5b55299eed)
2021-01-22 20:12:59 +08:00
Alex Zhao
5ddff64edb net: wireless: rkwifi: bcmdhd: Add country code list support
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I63721af56d9f0f65b3f1a65fff822c7552c9b7fa
2021-01-22 20:12:59 +08:00
Jianhui Wang
259ea199e5 arm64: rockchip: dts: enable pcie for rk356x evb
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: I31906f667315e67f633e2cd98d832731540e8131
2021-01-22 20:12:59 +08:00
Cai YiWei
29aa91cb2a media: rockchip: isp: fix path select of cif input
Change-Id: I4c48c5cebc876fd19f4a080c1c689f8c1e06d0b9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-22 20:12:59 +08:00
Vicent Chi
41c1b4d8ba media: i2c: add nvp6188 driver
Change-Id: I6dac1dc7bf10555cccb56c625dc032fdeb1f8d41
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
2021-01-22 20:12:59 +08:00
Tony Xie
6db942180f soc: rockchip: rk_fiq_debugger: use the sdei for fiq debugger.
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: Ie97e37cee6bf94df99dbdf50dc3ca8808c73bc01
2021-01-22 20:12:59 +08:00
Weixin Zhou
c48812cf53 arm64: dts: rockchip: rk3566-rk817-eink-w103: fix touch pinctrl setting invalid
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I7ff202c5081562dd0aa871bb00c575dc05c55ecd
2021-01-22 20:12:59 +08:00
Zefa Chen
b936c045b3 media: i2c: sc4232 fixed 2688x1520 linear 10bit to 25fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I038b1543fecc656baadab3dd6cb6bfc7926acaa6
2021-01-22 20:12:59 +08:00
Cai YiWei
fe63f20b12 media: rockchip: isp/ispp fix config of clk_dbg
Change-Id: I884474ffe2d5cf27600f20c4b8d005e317f3ec36
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-22 20:12:59 +08:00
Cai YiWei
8ad3589e44 media: rockchip: ispp: add trigger mode ioctl
sync trigger on/off status with user

Change-Id: Ifc567cc760f5fc106644ce80a6a96c7c5fc1afd2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-22 20:12:59 +08:00
Cai YiWei
5358e9d0b6 media: rockchip: isp: 64 align y size for fbcgain format
Change-Id: Ic1ad912f094a3442e0c4d421f4228dd6c8bbe92c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-22 20:12:59 +08:00
Wu Liangqing
3962ab0701 arm64: dts: rockchip: rk3399-excavator-sapphire: enabled auto-freq-en
Change-Id: I959c4bf9585eeae7eddd6a1a136e7a06a186c7cf
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-01-22 20:12:59 +08:00
Weixin Zhou
2b95a7032b input: touchscreen: cyttsp5: stay awake in irq_handler process
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I4761fa76f6cd0219582d579167f0288b7a28f73c
2021-01-22 20:12:58 +08:00
Weixin Zhou
59ed90e947 arm64: dts: rockchip: rk3566-rk817-eink-w6: adjust battery capacity
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I349aafbb197152fbb2ffdb2eef13a1b6fcb30ceb
2021-01-22 20:12:58 +08:00
Weixin Zhou
053d3b88f9 input: touchscreen: wacom_w9013: support irq wakeup in idle mode
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I8703e6113f6ad7557127f2dbbe2da625658061ad
2021-01-22 20:12:58 +08:00
Wei Chen
57f68fafbc arm64: dts: rockchip: add rk3568-evb1-ddr4-v10-linux-spi-nor
Signed-off-by: Wei Chen <wei.chen@rock-chips.com>
Change-Id: I092d59a46750ca960b430f062133656de88fe922
2021-01-22 20:12:58 +08:00
Wei Chen
e28f854064 arm64: configs: rockchip_linux_defconfig: enable CONFIG_JFFS2_FS CONFIG_MTD_BLOCK
Signed-off-by: Wei Chen <wei.chen@rock-chips.com>
Change-Id: I6e214b20db59fd917d025a6cc74fdccea93fcae9
2021-01-22 20:12:58 +08:00
Tony Xie
90c0cffbe4 arm64: dts: rockchip: rk3568: Add sdei firmware dt node.
Add sdei firmware dt node for rk3568.

Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: Ie2fa48a8db76d67458728442726b4122f502aa37
2021-01-22 20:12:58 +08:00
Tony Xie
9754b5c03d firmware: rockchip: add sip_fiq_debugger_sdei_switch_cpu().
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: I57505879c5db59b08178107c37ba2bb599b3f708
2021-01-22 20:12:58 +08:00
Tony Xie
c31b97d8ed firmware: arm_sdei: add some functions for fiq debugger.
1. add sdei_event_routing_set()
2. add sdei_event_routing_set_nolock()
3. add sdei_event_enable_nolock() and sdei_event_disable_nolock()

Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: Ia2471a3ac6a9189888a465a529875957ab9661b6
2021-01-22 20:12:58 +08:00
Allon Huang
a9e17370bb phy: rockchip: csi2-dphy: add mipi dphy dual mode driver for rk3568
divide rk3568 mipi csi2 dphy dev into three logic dev:
dphy0 for full mode, dphy1 and dphy2 for split mode

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Icd4b282b72aa90ca7acd2e02625ae56830c3b12a
2021-01-22 20:12:58 +08:00
Allon Huang
48d1981bb9 arm64: rockchip_defconfig: add CONFIG_PHY_ROCKCHIP_CSI2_DPHY
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I49071bac4bad567515d55b06b1e2594802aabe4a
2021-01-22 20:12:58 +08:00
Allon Huang
e0e682453e phy: rockchip: add rk3568 mipi dphy hw driver
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I6afabfa78abe3202b308e8a4cfd547761bc2a6be
2021-01-22 20:12:58 +08:00
Weixin Zhou
ea187fc45b arm64: dts: rockchip: rk3566-rk817-eink-w6: correct leds-gpio configs
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: If8a70b9aae54179be19a09f964f72e7a89d0f026
2021-01-22 20:12:58 +08:00
Andy Yan
227d9c28c0 drm/rockchip: vop2: Fix wait fs irq
Vcnt is stored in the upper 16 bits.
We should wait for the frame start irq status from
low to high.

Fixes: e6113fb4c5b3 ("drm/rockchip: vop2: wait for next frame when close to
frame start of previous vp")

Change-Id: I8dd0930800ada9796f616d9b3ec1962d213aa9b3
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-22 20:12:58 +08:00
Cai YiWei
076891bc3e media: rockchip: isp: fix gain buf update
isp2.0 one frame read back many times and gain
address will updated at each read back end. To make
sure gain buffer update right, so one last read back
to the frame start to config next buf, and the frame end
will update to shadow reg for ready to receive next frame.

Change-Id: I1be92f92f9489b7d1ffb5ca72a510e9ea45f5ab0
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-22 20:12:58 +08:00
Weixin Zhou
dfbe9efdae arm64: dts: rockchip: rk3566-rk817-eink-w6: adjust vdd_cpu config for lower consumption
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I80d29caa912c6abf3ef0a52a1f3b6cb5bd361912
2021-01-22 20:12:58 +08:00
Alex Zhao
59a625c690 arm64: dts: rockchip: rk3566-rk817-eink-w6: add wifi-bt-power-toggle
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I8d2dedae7552d55b8b8d67f1a59c8c90c8570220
2021-01-22 20:12:58 +08:00
Alex Zhao
e41861ca07 net: rfkill: rk: add wifi/bt main power control
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I56e106056fc2a6e0b8ec4460eb2e90ffa56dfbfa
2021-01-22 20:12:58 +08:00
Ding Wei
fde78f2de6 video: rockchip: mpp: issue for rcbbuf setting
tips:
1. rcb_size == 0, skip it.
2. if current rcb_size is larger then the remaining buffer size,
  skip it instead of break.

Change-Id: Ide37ccbf0af9ceb3f4a6f6fe5e7045bfbd8ddc74
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-01-22 20:12:58 +08:00
Cai YiWei
569ae93661 media: rockchip: isp: support to set format if no streaming
Change-Id: I17b9433eae512aa05b295df6b3e86f5c88db0d47
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-22 20:12:57 +08:00
Wenping Zhang
8fee1ec2e0 arm64: dts: rockchip: rk3566-rk817-eink-w103: add back key support.
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: Iee8f9c3a6b8a447d9e50e1f9b4767848d4ccb1a1
2021-01-22 20:12:57 +08:00
Weixin Zhou
113b6107c5 driver: input: touchscreen: gt9xx: fix irq wakeup fail from deepsleep
1. set edge trigger
2. add wakeup source

Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I7ab5893f435ab9e8baa42c17c63636b38a5eab03
2021-01-22 20:12:57 +08:00
Weixin Zhou
a14a813cde arm64: dts: rockchip: rk3566-rk817-eink-w6: add wakeup-source for gt9xx
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Ic8c18755d426a76d8a0f0df981afbf0287cab683
2021-01-22 20:12:57 +08:00
Ren Jianing
ba8203c1b8 usb: gadget: u_audio: add uevent for ppm compensation
This patch add uevent to notify the application layer how much ppm
is different between USB clk and AUDIO clk.

The event include two parts USB_STATE and PPM. For example:

  g_audio_work: sent uac uevent USB_STATE=SET_AUDIO_CLK PPM=12
  g_audio_work: sent uac uevent USB_STATE=SET_AUDIO_CLK PPM=-1

Note: The ppm compensation depends on the method implement of
clk drift and compensation in the rockchip_pdm.c driver. So if
you want the ppm compensation to take effect, please make sure
the commit "ASoC: rockchip: pdm: Add support for clk compensation"
is merged.

Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: Id25411397fe376342c773c11f1989ed5854f8ad9
2021-01-22 20:12:57 +08:00
Wenping Zhang
6c3d266cc2 arm64: dts: rockchip: add rk3566 eink w103 board.
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: Ieeca4e4fecb3eb9eb5950286f9519bec8c974898
2021-01-22 20:12:57 +08:00
Tao Huang
420237601d Revert "ARM: rockchip_defconfig: enable HZ_1000"
This reverts commit 52d7b98f85.

There is no need to keep HZ=1000 after commit 3be6453a90
("kthread: do not preempt current task if it is going to call schedule()").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I42632c8dab553762574249e7fc219a50a9cf5323
2021-01-22 20:12:57 +08:00
Tao Huang
e8caca4ddf Revert "arm64: rockchip_defconfig: enable HZ_1000"
This reverts commit 9a883c648a.

There is no need to keep HZ=1000 after commit 3be6453a90
("kthread: do not preempt current task if it is going to call schedule()").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id035e01cbf274dce0e6f12caef7f4eeb7efc2406
2021-01-22 20:12:57 +08:00
Liang Chen
580882cffa arm64: dts: rockchip: rk356x: adjust system-status-freq for dmc
Change-Id: I8f59c5457029fd9559f4f366257d68b22e9946c7
Signed-off-by: Liang Chen <cl@rock-chips.com>
2021-01-22 20:12:57 +08:00
Liang Chen
a5cb2bba3a arm64: dts: rockchip: rk3568: adjust opp-talbe when low-temp for cpu
Change-Id: I5fd3fc83285e557a454da25d3cb00ee007e6af60
Signed-off-by: Liang Chen <cl@rock-chips.com>
2021-01-22 20:12:57 +08:00
Tao Huang
013e1bdf50 ARM: rockchip_defconfig: set CONFIG_BLK_DEV_LOOP_MIN_COUNT to 16
Sync to gki_defconfig

CONFIG_BLK_DEV_LOOP_MIN_COUNT must be at least 16 in order
to pass VTS.

Change-Id: I3a0f0a77f8a60cf8a3e48683657f10e160927c58
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-01-22 20:12:57 +08:00
Tao Huang
2d6fe1cb7a arm64: rockchip_defconfig: set CONFIG_BLK_DEV_LOOP_MIN_COUNT to 16
Sync to gki_defconfig

CONFIG_BLK_DEV_LOOP_MIN_COUNT must be at least 16 in order
to pass VTS.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I15e46ac79dc6f149914a540e311369177bccdc23
2021-01-22 20:12:57 +08:00
Tao Huang
d797136cae ARM: rockchip_defconfig: Add CONFIG_UNICODE
Sync to gki_defconfig

Before:
    text	   data	    bss	     dec	    hex	filename
13465267	4345690	2113400	19924357	1300585	vmlinux

After:
    text	   data	    bss	     dec	    hex	filename
13473410	4411226	2113400	19998036	1312554	vmlinux

Change-Id: I023ce20549e9d65198b8a23affe4c9739f867103
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-01-22 20:12:57 +08:00