Commit Graph

1079781 Commits

Author SHA1 Message Date
Jon Lin
93bbc76c5a mtd: spinand: macronix: Fix mx35ufxge4ad
Separate ECC erea from obb erea.

Change-Id: I70b081b869f6d2fb3dd1087c654a677098255d08
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-04-23 15:15:55 +08:00
Shaoxing Chen
b9185efcf4 drivers: net: wireless: update cywdhd to 100.10.80
Change-Id: I1cbc5d551d4b7783e445a1a6f2ac550694785890
Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
2023-04-21 19:36:57 +08:00
Zefa Chen
7d9d60111d media: rockchip: vicap: rv1106 support to stop dma capture when not active buffer
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia60a4806fd738c9884741d1e1172ebaa9bb75363
2023-04-21 17:48:13 +08:00
Guochun Huang
5c0bfc94ca drm/bridge: maxim-max96755: Use the parent's extcon
Change-Id: I532c2da43f774e17e6570e1f365021b1116fce70
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-04-21 15:15:21 +08:00
Guochun Huang
88c283d19b mfd: max96755f: Add extcon support
Change-Id: I012272dc93b03b4604fa74229e02a02f0c83d49d
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-04-21 15:15:14 +08:00
Guochun Huang
ae15a01230 mfd: max96755f: Add patgen_mode debug node
Enable pattern:
echo 2 > /sys/bus/i2c/devices/x-0040/patgen_mode

Disable pattern:
echo 0 > /sys/bus/i2c/devices/x-0040/patgen_mode

Change-Id: I5bf970210b14f93599a36c78703e53252546da5b
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-04-21 15:14:57 +08:00
Yu Qiaowei
5ab24a2706 video: rockchip: rga3: print dma_buf_map error code
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I820390743d2fb4bf3a0a5d7f2b9a1f76b8f0db67
2023-04-21 10:03:57 +08:00
Tao Huang
7c18fdfce5 arm64: rockchip_defconfig: update by savedefconfig
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2af075298a935a2004ed48ba8caa4d85287f5c4f
2023-04-20 18:30:42 +08:00
Luo Wei
444e28ad09 arm64: rockchip_defconfig: enable CONFIG_TOUCHSCREEN_ILI210X for vehicle evb
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I188e3930f3aad786de4b9f816f0bb2df94ec919e
2023-04-20 18:28:23 +08:00
Luo Wei
e7bae82845 input: touchscreen: ili210x: add location info for multi-touch
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: Ic096a4ef096e3c1ae186922df0a8cc60185b897d
2023-04-20 18:24:46 +08:00
Luo Wei
159d287efb arm64: dts: rockchip: rk3588-vehicle-evb: add ilitek touch support base rohm serdes chip
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I7d06b1534864a829263721e3e9939c1bd7fd0bdd
2023-04-20 16:40:30 +08:00
Wu Liangqing
71775aaa12 arm64: dts: rockchip: rk3399-sapphire add adc_key
Change-Id: I60f390fad4400f18c21bcc76842f5c0d769bb5f2
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2023-04-20 12:11:56 +08:00
Lin Jinhan
c8b8d9251b crypto: rockchip: v1: Remove zero-length hash dependency for gki
The following symbolic dependencies were removed:
1. md5_zero_message_hash
2. sha1_zero_message_hash
3. sha256_zero_message_hash

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I0536e729dd282b2d71476ae4b81c4b2ab14223e7
2023-04-20 09:49:39 +08:00
Damon Ding
5eabeb88f1 drm/rockchip: vop3: fix process of output_mode setting for mcu
If hold_mode of mcu is active, the output_mode configuration
cannot take effect. The process should be:

