Commit Graph

860628 Commits

Author SHA1 Message Date
Sandy Huang
4267ed97e7 drm/rockchip/rk628: combtxphy: update for GVI mode
Change-Id: Iea5a38e5c8ee1f1e3af44f7765f34e37147ffedf
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-10 14:18:09 +08:00
zhangqing
7840bf51dc clk: rockchip: rk3568: fix up the clk_rtc32k_frac definition error
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
Change-Id: I302ef30015d9afca7ad6ded20d6ee35167bec121
2020-12-10 14:12:32 +08:00
William Wu
f1c95218b2 usb: dwc3: gadget: fix time out waiting for setup phase when stop gadget
If dwc3 failed to init ep0 in __dwc3_gadget_start(), the ep0state will
be uninitialized, aka, ep0state is EP0_UNCONNECTED, in this case, we
don't need to wait for control transfer completion when stop gadget
because no usb control transfer in process. This patch can help to avoid
the following warning in RK356x Boards during shutdown process.

[   30.735323] usb ffs open    D    0   309      1 0x0400002d
[   30.735330] Call trace:
[   30.735336]  __switch_to+0xe4/0x138
[   30.735348]  __schedule+0x2f4/0x930
[   30.735358]  schedule+0x38/0xa0
[   30.735368]  schedule_timeout+0x194/0x478
[   30.735378]  wait_for_common+0x130/0x1e8
[   30.735388]  wait_for_completion_timeout+0x10/0x18
[   30.735399]  dwc3_gadget_pullup+0x68/0xc8
[   30.735411]  usb_gadget_disconnect+0xf0/0x110
[   30.735422]  usb_gadget_remove_driver+0x24/0x70
[   30.735431]  usb_gadget_unregister_driver+0xd0/0x120
[   30.735441]  unregister_gadget+0x20/0x50
[   30.735450]  unregister_gadget_item+0x24/0x38
[   30.735461]  ffs_data_clear+0x120/0x130
[   30.735471]  ffs_data_reset+0x14/0x58
[   30.735480]  ffs_data_closed+0x88/0xd8
[   30.735490]  ffs_ep0_release+0x10/0x20
[   30.735501]  __fput+0x88/0x1b8
[   30.735510]  ____fput+0xc/0x18
[   30.735521]  task_work_run+0x94/0xb0
[   30.735531]  do_exit+0x334/0xa28
[   30.735540]  do_group_exit+0x34/0x98
[   30.735550]  get_signal+0xe4/0x828
[   30.735557]  do_signal+0x1c0/0x298
[   30.735563]  do_notify_resume+0xd0/0x118
[   30.735568]  work_pending+0x8/0x10
[   30.735602] sysrq: Kill All Tasks

Change-Id: I3534b710804e099d857149b0b0b58a7a7236b8fc
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-12-10 09:55:32 +08:00
Bian Jin chen
737d1b5f7b arm64: rockchip_defconfig: enable CONFIG_INCREMENTAL_FS by default
Test:
    CtsIncrementalInstallHostTestCases
    android.incrementalinstall.cts.IncrementalFeatureTest

This config will enable the Incremental File System, which allows
Android OS to receive streamed APKs over adb.

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I4237fdeb1f5edf0e5f662236e6c97a6d7aae19e3
2020-12-09 17:58:14 +08:00
Shawn Lin
eb5b4e2042 PCI: rockchip: dw: Fix compile error for debug function
It seem we lose struct dw_pcie  definition on the way of
rebasing the orinial commit. Fix it.

Change-Id: I0f97b20960f5647251257cf65e862aeaa39f2b7d
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-09 17:24:10 +08:00
Shawn Lin
d38988a104 PCI: rockchip: dw: decrease linking timeout to 10s
The original waiting time is too long for setting up a link, so
let's decrease it to 10s which is enough for real usecase.

