Commit Graph

870289 Commits

Author SHA1 Message Date
91842bc69e deb包现在默认不添加uEnv.txt的文件 2023-05-18 08:12:16 +00:00
ad662b7d0e debian系8822ce支持开启热点模式 2023-05-18 08:11:42 +00:00
bca1db4e80 phy: rockchip: naneng-combphy: Fix CTLE register setting error for rk3528
Signed-off-by: Jianwei Zheng <jianwei.zheng@rock-chips.com>
Change-Id: I6a217c1b041f5962c500bb4d03f689ce54a42443
2023-05-18 09:23:16 +08:00
e206d43dd4 video: rockchip: mpp: disable irq during timeout reset
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: Idb91a22e55f3eaedfebf23fd7780ed4014e0da98
2023-05-17 14:21:01 +08:00
e18f6945ac 更新lubancat2 hdmi声音没有的问题 2023-05-17 02:21:38 +00:00
72159312d1 iommu/rockchip: Add missing braces
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Iec2ee6dd03e1795975a0bb5c63ed35092cc2f61b
2023-05-16 15:29:03 +08:00
14f2a1e20b media: rockchip: isp: set MI_RD_CTRL2 default after reset
Change-Id: I2575335b2a29b3d2686b453b578a3d49d82fb10b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-05-16 10:07:53 +08:00
fb44ec8883 media: rockchip: isp: remove dmatx lock by hw dev_lock
hw dev_lock for multi device such as mainpath and selfpath output

Change-Id: I905040fee2836e4cc3e36f2bf523f45bb5b226eb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-05-15 14:52:33 +08:00
9376d46218 media: rockchip: fix isp no work due to irq_ends_mask error
Change-Id: I62dc2383720adb03b8ade6affbea7ee50ffa4427
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-05-15 14:52:31 +08:00
7f8a7aa7c3 更新鲁班猫0的uEnv 2023-05-13 08:49:58 +00:00
f5a2971330 drm/rockchip: vop2: add polarity configs of rgb sync pins
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I7ac600119565d5226c95b95d5bd7cb59f8ca7523
2023-05-12 17:53:36 +08:00
de3d959dae arm64: dts: rockchip: rk3568: support adjust opp-table by otp
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: I93bac848a43a06c90e436b4c2c36cc6ed1a8bc71
2023-05-12 09:24:30 +08:00
ccbc130e07 drivers 更新rtk_btusb驱动 2023-05-10 01:16:48 +00:00
61784e0530 drivers 更新8822ce驱动 2023-05-10 01:09:35 +00:00
876039f6e7 drm/rockchip: add output_if check for display interfaces
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I3dc3795ada17c3e1a3cd84b37b9e81923a1d7f1b
2023-05-09 20:19:21 +08:00
c3ee4f9954 mailbox: rockchip: amend txdone method to polling
Since there is no txdone irq in the Rockchip mailbox IP, invoking
mbox_chan_txdone()/mbox_client_txdone() after mbox_send_message()
to tick the TX would be free the active request which have not been
sent out if the controller returned the EBUSY state before. So amend
the txdone method to polling to fix it.

The TX polling interval can specify in DT with
"rockchip,txpoll-period-ms" property, if it is not set, the driver
would hardcode to 5 milliseconds.