disable vp standby -> set output_mode -> enable hold mode

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Id18090eac7adea8002f4170e227d93d5f801f96a
2023-04-19 18:45:27 +08:00
Frank Wang
47248a1260 usb: host: ehci: clear interrupts when ehci has halted
When EHCI has halted, the ISR is without processing interrupt by
returning IRQ_NONE. After some time, this IRQ will be treated to be
spurious one, and the exception dump happens like the following.

  The system is going down NOW!
  Sent SIGTERM to all processes
  Sent SIGKILL to all processes
  Requesting system reboot
  irq 20: nobody cared (try booting with the "irqpoll" option)
  CPU: 0 PID: 0 Comm: swapper/0 Tainted: G           O      5.10.160 #6
  Hardware name: Rockchip RK3562 EVB1 LP4X V10 Board (DT)
  Call trace:
   dump_backtrace+0x0/0x1d0
   show_stack+0x1c/0x24
   dump_stack_lvl+0xcc/0xf0
   dump_stack+0x14/0x30
   __report_bad_irq+0x50/0x150
   note_interrupt+0x2b0/0x30c
   handle_irq_event+0xec/0x120
   handle_fasteoi_irq+0xc8/0x204
   __handle_domain_irq+0x78/0xe0
   efi_header_end+0x7c/0xb0
   el1_irq+0xc8/0x180
   cpuidle_enter_state+0xdc/0x40c
   cpuidle_enter+0x3c/0x50
   do_idle+0x230/0x2e0
   cpu_startup_entry+0x2c/0x60
   rest_init+0xc0/0xcc
   arch_call_rest_init+0x14/0x1c
   start_kernel+0x514/0x548
  handlers:
   [<000000003a1063b0>] usb_hcd_irq
   Disabling IRQ #20

This is a low probability fault while process the reboot command with
a udisk plugged in USB port.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I85a1cc3667570ab324c2a5cab25bd9e9295dd8d9
2023-04-19 18:43:06 +08:00
Liang Chen
3387e10b57 ARM: dts: rockchip: rv1106: add leakage info for cpu
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: Idc5957b9e5b90ec34c5debf923fcb00e2c8c71d8
2023-04-19 18:42:20 +08:00
Xing Zheng
0fe0eb09fd ARM: configs: rk312x: enable SND_SOC_ROCKCHIP_HDMI
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Ie93f5609856d3f3db24705a5da78e8afc9f922b0
2023-04-19 18:41:32 +08:00
Xing Zheng
3517f0754c ARM: dts: rockchip: rk3128-evb-ddr3-v10-linux: add support hdmi sound via SPDIF source
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I47a0e5943349ae12b8ea12cfa78fddd655c6f2aa
2023-04-19 18:41:32 +08:00
Xing Zheng
7e6cf83c69 drm/rockchip: inno_hdmi: add spdif for hdmi audio source
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I209565a68f84708f9aefac738dbf9b3cd2769976
2023-04-19 18:41:32 +08:00
Zefa Chen
c58aa0fb74 media: rockchip: vicap support multi group of sync mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I79001509dfca4b3941f92d9e085dd5f8ab21a674
2023-04-19 18:39:47 +08:00
Zefa Chen
e4906d8a0a include: uapi/linux/rk-camera-module.h add RKMODULE_GET_GROUP_ID/RKMODULE_SET_GROUP_ID
for support multi group of sync mode

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If5e5ab05ee083eb3ecf206d3196896baad74ef60
2023-04-19 18:39:47 +08:00
Shawn Lin
35ac0add77 PCIe: dw: rockchip: Init msi again when calling resume
If the controller is powered down and lost its settings of
MSI, host driver should take response of recovering all the
settings.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I9f1fd9078e500388f8d9753cc5ab7882b404d142
2023-04-19 18:05:43 +08:00
Sandy Huang
1818a542ad drm/rockchip: vop2: update dma rid for rk3588
before this commit, dma rid is config as following:
AXI0
    Cluster0:
	win0: 0x2,0x3
        win1: 0x4,0x5
    Cluster1:
        win0: 0x6,0x7
        win1: 0x8,0x9
    Esmart0: 0xa, 0xb
    Esmart1: 0xc, 0xd
    Lut: 0xe[for vp0/2, will be used at different time]

AXI1:
    Cluter2:
        win0: 0x2,0x3
        win1: 0x4,0x5
    Cluster3:
        win0: 0x6,0x7
        win1: 0x8,0x9
    Esmart2: 0xa,0xb
    Esmart3: 0xc, 0xd
    Lut: 0x1[for vp1]

this will conflict at 8k splice mode, so we update dma rid as following:
AXI0
    Cluster0:
        win0: 0x2,0x3
        win1: 0x4,0x5
    Cluster1:
        win0: 0x6,0x7
        win1: 0x8,0x9
    Esmart0: 0xa, 0xb
    Esmart1: 0x1, 0xc
    Lut:
	vp0:0xd
	vp1/vp2:0xe [will be used at different time]

AXI1:
    Cluter2:
        win0: 0x2,0x3
        win1: 0x4,0x5
    Cluster3:
        win0: 0x6,0x7
        win1: 0x8,0x9
    Esmart2: 0xa,0xb
    Esmart3: 0xc, 0xd