Change-Id: Ifb1eb0d7784e9afeef165f084bc3bda49b41618e
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-09 17:24:10 +08:00
Yu Qiaowei
2af29f5de3 video/rockchip: rga2: Modify the initial value of ktime_t.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ibb7226351956951ac9f805c6e79fa6ac720e209d
2020-12-09 14:19:51 +08:00
Sandy Huang
1b7d995fb2 drm/rockchip: vop2: add support post scale
Change-Id: I564235c41a59b767f433cfc2eb85cf8f71eea74c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-09 14:18:37 +08:00
Tao Huang
2a4e295a77 arm64: dts: rockchip: Remove rk3568-android.dtsi from rk3568-evb1-ddr4-v10.dtsi
rk3568-android.dtsi should included in dts.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I08ee2e2930152f74c726359e9b8880122255dd80
2020-12-09 11:43:56 +08:00
Zefa Chen
7055320802 arm64: dts: rockchip: rk3568 evb1 ddr4 add camera config
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib02978e551304dd287bed948c221ab776346d229
2020-12-09 10:56:47 +08:00
Jianqun Xu
f8e80bc98a pinctrl: rockchip: rk3568: fix strength setting bug
This patch fix following pins error design:
4a7/4b7/4c7/4d7, 3a7/3b7/3c7/3d7, 2a7/2b7/2c7/2d7, 1b7/1c7/1d7
share register with:
4a6/4b6/4c6/4d6, 3a6/3b6/3c6/3d6, 2a6/2b6/2c6/2d6, 1b6/1c6/1d6

Change-Id: I66fa6b261f2bec26b75750a77a56b372282b222f
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-12-09 10:03:02 +08:00
Zhenke Fan
78e78be266 media: i2c: add gc4663 driver
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I27ed48edc0773fd5fb0c6c9c8c80d5c43957521f
2020-12-08 20:43:44 +08:00
Alex Zhao
cee4c3d6b8 net: rockchip_wlan: update rtl8821cs to "v5.12.0-8-g39bbb8dd2.20201015_COEX20200730-5151"
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I0678acad3e33911177f865a26e34ca6639187004
2020-12-08 20:40:47 +08:00
Jianqun Xu
8095f58fbf ARM: configs: rv1126_defconfig: CONFIG_CMA_ALIGNMENT = 0
Change-Id: Iaaab6972679208ee25da8c08e888cf5130657b60
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-12-08 20:40:47 +08:00
Jianqun Xu
d84775858a cma: decrease CMA_ALIGNMENT lower limit to 0
Change-Id: Ia1cde062e3ab9fd3f94d757f08a9b3ca953728f2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-12-08 20:40:46 +08:00
Shawn Lin
3ca937494c arm64: dts: rockchip: Add PCIe for rk3566-evb2-lp4x-v10
Change-Id: Idf823c7657942290a03eddba615bb44e6ccc5d7a
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-08 20:40:46 +08:00
Shawn Lin
c07bd0ba5e phy: rockchip: naneng-combphy: Add external refclk support
Change-Id: Iac968aa7ffd862533c7ca76dea82e083e957345c
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-08 20:40:46 +08:00
Hu Kejun
9b269cfbcf media: rockchip: isp: fix bug of scheduling while atomic
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ic02fc10aa58cb25effd25144ce0eca850324e8d8
2020-12-08 20:40:46 +08:00
Yu Qiaowei
3265071d3b video/rockchip: rga2: Some new features of Alpha mode.
1. Support colorkey.
2. Support blend mode to restore real color.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I8eb6e60d4b9d3c5b6cc280e33edb9f0f3f08f2e2
2020-12-08 20:40:46 +08:00
William Wu
f028645555 phy: rockchip: inno-usb2: fix force mode for rk3568 otg
This patch adds a new vbus_detect helper function to control
the vbus voltage level detection for rk3568 otg port. And
fix the issue that the bvalid irq status and id irq status
are not handled in the rockchip_usb2phy_irq() for otg host
mode when force mode via the sys interface "otg_mode".