Change-Id: Ic26d3245dd8bd90ebad30fce9ece2f4452814f7f
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2023-05-09 10:42:35 +08:00
c806b298d5 dt-bindings: mailbox: rockchip: add tx poll period property
Specify TX Done polling interval in milliseconds with the
"rockchip,txpoll-period-ms" property.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I91f25e6b5e6ef05cf90147b2e609c71c6ed61df7
2023-05-09 09:48:46 +08:00
c271e85cd0 arm64: dts: rockchip: rk-stb-ir-keymap: update ctc F22 code
Change-Id: I73a8300272e38a9f790c3b1fadc43ef279585dc0
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-05-05 14:17:37 +08:00
899d93c789 添加3568 1024x600分辨率的屏幕 2023-05-04 08:43:04 +00:00
75a0e283c3 将msata添加到uEnv文件中 2023-05-04 08:42:32 +00:00
bfd7b0147c 添加msata相关的设备树插件 2023-05-04 08:41:50 +00:00
30f39c3b07 更新ax88179_178芯片驱动 2023-05-04 08:39:56 +00:00
2e17e311b5 uEnv 设置dev_bootpart环境变量,用于dtfile命令读取设备树插件 2023-05-04 10:46:19 +08:00
9b2f3f42fb uEnv 修改启动参数,添加boot.cmd,支持boot.scr启动方式 2023-04-28 16:25:26 +08:00
1c80489719 mmc: convert thunder boot dependency
If no need to activate the decompress flow, using CONFIG_ROCKCHIP_THUNDER_BOOT_MMC
should be better.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ic9750ab71cc0d7c5beddd41f11ab71aa4df69bff
2023-04-28 08:56:15 +08:00
a906a8a154 video: rockchip: mpp: fix rk3528 avsd not probe issue
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I79c9b010e0b863c76a9cbfc59433480d1581bbfa
2023-04-27 15:01:39 +08:00
a74355b80c arm64: dts: rockchip: rk3528-evb1: close es7243_sound
Since we must switch the DIP switch to make es7243 work in evb1, if
not do that, the i2c error accur:
[0321084917][   41.145030] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
[   41.145088] es7243_write error->[REG-0x0b,val-0x8c]
[0321084918][   42.158359] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
[   42.158409] es7243_read error1
[0321084919][   43.171692] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
[   43.171743] es7243_write error->[REG-0x0c,val-0x80]
[0321084920][   44.185026] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
[   44.185080] es7243_write error->[REG-0x03,val-0x20]
[0321084921][   45.198330] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2
[   45.198379] es7243_write error->[REG-0x0d,val-0x00]
[0321084923][   46.211691] rk3x-i2c ffa80000.i2c: timeout, ipd: 0x00, state: 2

So close it. Then switch the DIP switch and enable es7243_sound node if use
es7243_sound card.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I0dc4139aef4587ad4a303ede594ef1213704d808
2023-04-27 09:45:23 +08:00
f9e36cb457 arm64: dts: rockchip: rk-stb-ir-keymap: update ctc voice code
Change-Id: I5c408e2f1a8abeeb703f0aa50dae1d5714cc65a2
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-04-26 18:42:47 +08:00
76de52fb18 net: rockchip_wlan: uwe5621ds: add power up func when waked by bt-irq only.
Change-Id: I53ab4e2f33cd6f250d35174db4d11b36d64eb1cb
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-04-26 16:37:11 +08:00
817dc6b4ef net: rfkill-bt: add power up func when waked by bt-irq only.
when rtk(also some others) wifi/bt combo chips suspend, it
disconnect from bt-remote control unit(RCU). when RCU's
powerkey pressed, it will send ble broadcast to rtk bt chip.

As the rtk chips receive the broadcast, it should wake up
the host, but it can't send bt-hid powerkey to host because
it had lost communication with host.
So,it just send a IRQ pulse to host. The host should resume
from suspend.

Because the RCU just send a IRQ pulse, so rk chips just resume
by IRQ and then go to sleep again for no power-key event.
this is not expected. we expect to power up system wholly.

With this path, we try to power up the system. so we add a
power-up key event when BT IRQ received.

We also can control the "/proc/bluetooth/sleep/powerupkey"
node to enable or disable this function.

Change-Id: Ie59b4a2c4cd2f91820d31835df86565003126465
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-04-26 14:49:53 +08:00
e83a60cb16 drm/rockchip: dw_hdmi: Fix hdmi2.0 mode no signal when plug out before hdmi bind
When the hdmi is plugged in and out after uboot but
before kernel initialization, the TV will enter hdmi 1.4 mode,
hdmi 2.0 resolution can't be display.
In this case, we need to disable/enable hdmi again to make TV
into hdmi 2.0 mode again.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I39fbe519d54329ae7db57904013bfdef6f5a068e
2023-04-26 09:43:46 +08:00
84a12b52d9 drm/rockchip: dw_hdmi: hdmi plug out don't check mode valid when play hdr video
HWC will set hdmi out of hdr mode then disable hdmi
when hdmi plug out in hdr mode.
If hdmi is disconnect edid is null, mode valid check
is always failed, HWC set hdr disable will failed.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I12ebf23539be17b338617131e879296ed20d6a95
2023-04-26 09:34:12 +08:00
985346faa8 arm64: config: add box diffconfig for rk3528
make ARCH=arm64 rockchip_defconfig rk3528_box.config

