Commit Graph

1080740 Commits

Author SHA1 Message Date
Johan Hovold
4fa772e757 UPSTREAM: USB: serial: f81534: fix division by zero on line-speed change
commit 188c9c2e0c upstream.

The driver leaves the line speed unchanged in case a requested speed is
not supported. Make sure to handle the case where the current speed is
B0 (hangup) without dividing by zero when determining the clock source.

Fixes: 3aacac02f3 ("USB: serial: f81534: add high baud rate support")
Cc: stable@vger.kernel.org      # 4.16
Cc: Ji-Ze Hong (Peter Hong) <hpeter@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I87d08ff845ec24adae387ce829e56ff34f85ddb6
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c8bf31a00f)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-02-06 11:31:33 +00:00
Johan Hovold
d81b6e6e88 UPSTREAM: USB: serial: f81232: fix division by zero on line-speed change
commit a08ca6ebaf upstream.

The driver leaves the line speed unchanged in case a requested speed is
not supported. Make sure to handle the case where the current speed is
B0 (hangup) without dividing by zero when determining the clock source.

Fixes: 268ddb5e9b ("USB: serial: f81232: add high baud rate support")
Cc: stable@vger.kernel.org      # 5.2
Cc: Ji-Ze Hong (Peter Hong) <hpeter@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Ic145700e95cd93f23fa8574f695a967f0839b624
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 5b75a00416)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-02-06 11:31:31 +00:00
Bruno Thomsen
190b01ac50 UPSTREAM: USB: serial: cp210x: add Kamstrup RF sniffer PIDs
commit e88906b169 upstream.

The RF sniffers are based on cp210x where the RF frontends
are based on a different USB stack.

RF sniffers can analyze packets meta data including power level
and perform packet injection.

Can be used to perform RF frontend self-test when connected to
a concentrator, ex. arch/arm/boot/dts/imx7d-flex-concentrator.dts

Change-Id: Ie15ef418664bb91bb643297696bd3a1b6213eb95
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 9895ce5ea2)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-02-06 11:31:29 +00:00
Duke Xin
34d4848ba3 UPSTREAM: USB: serial: option: add Quectel EM05-G modem
commit f0052d7a1e upstream.

The EM05-G modem has 2 USB configurations that are configurable via the AT
command AT+QCFG="usbnet",[ 0 | 2 ] which make the modem enumerate with
the following interfaces, respectively:

"RMNET" : AT + DIAG + NMEA + Modem + QMI
"MBIM"  : MBIM + AT + DIAG + NMEA + Modem

The detailed description of the USB configuration for each mode as follows:

RMNET Mode
--------------
T:  Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 21 Spd=480  MxCh= 0
D:  Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs=  1
P:  Vendor=2c7c ProdID=0311 Rev= 3.18
S:  Manufacturer=Quectel
S:  Product=Quectel EM05-G
C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=83(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=85(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=87(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 6 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
E:  Ad=89(I) Atr=03(Int.) MxPS=   8 Ivl=32ms
E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms

MBIM Mode
--------------
T:  Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 16 Spd=480  MxCh= 0
D:  Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs=  1
P:  Vendor=2c7c ProdID=0311 Rev= 3.18
S:  Manufacturer=Quectel
S:  Product=Quectel EM05-G
C:* #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA
A:  FirstIf#= 0 IfCount= 2 Cls=02(comm.) Sub=0e Prot=00
I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=83(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=85(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=87(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=0e Prot=00 Driver=cdc_mbim
E:  Ad=89(I) Atr=03(Int.) MxPS=  64 Ivl=32ms
I:  If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim
I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim
E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms

Change-Id: I752f10756ec16da0fedd3f9f0726bec460cbdcb9
Signed-off-by: Duke Xin <duke_xinanwen@163.com>
Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 398215f783)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-02-06 11:31:26 +00:00
Szymon Heidrich
9e620f2b54 UPSTREAM: usb: gadget: uvc: Prevent buffer overflow in setup handler
commit 4c92670b16 upstream.

Setup function uvc_function_setup permits control transfer
requests with up to 64 bytes of payload (UVC_MAX_REQUEST_SIZE),
data stage handler for OUT transfer uses memcpy to copy req->actual
bytes to uvc_event->data.data array of size 60. This may result
in an overflow of 4 bytes.

Fixes: cdda479f15 ("USB gadget: video class function driver")
Cc: stable <stable@kernel.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Change-Id: I397d2362464e0ffa57950871a956ba1529b86dd1
Signed-off-by: Szymon Heidrich <szymon.heidrich@gmail.com>
Link: https://lore.kernel.org/r/20221206141301.51305-1-szymon.heidrich@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c79538f32d)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-02-06 11:31:17 +00:00
Elaine Zhang
558bea7175 Revert "arm64: dts: rockchip: document explicit px30 cru dependencies"
This reverts commit 45cb61b4f3.
For GKI, cru init is deferred_probe_work_func,which make system crash:

[    8.930765][    T6] Unable to handle kernel paging request at virtual
address ffffffc8098270e0
[    8.931691][    T6] Mem abort info:
[    8.932102][    T6]   ESR = 0x96000007
[    8.932541][    T6]   EC = 0x25: DABT (current EL), IL = 32 bits
[    8.933192][    T6]   SET = 0, FnV = 0
[    8.933625][    T6]   EA = 0, S1PTW = 0
[    8.934061][    T6] Data abort info:
[    8.934566][    T6]   ISV = 0, ISS = 0x00000007
[    8.935080][    T6]   CM = 0, WnR = 0
[    8.935516][    T6] swapper pgtable: 4k pages, 39-bit VAs,
pgdp=000000000297f000
[    8.936301][    T6] [ffffffc8098270e0] pgd=000000007ffff003,
p4d=000000007ffff003, pud=000000007ffff003, pmd=0000000003de9003,
pte=0000000000000000
[    8.937821][    T6] Internal error: Oops: 96000007 [#1] PREEMPT SMP
[    8.938493][    T6] Modules linked in: clk_px30(E)
rockchip_cpuinfo(E) clk_rockchip(E) rockchip_sip(E)
[    8.939677][    T6] CPU: 0 PID: 6 Comm: kworker/u8:0 Tainted: G
E     5.10.107 #35
[    8.940574][    T6] Hardware name: Rockchip PX30 evb ddr3 board (DT)
[    8.941305][    T6] Workqueue: events_unbound
deferred_probe_work_func
[    8.942062][    T6] pstate: 60400005 (nZCv daif +PAN -UAO -TCO
BTYPE=--)
[    8.943125][    T6] pc : rockchip_clk_register_plls+0x164/0x1b8
[clk_rockchip]
[    8.944225][    T6] lr : rockchip_clk_register_plls+0x160/0x1b8
[clk_rockchip]
[    8.944991][    T6] sp : ffffffc812c07980
[    8.945453][    T6] x29: ffffffc812c079f0 x28: 0000000000000006
[    8.946173][    T6] x27: 00000000000000a0 x26: ffffffc8098270e0
[    8.946890][    T6] x25: 0000000000000840 x24: c8ffff800530d100
[    8.947607][    T6] x23: 00000000000000d8 x22: 0000000000000004
[    8.948323][    T6] x21: 0000000000000060 x20: 0000000000000001
[    8.949040][    T6] x19: 0000000000000001 x18: ffffffc812b8d078
[    8.949760][    T6] x17: 0000000014d453dc x16: 00000000024a8ec8
[    8.950476][    T6] x15: 0000000000000000 x14: 0000000000000000
[    8.951193][    T6] x13: 0000000000000000 x12: ffffffc810010644
[    8.951912][    T6] x11: 0000000000000082 x10: ff800048097f86dc
[    8.952630][    T6] x9 : 0000000000000027 x8 : 00000000000000ff
[    8.953347][    T6] x7 : ffffffffffffffff x6 : 0000000000000000
[    8.954061][    T6] x5 : 0000000000000000 x4 : a3ffff80048dfc60
[    8.954778][    T6] x3 : ffffffc8097f86dc x2 : 0000000000000001
[    8.955493][    T6] x1 : 0000000000000008 x0 : 70ffff8004165308
[    8.956204][    T6] Call trace:
[    8.956923][    T6]  rockchip_clk_register_plls+0x164/0x1b8
[clk_rockchip]
[    8.957665][    T6]  0xffffffc809825168
[    8.958262][    T6]  clk_px30_probe+0x68/0x88 [clk_px30]
[    8.958866][    T6]  platform_drv_probe+0xc0/0xe0
[    8.959421][    T6]  really_probe+0x304/0x72c
[    8.959943][    T6]  driver_probe_device+0xa4/0xf0
[    8.960509][    T6]  __device_attach_driver+0x1a8/0x1d0
[    8.961108][    T6]  bus_for_each_drv+0xb0/0x10c
[    8.961653][    T6]  __device_attach+0x164/0x1d4
[    8.962201][    T6]  device_initial_probe+0x18/0x28
[    8.962768][    T6]  bus_probe_device+0x58/0xf8
[    8.963308][    T6]  deferred_probe_work_func+0xc0/0x164
[    8.963920][    T6]  process_one_work+0x358/0x700
[    8.964471][    T6]  worker_thread+0x52c/0x918
[    8.964991][    T6]  kthread+0x1f8/0x210
[    8.965466][    T6]  ret_from_fork+0x10/0x30

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I255fb5c008077c0c0b430e6922a2ae414cfd422a
2023-02-06 18:49:39 +08:00
Dingxian Wen
659435873d media: rockchip: hdmirx: fill colorspace and quantification to v4l2_format
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: Iaeea507ea5e81ae5dada265598678ccb8188d48d
2023-02-06 17:20:59 +08:00
Dingxian Wen
238571a101 media: rockchip: hdmirx: modify the enum definition of hdmirx color space
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I23070858c0c7ea573af2bdf34652639bac551e68
2023-02-06 17:20:50 +08:00
Steven Liu
aff83a4a82 arm64: rockchip_linux_defconfig: enable Rockchip RPMsg
Enable the following macros for AMP system:
CONFIG_ROCKCHIP_MBOX=y
CONFIG_RPMSG_ROCKCHIP=y
CONFIG_RPMSG_VIRTIO=y

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I4d82954a441e543627536b9d207e7203c5ab8f7d
2023-02-06 16:28:04 +08:00
Hongming Zou
8ad4a5a8f2 rpmsg: rockchip: add rockchip rpmsg test
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
Change-Id: Ibdecd0d26e258af0b687c44f1aa94833c7101627
2023-02-06 16:27:59 +08:00
Steven Liu
4e6ff4aaac dt-bindings: rpmsg: rpmsg-rockchip: add description for rpmsg-rockchip
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I1a114f460ba751e4f348aa134410cbf86eab2503
2023-02-06 16:27:39 +08:00
Steven Liu
b5795e81ec rpmsg: rockchip: add Rockchip RPMsg Platform Support
Support Rockchip Platform to use mailbox for rpmsg communication
and provide hardware interface for inter-core communication.

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ibf81167f173d25de03de3b9bf25e53479cb557ac
2023-02-06 16:27:29 +08:00
Hongming Zou
1e3b2519b0 ARM: dts: rockchip: add rk3036-evb1-ddr3-v10.dts
Change-Id: Iee527cf67b8ddcb4ec5a38807f657357f4ee3b55
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-02-06 15:52:55 +08:00
Nickey Yang
8a071e9fe8 clk: rockchip: Kconfig: select clk link if rk3562
Change-Id: I311ca6f1b22fb32ccb2dbf685b659a9f738f5faa
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2023-02-06 15:42:49 +08:00
Xing Zheng
ea6df1a5bb ASoC: codecs: rv1106_codec: fixes and clean up DAC steps based on vendor DS_V1P8
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Ifeaec747dda09c6445309e15e43cdb8c30686959
2023-02-06 14:58:59 +08:00
Damon Ding
4e71f3e843 drm/rockchip: rgb: add support for vop3 in mcu cmds sending
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: If3e4d23d83fafc16faba88a3b1f7e441090bbde5
2023-02-06 14:27:00 +08:00
Damon Ding
2780ba1dc5 drm/rockchip: vop3: add support for rk3562 mcu interface
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I5f9a0676bb048bfffcf413fa50029eafd0ce625a
2023-02-06 14:27:00 +08:00
Shawn Lin
3d9af6480a PCI: Mark Micron 2100AI NVMe to avoid using ASPM
From test, 2100AI NVMe randomly reject TLP access when ASPM is
enabled. Especially after powering cycle it, it immediately enters
lower power mode but refuse to ack TLP.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I2ce3e857014296195d91cd89c8185810a271b4af
2023-02-06 14:20:53 +08:00
Zain Wang
49979286c4 arm64: configs: rockchip_linux_defconfig: enable CONFIG_CPU_RK3562
Signed-off-by: Zain Wang <wzz@rock-chips.com>
Change-Id: I226a1d123d550c95c414c7fa1b84480ccfa8644f
2023-02-06 11:32:25 +08:00
Nickey Yang
c67c8fc5b3 crypto: rockchip: Kconfig: select crypto v3 if RK3562
Change-Id: I3d22fa8a12d77c77b32f65e249300817d4fc862b
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2023-02-06 11:28:26 +08:00
Jon Lin
7bb1ff6ff3 mtd: spi-nor: gigadevice: Support New devices
gd55b01ge

Change-Id: I3e7242fcb4433bcfd0ed6769ad939dda6078fe8f
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-02-06 09:09:14 +08:00
Jaewook Kim
a20fd832a4 BACKPORT: f2fs: do not allow to decompress files have FI_COMPRESS_RELEASED
If a file has FI_COMPRESS_RELEASED, all writes for it should not be
allowed. However, as of now, in case of compress_mode=user, writes
triggered by IOCTLs like F2FS_IOC_DE/COMPRESS_FILE are allowed unexpectly,
which could crash that file.
To fix it, let's do not allow F2FS_IOC_DE/COMPRESS_IOCTL if a file already
has FI_COMPRESS_RELEASED flag.

This is the reproduction process:
1.  $ touch ./file
2.  $ chattr +c ./file
3.  $ dd if=/dev/random of=./file bs=4096 count=30 conv=notrunc
4.  $ dd if=/dev/zero of=./file bs=4096 count=34 seek=30 conv=notrunc
5.  $ sync
6.  $ do_compress ./file      ; call F2FS_IOC_COMPRESS_FILE
7.  $ get_compr_blocks ./file ; call F2FS_IOC_GET_COMPRESS_BLOCKS
8.  $ release ./file          ; call F2FS_IOC_RELEASE_COMPRESS_BLOCKS
9.  $ do_compress ./file      ; call F2FS_IOC_COMPRESS_FILE again
10. $ get_compr_blocks ./file ; call F2FS_IOC_GET_COMPRESS_BLOCKS again

This reproduction process is tested in 128kb cluster size.
You can find compr_blocks has a negative value.

Fixes: 5fdb322ff2 ("f2fs: add F2FS_IOC_DECOMPRESS_FILE and F2FS_IOC_COMPRESS_FILE")

Bug: 228919347
Bug: 267580491
Signed-off-by: Junbeom Yeom <junbeom.yeom@samsung.com>
Signed-off-by: Sungjong Seo <sj1557.seo@samsung.com>
Signed-off-by: Youngjin Gil <youngjin.gil@samsung.com>
Signed-off-by: Jaewook Kim <jw5454.kim@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 854f8871ed)
Change-Id: I086e4d88da68574ef793740d19ecbb2d4ad6ef1d
2023-02-03 18:44:20 +00:00
Daeho Jeong
16996773d6 BACKPORT: f2fs: handle decompress only post processing in softirq
Now decompression is being handled in workqueue and it makes read I/O
latency non-deterministic, because of the non-deterministic scheduling
nature of workqueues. So, I made it handled in softirq context only if
possible, not in low memory devices, since this modification will
maintain decompresion related memory a little longer.

Bug: 232003054
Bug: 267580491
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Change-Id: I1a7c642e05c2f8544d475039b733403181de641e
(cherry picked from commit 9ef8cd45d7)
2023-02-03 18:44:20 +00:00
Daeho Jeong
ce72626280 BACKPORT: f2fs: introduce memory mode
Introduce memory mode to supports "normal" and "low" memory modes.
"low" mode is to support low memory devices. Because of the nature of
low memory devices, in this mode, f2fs will try to save memory sometimes
by sacrificing performance. "normal" mode is the default mode and same
as before.

Bug: 232003054
Bug: 267580491
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 60f60d1fd8)
Change-Id: I7cb719b18f0002d7af47f7a18e8ec2f4c534bdd9
2023-02-03 18:44:20 +00:00
Sungjong Seo
246a996565 BACKPORT: f2fs: allow compression for mmap files in compress_mode=user
Since commit e3c548323d ("f2fs: let's allow compression for mmap files"),
it has been allowed to compress mmap files. However, in compress_mode=user,
it is not allowed yet. To keep the same concept in both compress_modes,
f2fs_ioc_(de)compress_file() should also allow it.

Let's remove checking mmap files in f2fs_ioc_(de)compress_file() so that
the compression for mmap files is also allowed in compress_mode=user.

Bug: 228919347
Bug: 267580491
Signed-off-by: Sungjong Seo <sj1557.seo@samsung.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 77142c3cf7)
Change-Id: I31798dfb851be6ee7e5156be8c46fe007583ee55
(cherry picked from commit d85467fdca7c61be37cfd65434dffba3fb4d978d)
2023-02-03 18:44:20 +00:00
Jianqun Xu
0a6fcdbf81 media: i2c: fix compile error when CONFIG_PM is not set
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3a9d18629c20f543b2d992d9afe62d4b1b721dae
2023-02-03 18:31:44 +08:00
Jianqun Xu
a8c4dcb234 phy: rockchip: mipi-rx: fix compile error when CONFIG_PM is not set
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ieb9df05a2c71c090de9ebec2d40678dd79630f55
2023-02-03 17:40:50 +08:00
Finley Xiao
49aa54ec05 MALI: bifrost: Fix building error when disable CONFIG_MALI_BIFROST_DEVFREQ
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I523b4f8e547c49e2e262fe29c7252888e0694a6c
2023-02-03 16:35:31 +08:00
Damon Ding
66833cf69c arm64: dts: rockchip: rk3562-evb: add mcu display board
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I294420987ceddeb6f25acbb243330842ed5b3121
2023-02-03 15:53:57 +08:00
Damon Ding
35c61f3827 arm64: dts: rockchip: rk3562: move rgb node to ioc_grf node
In addition, add label vp0/vp1.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I208e47f48c35cd615dbff0d34cd5ddd8202a89b4
2023-02-03 15:53:24 +08:00
Damon Ding
20b6c50cc3 arm64: dts: rockchip: rk3562: set driver strength of rgb pins to level2
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I3710d3529d5263e4b0646fa4ee4af5312951aae4
2023-02-03 15:53:24 +08:00
Sandy Huang
8815d92a81 drm/rockchip: vop2: add support output width and dclk prop
userspace can check the crtc capability according the following conditions:

1. drmModeModeInfo.hdisplay <= OUTPUT_WIDTH
2. drmModeModeInfo.htotal * drmModeModeInfo.vtotal * drmModeModeInfo.vrefresh <= OUTPUT_DCLK

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Iaa8f5b324ddecb046918c81b6e569d469f543f72
2023-02-03 14:34:54 +08:00
Nickey Yang
6e6b592df0 drm/rockchip: vop2: just init extend clk on rk3588
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Id206084a9b26a312aa65f4c60f2ce30e5741575c
2023-02-03 14:31:59 +08:00
Damon Ding
6a240f0974 drm/rockchip: vop3: add bt1120/bt656 support for rk3562
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I61ff4d3398b20697e461aca6961992703b40d8db
2023-02-03 10:53:30 +08:00
Nickey Yang
889250e449 drm/rockchip: Kconfig: select vop2 if RK3528 or RK3562
Change-Id: I55168a6a9e635bdbb8005331fc05a3266be0e968
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2023-02-03 09:56:17 +08:00
Yifeng Zhao
e7394324b8 mmc: sdhci-of-dwcmshc: add config for rk3562
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I5b15d23c3e02d1f172623cb03e61bc0d1561c544
2023-02-02 19:02:08 +08:00
Zefa Chen
6d31ebb3ec phy: rockchip: csi2-dphy: support rk3562
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I938047b37e2feba021a19f953f859679468fee1a
2023-02-02 19:02:08 +08:00
Zefa Chen
25fad519b3 media: rockchip: vicap support rk3562
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I47d5bba77b694f9135ff9a71e80a00030d631e23
2023-02-02 19:02:08 +08:00
Finley Xiao
89500b0691 clk: rockchip: link: Add gate link for rk3562
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I80165ca3ef844973349ad7560e8b3e7f51dad6fc
2023-02-02 19:02:08 +08:00
Felix Zeng
c84d1a60a8 driver: rknpu: Update rknpu driver, version: 0.8.5
* Fix rk3562 bw clear bug
* Fix failed submit errors in the case of multi-core multi-threading

Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: Id5ae389bb78697d0ef7a8f3e476f1733422fe649
2023-02-02 19:02:08 +08:00
Felix Zeng
00afdab272 driver: rknpu: Update rknpu driver, version: 0.8.3
* Add support for rk3562

Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: I0d1c7e74f3ed69f835e92d4a540a06fc3d218897
2023-02-02 19:02:08 +08:00
David Wu
91eb711c9c ethernet: stmmac: dwmac-rk: Add gmac support for rk3562
Add constants and callback functions for the dwmac on RK3562 soc.
As can be seen, the base structure is the same.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I79a86c29bbbcd86b29cc6c59fd9f6d931fd556c6
2023-02-02 19:02:08 +08:00
Simon Xue
d66101a3fe iio: adc: rockchip_saradc: add rk3562
Change-Id: Id4d47ff54d194a4312487f4a07698d3cd6405112
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2023-02-02 19:02:08 +08:00
Chandler Chen
d76a85467f video: rockchip: mpp: link mode support for rk3562
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I8fe2d951554ed2f178c8509aabe166427ccaf096
2023-02-02 19:02:08 +08:00
Chandler Chen
319dab507b video: rockchip: mpp: rkvenc2: match rk3562 encoder compatible
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I575b599d52825aa6d91cd562aed16d664efe765e
2023-02-02 19:02:08 +08:00
Jon Lin
4f0c9ccc79 pcie: rockchip: dw: Support rk3562
rk_pcie_of_data is the same with RK3528.

Change-Id: I161dfd939ff72e72a61588ff5ed953d2b600f48d
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2023-02-02 19:02:08 +08:00
Jon Lin
0cdb526c1f phy: rockchip-naneng-combo: Support rk3562
Change-Id: I4da12613bb01c477f8fca9c38c516f5dab0851d9
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-02-02 19:02:08 +08:00
Frank Wang
63f30f7541 phy: rockchip: inno-usb2: add usb2 phy support for rk3562
RK3652 has one USB2.0 PHY with two ports, the OTG port support OTG
and BC1.2, the SoC provide USB GRF and APB to access the registers.

This adds vbus detection function control and make the below tuning
to enhance the usb2-phy SQ for RK3562 SoC.
 - enable pre-emphasis during non-chirp phase
 - set HS eye height to 425mv
 - turn off differential receiver by default to save power

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: If93c3a072be4c532aa823cf3cd9f05fe9414f727
2023-02-02 19:02:08 +08:00
Zhang Yubing
36c9d7fd8f drm/rockchip: lvds: add support rk3562
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I95a42245599c2440b6405fcfd048e9b32b1636c9
2023-02-02 19:02:08 +08:00
Sandy Huang
a2bb42f791 drm/rockchip: rgb: add support rk3562
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Iefbb7f45bbafcd5bbfb6840d0968c9b6aef6b709
2023-02-02 19:02:08 +08:00