Change-Id: I75a102034e8dd3ad47de67da4e5120e28564368e
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-12-08 20:40:46 +08:00
Binyuan Lan
a991b554a3 arm64: dts: rockchip: Fixed SPDIF configuration for rk356x evb
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: Ic1f1bba75ba8ae0b033d9a9e7a3933dd4a7af5ae
2020-12-08 14:07:21 +08:00
Finley Xiao
93f3dd8031 clk: rockchip: rk3568: Fix clk_tsadc_tsen mux width
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I659b4e501e7fe8ad769bbd017f615d6ae359cf1c
2020-12-08 10:30:09 +08:00
Luo Wei
61ae54415d arm64: dts: rockchip: add IR receiver dts for rk3568-evb2 board
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: Iff150afdbe72858fbf98af59e037344d9b785dec
2020-12-08 10:29:47 +08:00
Jianqun Xu
b4a884a2ff ARM: dts: rockchip: rv1126-pinctrl update by new version pin2dts
The pin2dts tool has fixed some bugs, do generate the rv1126-pinctrl
codes with new tool.

Change-Id: Ie932397064bc8f0022cbdf9a6e8e4242cd4d8ad8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-12-08 09:40:30 +08:00
Wu Liangqing
e28e51dabc driver: input: touchscreen: gslx680_pad add work for fw download
Change-Id: I06842c0fc9bd3a7c5b0bdf962e7663b3662ccfbc
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-12-08 09:25:43 +08:00
Andy Yan
de0105f86b arm64: dts: rockchip: set ACLK_VOP to 500M for rk3568
Change-Id: I63700a310af396ee54f71a94e6d53941b33c1b8a
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-12-07 18:08:50 +08:00
Elaine Zhang
7bfac96e1b clk: rockchip: rk3568: add CLK_SET_RATE_NO_REPARENT flag for clk_rtc_32k
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I7ccec23c195f7901cc148b621a4580dbf8bc2770
2020-12-07 17:17:16 +08:00
Sandy Huang
f218d7cbe6 drm/bridge: rk630: move bt656 decoder enable to last config
Change-Id: I7e3e153f71931c448a2f7ecd01395b73369e934a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-07 16:22:42 +08:00
Sandy Huang
2ffcd9119d drm/rockchip: vop2: update output mode for bt656
Change-Id: Ic6526fe070f05579b013b77a8ea6dd921440cbd8
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-07 16:22:35 +08:00
Wang Panzhenzhuan
2a87dcbb15 media: i2c: ov8858: fix unexpected id issue
ov8858 checked unexpected sensor id, while ret may be 0;
thus it will continue register, but ov8858_global_regs
& supported_modes are still null pointer.
This results crash in ov8858_s_power function, when ov8858_global_regs
& supported_modes are called; so fix it.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Idb65a593f526572f4a4423464a1daf0299a3aa5c
2020-12-07 15:35:36 +08:00
Wu Liangqing
99e10612ff arm64: dts: rockchip: add rk3568-evb2-lp4x-v10 for rk3568 evb2
Change-Id: Ic8b384e260abf71b4e9f1f030f46105554558892
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-12-07 15:33:09 +08:00
Binyuan Lan
4344dfe716 arm64: configs: rockchip_defconfig: enable es7202 & es7243e
This is needed by rk3566-evb2 mic array board

Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: Iefbf9d411af43a08be491d5a58a226ef83678e8a
2020-12-07 14:27:08 +08:00
Shawn Lin
b11a801fd6 mmc: sdhci-of-dwcmshc: Reset the previous DLL settings
Reset the previous DLL settings left out from loader in case
of running initial booting with mismatch DLL settings.

Change-Id: Icba9ddcafc3969f7869a6ba31a017db6be0c885e
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-07 14:26:31 +08:00
Wyon Bi
a3a274057c arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Add edp2vga bridge support
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I9d61c86972027431aa7a043887e0a28df6a86370
2020-12-07 14:25:42 +08:00
Wyon Bi
dabb759354 arm64: dts: rockchip: rk3568-evb1-ddr4-v10: Add edp2vga bridge support
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Iee2bd1c111fa133364493ad1a679c4dd6f5a756a
2020-12-07 14:25:42 +08:00
Ren Jianing
e29b8140d4 usb: gadget: f_uac: update maxpacket in function bind
This patch fixes the bug of RV1126 USB crash when configed as
UVC + UAC + RNDIS + ADB. If we resize txfifo before opening
UAC stream, the maxpacket of epin will be the default value
1024 and txfifo will exceed the maximum limit.