Add by:
   make ARCH=arm64 rockchip_defconfig
   cp .config rk3528.config
   make ARCH=arm64 menuconfig
   scripts/diffconfig -m rk3528.config .config >arch/arm64/configs/rk3528_box.config

It mainly changes:
- Disable configs: LCD, Sensor, NPU, Nand, Battery etc
- Enable VLAN_8021Q for dhcp+ function.

Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: Id6820e4fb47f473e2b4e315bcb95eaae2d5b4bb6
2023-04-24 20:19:42 +08:00
d2edb6129e arm64: dts: rockchip: add px30 ddr4 v10 evb for linux
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
Change-Id: I52847160e5edde3cbd06e58313c00dba7e61f7e3
2023-04-24 15:00:11 +08:00
00bca8ea24 mtd: rawnand: rockchip: Fix the return value in case of ECC fail
The former ECC fail return value -1 is not the correct one, change
to return 0 and let the nand base handle it. The mistake value
causing file system to be unable to detect the ECC fail status and
unable to make corresponding optimization processing.

Change-Id: Ib79d02189de383fa9815cf0524e6bcb89b3c939f
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-04-24 11:18:45 +08:00
de08838939 Merge branch 'stable-4.19-rk356x' of http://gitlab.ebf.local/rockchip/linux/kernel into stable-4.19-rk356x 2023-04-23 11:52:22 +08:00
696cd1a4fc 修改gmac rx_delay,兼容RTL8211F工业级千兆网卡 2023-04-23 11:46:28 +08:00
ee909ff436 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:33 +08:00
ab82b0b063 arm64: dts: rockchip: rk3528: iep qos modify for timeout issue
increase qos priority to 0x202

Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I665234444ea9e85173cd8e25bd8ba51e691f6fdb
2023-04-19 17:57:39 +08:00
de9bd8f9b5 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:56:39 +08:00
c8b7bef590 drm/rockchip: vop3: update OUTPUT_WIDTH for esmart
At VOP3_ESMART_2K_2K_2K_2K_MODE mode, esmart can support:
4k scale down to 2k or 2k scale up to 4k, but can't support 4k to 4k,
current property[INPUT_WIDTH/INPUT_HEIGHT/OUTPUT_WIDTH/OUTPUT_HEIGHT]
can't accurately describe this feature, so we agreement on rules with hwc:

1. when esmart can support 2k->4k/4k->2k, can't support 4k->4k, the property
value is:
    INPUT_WIDTH:4096
    OUTPUT_WIDTH:2048

2. when esmart can suport 2k->4k/4k->2k/4k->4k, the property value is:
    INPUT_WIDTH:4096
    OUTPUT_WIDTH:4096

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: If2067f34a36ba77249174e8369eaaccb0a8f700f
2023-04-19 17:56:39 +08:00
c51e187ad3 drm/rockchip: vop3: fix esmart_lb_mode error
vop2->esmart_lb_mode is correct value according driver default value and
dts config.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I1c242ebbb47cdf2916a56ae729ba65222d31d0d5
2023-04-19 17:56:39 +08:00
327a4c875e dts 修复自定义dmc_opp_table节点导致dmc失效的问题 2023-04-19 13:51:23 +08:00
325258b763 version rk356x update KBUILD_BUILD_VERSION=4 2023-04-18 16:57:10 +08:00
0ba968336d 2-v1增加休眠唤醒功能 2023-04-18 08:50:48 +00:00
ea879a2363 uEnv 添加LubanCat2 v1 uEnv文件 2023-04-18 16:41:32 +08:00
e489a9600a dts 添加rk356x pwm7 设备树插件 2023-04-18 16:40:54 +08:00
e165af8706 dts 添加LubanCat2 v1设备树 2023-04-18 16:40:01 +08:00
3628bc7639 kernel:r8169 is enabled by default
due to Android system problems, this may cause lbc2n dual 2.5G to fail, so switch r8169 to solve
2023-04-18 09:49:22 +08:00
1b7991936c 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:47:49 +08:00