writeback: 0xd, 0xe [Reading and writing are separate, so there is no conflict]

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I162debd2274e353c50cbd1257c52d5d636d94dc6
2023-04-19 17:55:19 +08:00
Sandy Huang
639a954715 arm64: dts: rockchip: rk3528-android: update esmart lb mode to 2K_2K_2K_2K_MODE
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I9519095990153f2463736d01ed0d51ca7880ac6d
2023-04-19 17:29:06 +08:00
Tao Huang
436709c2ce arm64: dts: rockchip: rk3588-cpu-swap: change cpu dynamic-power-coefficient
According to commit 666fa6cca7 ("arm64: dts: rockchip: rk3588s: change cpu dynamic-power-coefficient").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id21c8ffc187092c8cef7f76dd9c5bce355e1743d
2023-04-19 17:28:30 +08:00
Finley Xiao
9028a39e63 drm/rockchip: Add support to unprotect clocks
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Idde99b52f81df9a40dda916708c751666f420a39
2023-04-19 17:27:44 +08:00
Finley Xiao
8db5c7166a clk: rockchip: rk3562: Add protect clocks
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I87924f1fa528c86492879c1924c6098e1b263b80
2023-04-19 17:27:44 +08:00
Finley Xiao
a4db0afed4 clk: rockchip: Implement rockchip_clk_protect()
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I85ee79b594f86a6852bcdc8cde8eb5ac95e9ee19
2023-04-19 17:27:44 +08:00
Tao Huang
19b5bab46b soc: rockchip: Move drivers/staging/android/fiq_debugger/ to drivers/soc/rockchip/fiq_debugger/
drivers/staging/android/ is removed on upstream.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ifef3f52f9212cb79a028fc8f56052b156cc428ae
2023-04-19 10:39:50 +08:00
Jianlong Wang
fc905e3632 arm64: config: add rockchip_electric_defconfig
Change-Id: I3828bec48f0789a4fae775f1fa661cb69c9b9543
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2023-04-18 17:11:55 +08:00
Zhang Yubing
c4a31b3e3a drm/rockchip: vop2: power on esmart pd without ref count
Fixes: b06e7b839c ("drm/rockchip: vop2: fix esmart pd turn off timeout issue")

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I841f74108506a9c69b57edcff73380be35c33576
2023-04-18 15:12:25 +08:00
Jianlong Wang
e1c4230889 ARM: configs: rk312x: enable RK_VIRTUAL_THERMAL
Change-Id: Ie8963ce75f1880a38aa0118b9e647f11eb5d1051
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2023-04-17 17:27:57 +08:00
Rocky Hao
ca62707f4d thermal: rockchip: add virtual tsadc support for rk3126
rk previous SOCs such as rk3126 have no tsadc module, so a virtual tsadc is
implemented to control the thermal problem.

the virtual tsadc is designed on considering 2 factors, one is heating
modules' heating time and the working frequences, the other one is current
leval monitored by coulometer.