Fixes: e658b2131e ("usb: dwc3: gadget: fix tx fifos resize for disabled eps")
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I1e892b11a0bdda2877d3e17148867d21cb68238c
2020-12-07 14:20:11 +08:00
Andy Yan
278370effb drm/rockchip: vop2: Add afbc offset transformat support
This is a transformat of non-16 pixel align.

Change-Id: If132f4f049cb4514c9684e0f1d5103da64abe03a
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-12-07 14:19:08 +08:00
Bian Jin chen
cc17d59237 ARM: rockchip_defconfig: enable CONFIG_HID_NINTENDO by default
Test:
    android.hardware.input.cts.tests.NintendoSwitchProTest#testAllKeys
    android.hardware.input.cts.tests.NintendoSwitchProTest#testAllMotions

This config will enable the Nintendo Switch Pro controller driver.

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I4a29d458c3a0d82dec33e4b3990888217d580298
2020-12-07 14:18:06 +08:00
Bian Jin chen
1094aefeb7 arm64: rockchip_defconfig: enable CONFIG_HID_NINTENDO by default
Test:
    android.hardware.input.cts.tests.NintendoSwitchProTest#testAllKeys
    android.hardware.input.cts.tests.NintendoSwitchProTest#testAllMotions

This config will enable the Nintendo Switch Pro controller driver.

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I3347b07b263559fccf0b94d4253f00cddfb547c6
2020-12-07 14:14:41 +08:00
Elaine Zhang
232e59ccd7 arm64: dts: rockchip: rk3568: init more clock frequencies
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I334c4e249bd560d56ee00fdfb5af241aecc5a083
2020-12-07 09:19:42 +08:00
Elaine Zhang
dc6751a027 clk: rockchip: rk3568: add CLK_SET_RATE_NO_REPARENT flag for rkvdec
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I2126cd5833319dfdd097259a340d4c21480e4c4d
2020-12-07 09:19:14 +08:00
Elaine Zhang
0657602584 clk: rockchip: rk3568: export cpll_xxx clk id for more function
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I5f310f9b857623a5a204ab9b5f0a4befde894684
2020-12-07 09:18:27 +08:00
Binyuan Lan
3b060980d1 arm64: dts: rockchip: add rk3566-evb2-lp4x-v10-mic-array board
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: Ief805a80214539935e91572f00cc0931306a6164
2020-12-05 18:33:10 +08:00
Binyuan Lan
fcfc85821e ASoC: es7243e: modify the names of compatible
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: I19d447977675c71f034cb00db1368fb016546636
2020-12-05 18:04:53 +08:00
Binyuan Lan
a5009a0dbe ASoC: es7202: modify the names of compatible
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: Ia4ee00e92e52da293d9ce45518f89d31359e2d8b
2020-12-05 18:03:35 +08:00
Binyuan Lan
02a49287b0 ASoC: es7243e: add es7243e I2S adc support
ES7243E is 2-ch ADC with I2S interface for Microphone Array

Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: I3c61f5feccad9362e2859d7646e88a0e990c998c
2020-12-05 15:25:46 +08:00
Binyuan Lan
8b96ac442b ASoC: es7202: add es7202 pdm adc support
ES7202 is 2-ch ADC with PDM interface

Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: Id204f592ed91bbdddd71b6dda2e6e0bbae4bb9e8
2020-12-05 15:25:46 +08:00
Wu Liangqing
8dd999589d arm64: dts: rockchip: rk3566-rk817-tablet: set i2c3 clk 400K
improve gslx tp download fw speed on resume

Change-Id: Ie87631de5227bc44d53e66eeb52ddc3a6afb5c0e
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-12-05 15:18:19 +08:00
Liang Chen
caeb5624bb arm64: dts: rockchip: adjust include file for rk356x board
Change-Id: I74ff7ae2017bd8e016cbbaec2a51d50412d3090c
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-12-05 14:36:55 +08:00
Liang Chen
5a2cf63774 arm64: dts: rockchip: add core dtsi for RK3566 Soc
RK3566 is a Soc from Rockchip, which embedded with quad
ARM Cortex-A55.

This patch add basic core dtsi file for RK3566.

Change-Id: Ide02369e6be3515fb7ec62bea4069f476374f897
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-12-05 14:36:55 +08:00