Change-Id: I0c7d8b952004d4f7918a41c925c50d38aaa65673
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2023-04-17 17:26:01 +08:00
Shaohan Yao
82c81b7eb9 arm64: dts: rockchip: rk3528: Add gpu ipa static power
Signed-off-by: Shaohan Yao <shaohan.yao@rock-chips.com>
Change-Id: Ib237564f3099609622e274159f9b15c56eea43eb
2023-04-17 17:05:14 +08:00
Shaohan Yao
791feb8cc2 mali400: mali: Add rockchip simple-power-model support
Signed-off-by: Shaohan Yao <shaohan.yao@rock-chips.com>
Change-Id: I0f4edae3b6ad76d31fdc93a5cf96561afe0511ee
2023-04-17 17:05:08 +08:00
Chandler Chen
2938e413fd video: rockchip: mpp: fix dma buffer use-after-free issue
refcount_t: underflow; use-after-free.
WARNING: CPU: 0 PID: 1806 at lib/refcount.c:28
refcount_warn_saturate+0xf8/0x134
Call trace:
 refcount_warn_saturate+0xf8/0x134
 kref_put+0x108/0x10c
 mpp_dma_release+0x2c/0x48
 mpp_task_finalize+0x8c/0xb4
 rkvdec2_free_task+0x18/0x34
 rkvdec2_link_free_task+0x78/0x144
 mpp_session_pop_pending+0x78/0xb4
 rkvdec2_link_wait_result+0x180/0x1f8
 mpp_dev_ioctl+0x53c/0x5dc
 __arm64_compat_sys_ioctl+0x104/0x158
 el0_svc_common+0xac/0x1ac
 do_el0_svc_compat+0x1c/0x28
 el0_svc_compat+0x10/0x1c
 el0_sync_compat_handler+0x60/0x8c
 el0_sync_compat+0x164/0x180

Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I14c1ace207282341799bb43092f54a901eef2921
2023-04-17 16:36:46 +08:00
Algea Cao
e53e7c4bc5 arm64: dts: rockchip: rk3528: set hdmi ddc scl rate as 50KHz
The original 100khz rate is prone to ddc communication
error on some TVs. The scl rate was reduced to 50khz
by referring to competitor.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I51c3307566b68932e8ab9f1cb6a8ba47d03e7110
2023-04-17 16:14:08 +08:00
Algea Cao
50864b4004 arm64: dts: rockchip: rk3528: Add hdmi reference to hdmiphy pll clock
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Id26060a32de4e50d1f574fe17593ae39602b3840
2023-04-17 16:13:57 +08:00
Algea Cao
68767361ad drm/rockchip: dw_hdmi: Introduce hdmiphy-pll clock
If drm bind takes too long when entering the kernel,
for example, retry reading edid. When the clock is not
enabled, it will closed by rockchip_clocks_loader_unprotect().
Therefore, if the uboot logo is displayed, hdmi needs to
enable hdmiphy pll when hdmi bind.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I908f3f23bd60535d01399c972ae0942e6abe3dd4
2023-04-17 16:13:57 +08:00
Algea Cao
38aeab12c6 drm: bridge: dw-hdmi: Fix kernel logo can't display if can't get edid
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I41ea95670a8f38e54adaa121de6685ea5e7fbcf4
2023-04-17 16:13:57 +08:00
Algea Cao
ab4061629d drm: bridge: dw-hdmi: Read edid in 8-bytes steps
This saves about 200 milliseconds compared to the
original method of reading one byte at a time.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I456194cc1ecb91f3df888a7771c6bb0163855620
2023-04-17 16:13:57 +08:00
Algea Cao
eca1277ac8 drm: bridge: dw-hdmi: Fix falcon tv display residue when play hdr video
Originally 50 milliseconds delay on the Hisense TV will appear
picture residual problem when exit hdr mode .

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia2da0ad743720cb8428ffa749b99d18373e1794b
2023-04-17 16:13:57 +08:00
Damon Ding
9a42eaaa9d arm64: dts: rockchip: rk3588: add pwm interrupt configs for oneshot mode
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ic58f3e38df65588f6565529a615f77c82696d641
2023-04-15 19:12:12 +08:00
Jianwei Fan
36f6dd0f59 video: rockchip: vehicle: fix bug if flinger plane is NULL
Change-Id: I898c8e9ad95cd5409d061571d9f6c933418aea50
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-04-14 20:35:10 +08:00
Guochun Huang
453536f7f3 drm/bridge: maxim-max96755f: add support dsi rx lane map
Change-Id: I3a2b5d4c6e0070137b398b3b379252ef62901610
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-04-14 20:34:42 +08:00
Zhang Yubing
4c1222a138 drm/rockchip: dsi2: clear output if in dual channels case
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ib9e9255e400a52a4c1f136876c6efde7d3fd930d
2023-04-14 18:31:22 +08:00
Zhang Yubing
575487d67e drm/bridge: analogix_dp: clear output if when disable edp
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I131a94190bf74bcd85f1008ebb13e0442bb16fe9
2023-04-14 18:31:22 +08:00
Zhang Yubing
d10cd8054c drm/rockchip: vop2: clear dual channel flag when disable video port
when a video port is in dual channel mode, it will enable dual channel
and the dual channel mode flag will be set. But it will not be clear
when disable video port. The next time enable the video port the dual
channel mode is still enable whether we really need it or not. So it
need to clear dual channel flag when disable video port.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I7001e712729be6c254051a7a8645a08a39c975ed
2023-04-14 18:31:22 +08:00
shengfei Xu
543d0f3691 arm64: dts: rockchip: rk3562: add rockchip-suspend node
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Idbd91344ac80ff638203da183126f3afb40ae4ef
2023-04-14 18:23:24 +08:00
Cai Wenzhong
5e5365f69c arm64: dts: rockchip: add rk3588-vehicle-evb-maxim-max96712.dtsi.
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I725ad0108dad8431df6af710134ca91e5621b28f
2023-04-14 18:22:48 +08:00