Finley Xiao
37158d1f2b
clk: rockchip: rk3128: Change SCLK_DDRC to composite
...
Change-Id: I6aeae7103c1eaed0b4515d8d11863c4b190b6918
Signed-off-by: Liang Chen <cl@rock-chips.com >
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
2022-11-30 15:03:05 +08:00
Jianqun Xu
649f030b09
video: rockchip: mpp: fix gcc-6 compile error without AV1DEC driver
...
drivers/video/rockchip/mpp/mpp_service.o: In function `mpp_add_driver':
drivers/video/rockchip/mpp/mpp_service.c:102: undefined reference to `av1dec_driver_register'
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com >
Change-Id: Ibf2effb98ce7c0c2219d3bbd762dd8c34530626f
2022-11-30 14:54:18 +08:00
Simon Xue
17dc73a159
drm/rockchip: logo: fix rockchip_free_loader_memory
...
Add "mem=0x40000000" to COMMAND LINE, kernel will crash:
[ 18.379633][ T35] Unable to handle kernel paging request at virtual address ffffffff01d7c000
[ 18.380412][ T35] Mem abort info:
[ 18.380726][ T35] ESR = 0x96000006
[ 18.381060][ T35] EC = 0x25: DABT (current EL), IL = 32 bits
[ 18.381587][ T35] SET = 0, FnV = 0
[ 18.381920][ T35] EA = 0, S1PTW = 0
[ 18.382264][ T35] Data abort info:
[ 18.382585][ T35] ISV = 0, ISS = 0x00000006
[ 18.383029][ T35] CM = 0, WnR = 0
[ 18.383360][ T35] swapper pgtable: 4k pages, 39-bit VAs, pgdp=0000000001c47000
[ 18.384014][ T35] [ffffffff01d7c000] pgd=0000000040f2f003, p4d=0000000040f2f003, pud=0000000040f2f003, pmd=0000000000000000
[ 18.385299][ T35] Internal error: Oops: 96000006 [#1 ] PREEMPT SMP
[ 18.385862][ T35] Modules linked in:
[ 18.386205][ T35] CPU: 2 PID: 35 Comm: kworker/2:1 Not tainted 5.10.110 #324
[ 18.386843][ T35] Hardware name: Rockchip RK3568 EVB1 DDR4 V10 Board (DT)
[ 18.387470][ T35] Workqueue: events rockchip_drm_fb_destroy_work
[ 18.388026][ T35] pstate: 80c00009 (Nzcv daif +PAN +UAO -TCO BTYPE=--)
[ 18.388626][ T35] pc : rockchip_free_loader_memory+0x100/0x1a0
[ 18.389156][ T35] lr : rockchip_free_loader_memory+0xc8/0x1a0
[ 18.389683][ T35] sp : ffffffc0125abd00
[ 18.390039][ T35] x29: ffffffc0125abd00 x28: 0000000000001000
[ 18.390570][ T35] x27: ffffff807df00000 x26: 0000008000000000
[ 18.391099][ T35] x25: fffffffeffe00000 x24: 0000000000000001
[ 18.391628][ T35] x23: ffffff80043d6300 x22: ffffff807df00000
[ 18.392157][ T35] x21: ffffff807dfb7000 x20: ffffff80043a8480
[ 18.392686][ T35] x19: ffffffff01d7c000 x18: 0000000000000000
[ 18.393215][ T35] x17: 0000000000000000 x16: 0000000000000000
[ 18.393744][ T35] x15: 00000072e03fbb78 x14: 0000000000000000
[ 18.394273][ T35] x13: 000000000000003d x12: 0000000000000000
[ 18.394802][ T35] x11: 00000000fffffff6 x10: ffffffc0122f8000
[ 18.395330][ T35] x9 : 0000000000010000 x8 : 0000000000000008
[ 18.395859][ T35] x7 : 0000000000818000 x6 : ffffff801ad909f0
[ 18.396387][ T35] x5 : 0000000000000039 x4 : ffffffc0122d01b8
[ 18.396917][ T35] x3 : 0000000000000000 x2 : 0000000000000000
[ 18.397445][ T35] x1 : ffffff80032622d8 x0 : 0000000000001000
[ 18.397975][ T35] Call trace:
[ 18.398255][ T35] rockchip_free_loader_memory+0x100/0x1a0
[ 18.398762][ T35] __rockchip_drm_fb_destroy+0xa4/0xc8
[ 18.399233][ T35] rockchip_drm_fb_destroy_work+0x14/0x20
[ 18.399728][ T35] process_one_work+0x1b0/0x490
[ 18.400142][ T35] worker_thread+0x4c/0x3f8
[ 18.400534][ T35] kthread+0x140/0x160
[ 18.400882][ T35] ret_from_fork+0x10/0x30
Logo buffer allocated from Uboot which may removed in kernel for any
purpose such as "debug". So, before freeing to the buddy system, we
must check if the buffer are valid.
Change-Id: I9a27c4552a3c7f450b034d2a6c6c3a321bb2fc54
Signed-off-by: Simon Xue <xxm@rock-chips.com >
2022-11-30 09:37:58 +08:00
Liang Chen
5151d5723a
ARM: dts: rockchip: rk312x-android: enable irq mode for fiq-debugger
...
Fiq mode is not ready on kernel-5.10.
Signed-off-by: Liang Chen <cl@rock-chips.com >
Change-Id: I658582c00b055fcab938e3ac479bb26b69c70201
2022-11-30 09:00:10 +08:00
Jianwei Fan
9409e07a01
media: rockchip: cif: add BGR888 format support
...
Change-Id: I1368917d0899f4f972c9ea3548b01dd9b9d1d6e8
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com >
2022-11-29 21:22:04 +08:00
Zefa Chen
e79faf3c91
media: rockchip: vicap fixed data type error for Y8/Y10/Y12
...
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com >
Change-Id: I9aa8841b5a0925eaa99117dd28c36d9929a4745a
2022-11-29 21:21:06 +08:00
Elon Zhang
0700444da4
ARM: dts: rockchip: add rv1106g-smart-door-lock-rmsl-v12.dts
...
Major changes from v10:
1) Change WiFi sdio from SDMMC0 to SDIO_M0.
2) RK803 Flood&PRO GPIO pin changes due to 1).
Signed-off-by: Elon Zhang <zhangzj@rock-chips.com >
Change-Id: If264d2ec1ff7421a5089244b116cd3bac9bcbf70
2022-11-29 19:43:01 +08:00
Elon Zhang
d331f0f14e
ARM: dts: rockchip: rv1106-pinctrl: add sdmmc1m0_bus1
...
Signed-off-by: Elon Zhang <zhangzj@rock-chips.com >
Change-Id: I7e727eca6ece4d84d5cbd438c33c8be1ca72a263
2022-11-29 19:43:01 +08:00
David Wu
593076a706
net: phy: motorcomm: Add 100m BGS voltage for RK631
...
Signed-off-by: David Wu <david.wu@rock-chips.com >
Change-Id: I1a8fd4d428e0d3d6c8a0c6b3e2dd63c5d53590a5
2022-11-29 19:36:15 +08:00
ZiHan Huang
8a99863c84
ARM: dts: rockchip: rk3036 adaptive pwm3 Infrared function
...
Change-Id: Idb6251f109900c4c2956688a849aced0e9872a10
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com >
2022-11-29 18:09:37 +08:00
ZiHan Huang
e356fea7b2
ARM: configs: rockchip_linux_defconfig: add remotectl pwm
...
Change-Id: I62ec4985381e16b19d8dc00a16bdefa7258f2ff3
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com >
2022-11-29 18:08:00 +08:00
Weiwen Chen
7b00a6d6dc
ARM: configs: rockchip: rv1106/rv1103 enable CONFIG_MTD_SPI_NOR_MISC for spi nor
...
Signed-off-by: Weiwen Chen <cww@rock-chips.com >
Change-Id: Ib0c3ee9974f4403bf077091c00227c5a6fa673cf
2022-11-29 15:38:31 +08:00
Li Huang
fa5530debc
ARM: dts: rockchip: rk3036: update GPU node
...
Change-Id: I43e646bf73f1d8252a6cad332d89126f535e34cf
Signed-off-by: Li Huang <putin.li@rock-chips.com >
2022-11-29 15:19:01 +08:00
ZiHan Huang
8362e44f2f
ARM: dts: rockchip: rk3036: add pd_gpu
...
Change-Id: I2850c18283f125b79429ca6799d9a53a86462ff3
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com >
2022-11-29 15:18:52 +08:00
David Wu
4a26cfea46
net: phy: rk630phy: Add Tx mos drive strength
...
Signed-off-by: David Wu <david.wu@rock-chips.com >
Change-Id: I8d4deef87d6e9be91100edfcbea40c0b8bd8c808
2022-11-29 15:11:29 +08:00
Wyon Bi
c6ec87e1a4
arm64: dts: rockchip: rk3326-evb-lp3-v11-avb: Add a delay after exiting panel sleep mode
...
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
Change-Id: I20fbfd917bb4effdba05482690a513a43e613785
2022-11-29 15:09:04 +08:00
Wyon Bi
6452e5b514
arm64: dts: rockchip: px30-mini-evb-ddr3-v11-avb: Add a delay after exiting panel sleep mode
...
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com >
Change-Id: Id1d092635b6fe08f547784caa3b570f622bb9d6b
2022-11-29 15:09:04 +08:00
Liang Chen
e1b13f917c
cpufreq: rockchip: do not select CONFIG_CPUFREQ_DT_PLATDEV for cpufreq-dt
...
cpufreq-dt-platdev.c is useless on rockchip platform, remove it and save
memory.
$ ./scripts/bloat-o-meter vmlinux_before vmlinux
add/remove: 0/4 grow/shrink: 0/0 up/down: 0/-18284 (-18284)
Function old new delta
__initcall_cpufreq_dt_platdev_init6 4 - -4
cpufreq_dt_platdev_init 248 - -248
blacklist 8232 - -8232
whitelist 9800 - -9800
Total: Before=10211366, After=10193082, chg -0.18%
Change-Id: Ibcc15aa3a8b13afa208c77979b75c617aeaef5fb
Signed-off-by: Liang Chen <cl@rock-chips.com >
2022-11-29 15:08:13 +08:00
ZiHan Huang
e8870aba92
ARM: dts: rockchip: rk3036-echo/kylin use new mpp_srv node
...
Change-Id: I4328f42bda41ff34dda1fef4bc205cc1be0d4b14
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com >
2022-11-29 11:09:50 +08:00
ZiHan Huang
d48e1e297a
ARM: dts: rockchip: rk3036.dtsi vdec adapts to the 5.10 kernel
...
Change-Id: I1a10dfd9af01d83bb78cf889ffc1cd27e7d0dda5
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com >
2022-11-29 11:08:39 +08:00
ZiHan Huang
2645ecd2d7
ARM: dts: rockchip: rk3036-echo/kylin delete old vpu node
...
5.10 kernel use vdec node
Change-Id: I0dd1ac897a82e84e1770287bb2edd2a1efb30b87
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com >
2022-11-29 11:08:20 +08:00
Jon Lin
5e2e107ee6
arm64: dts: rockchip: px30: add SFC node
...
Change-Id: Ia7ef02ee734f148deb2b626526c3cb615e9daaf2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2022-11-29 10:29:35 +08:00
Jianwei Fan
d7fe3090a1
media: i2c: lt7911uxc: fix source change event report
...
Change-Id: Ib90bf34ed75270c9de71973bcb2315cd7ae11c5b
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com >
2022-11-29 09:37:30 +08:00
Jianwei Fan
4ebfe9018e
media: i2c: lt6911uxe: fix source change event report
...
Change-Id: I311f5f9fc8398e3db4fb43ee19de071fe6ddd0ca
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com >
2022-11-29 09:37:14 +08:00
Weiwen Chen
aaf9337e46
ARM: configs: rockchip: rv1106-battery-ipc.config support ext4
...
insmod ext4 filesystem support:
insmod jbd2.ko
insmod crc16.ko
insmod mbcache.ko
insmod ext4.ko
Updated by:
make ARCH=arm rv1106_defconfig rv1106-tb.config
cp .config rv1106.config
make ARCH=arm rv1106_defconfig rv1106-tb.config rv1106-battery-ipc.config
make ARCH=arm menuconfig
./scripts/diffconfig -m rv1106.config .config > arch/arm/configs/rv1106-battery-ipc.config
Signed-off-by: Weiwen Chen <cww@rock-chips.com >
Change-Id: Ibc2295e5376949c8e65863b594cce8d0cb848167
2022-11-28 17:09:28 +08:00
Weiwen Chen
eabcc7ba36
ARM: dts: rockchip: add rv1106g-evb2-v11-emmc.dts
...
Signed-off-by: Weiwen Chen <cww@rock-chips.com >
Change-Id: I113a63a7be946c40a314269eda36f3f36b652a39
2022-11-28 17:09:28 +08:00
Sandy Huang
e8af16cf5a
arm64: configs: rockchip_defconfig: enable CPU_RK3528
...
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
Change-Id: I9b03f85c9637e5377608dd02ed4e5244e6f33071
2022-11-28 16:08:15 +08:00
Sandy Huang
c229745739
soc: rockchip: Adds CPU_RK3528 config
...
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
Change-Id: I13cdad34e43b9e75944a267d4c6c83c1a55eacdc
2022-11-28 16:07:54 +08:00
Wu Liangqing
0c27529b17
arm64: dts: rockchip: add rk3588-h0-v10.dts
...
Change-Id: I3bd61b436eb4c6fde6069f327b6467591d2e4fc3
Signed-off-by: Wu Liangqing <wlq@rock-chips.com >
2022-11-28 15:08:32 +08:00
Jianwei Zheng
5df41387b9
phy: rockchip: inno-usb2: fix phy power off causes usb controller abnormal
...
Usb controller require the clk from phy to work normally. In the
current code, if the dr_mode is set to peripheral and limit to
high speed, there are two cases that usb controller will work
abnormally due to phy power off.
1. The USB cable is not plug in when system start up, at this
time, the otg_sm_work will call rockchip_usb2phy_power_off to
suspend phy. However, if the upper layer uses configfs to operate
the controller after phy power off, controller will work abnormally.
2. Plug in the usb cable and start up the system, the controller
works in peripheral mode and PC recongnize it. IF we unplug the
usb cable, the vbus will not detected, otg_sm_work will also call
rockchip_usb2phy_power_off to suspend phy, when the upper layer
use configfs to operate the controller, phy has been suspended,
controller will work abnormally.
To fix these cases, this patch add a new property "rockchip,dis-u2-
susphy" to avoid phy power off.
Signed-off-by: Jianwei Zheng <jianwei.zheng@rock-chips.com >
Change-Id: I6c9921c8060747667d7bedb2cf76a38a896c05f5
2022-11-28 15:07:09 +08:00
Yu Qiaowei
0960de8b28
ARM: dts: rockchip: Remove dma-coherent on RK312x RGA2.
...
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com >
Change-Id: Ie46c49fe6d672ae1f32da300a1f072b0d478ebb0
2022-11-28 14:21:27 +08:00
Yu Qiaowei
f60012eb97
video/rockchip: rga: rename drvdata to rga_drvdata
...
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com >
Change-Id: I28e7255f1e08a2c85476053395172bcd0a6615bf
2022-11-28 14:21:27 +08:00
Yu Qiaowei
f0e546653b
video/rockchip: rga: fix bug with time debug nodes
...
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com >
Change-Id: Ie58a83af91c79e79cd6b85eeea78cf7ff820393c
2022-11-28 14:21:27 +08:00
Yu Qiaowei
475afae810
video/rockchip: rga: adapt to kernel 4.4
...
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com >
Change-Id: Ic1f8e21e5d1841d3533d0d74d46caf668c48645e
2022-11-28 14:21:27 +08:00
Yu Qiaowei
2dd6530d31
video/rockchip: rga: remove ^m
...
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com >
Change-Id: I2d3945442ef45b6baa9be9d286c1d7b4c70918c8
2022-11-28 14:21:27 +08:00
ZiHan Huang
97ca52bdc0
ARM: dts: rockchip: rk3036: fix compatible of pwm nodes
...
PWM in rk3036 is the same as rk3288
Change-Id: I078e068c8e6fe64fd2f53b0fde1b1fb9984c76bc
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com >
2022-11-28 14:14:51 +08:00
Zefa Chen
bbc9d3fcf6
media: rockchip: vicap disable dma capture in fs intr before stop stream
...
if disable dma capture in fe intr, register write to device may delay after real fs,
the register need effect in next real fs, may cause iommu error or size error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com >
Change-Id: I451c18f175e89c5ddf7c8a31f2f288dd8c01a8f1
2022-11-28 10:25:32 +08:00
Jianqun Xu
3196fead2c
ARM: dts: rockchip: rk3288: add rk3288-pinctrl.dtsi
...
Move rk3288 pinctrl functions to rk3288-pinctrl.dtsi.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com >
Change-Id: I358b4311ac47cb3c88cf372fb6662dfe4d9e6bd7
2022-11-25 21:11:32 +08:00
Jianwei Fan
55d671ad12
arm64: rockchip_defconfig: enable CONFIG_VIDEO_LT6911UXE for rk3588 evb1 extboard
...
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com >
Change-Id: Ib47b113ff10a13fb0b23e19567ec84767f1b880b
2022-11-25 21:03:01 +08:00
Jianwei Fan
64e13c9628
arm64: dts: rockchip: rk3588-evb1-lt6911uxe: add lt6911uxe configuration for rk3588 evb1 extboard
...
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com >
Change-Id: I6a1a0fd0bc25a5ce18089d4d7804d785745225b5
2022-11-25 21:01:57 +08:00
Jianwei Fan
b1657c60d0
media: i2c: lt6911uxe: add lt6911uxe HDMI to MIPI-CSI2 bridge driver
...
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com >
Change-Id: I8310c61a4dedfee6d0b38f4f7eb34da937dd0530
2022-11-25 21:01:15 +08:00
Herman Chen
7ea35f7e29
arm64: dts: rockchip: rk3588-evb: enable avs+ decoder
...
Signed-off-by: Herman Chen <herman.chen@rock-chips.com >
Change-Id: Iee041320e2b24769f28895d126657c30f9c4925e
2022-11-25 21:00:23 +08:00
Weiwen Chen
1d10186b4c
mmc: mmc_ops: Skip checking ocr for thunder boot
...
In order to make eMMC boot more fast.
Signed-off-by: Weiwen Chen <cww@rock-chips.com >
Change-Id: Ib8b076f30746c9b0043e464581985f10867e9054
2022-11-25 17:25:37 +08:00
Jianqun Xu
b63c12102a
ARM: dts: rockchip: rk3288: move psci node to core dtsi
...
Currently the psci node is in rk3288-linx/android.dtsi file, move them
into the core dt file.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com >
Change-Id: I0265719ab4eb6b05cb3c9414fd54f916fcce9d77
2022-11-25 16:51:32 +08:00
Herman Chen
d9cadd60be
arm64: dts: rockchip: rk3588: Add avsd skip pmu idle
...
Signed-off-by: Herman Chen <herman.chen@rock-chips.com >
Change-Id: Ia71449a6a2d5e5e0fd4d0cdc1a433d1cb0ea7113
2022-11-25 15:46:15 +08:00
Jianwei Fan
4612b633c9
media: i2c: Lontium bridge: add CSI BGR888 media bus format
...
Change-Id: I0da2e6e9c6683ae6ac4c0a900b9d3bb6291d0a4c
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com >
2022-11-24 20:09:09 +08:00
Lin Jinhan
cac789f29a
ARM: configs: rv1106-smart-door: enable camera thunder boot
...
CONFIG_MAILBOX=y
CONFIG_ROCKCHIP_MBOX=y
CONFIG_ROCKCHIP_THUNDER_BOOT_SERVICE=y
SPI_NOR compiled as module.
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com >
Change-Id: I1ab9ed6265f233875451ef5cf9daf50bae1e4632
2022-11-24 19:03:47 +08:00
Lin Jinhan
2365d6f638
ARM: dts: rockchip: rv1106g-smart-door: add gc2093 thunder boot support
...
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com >
Change-Id: I2578c1d45a037f0920dbc92f9973d7b8031eede4
2022-11-24 19:03:47 +08:00
Lin Jinhan
fea2e9f574
media: i2c: gc2093: pm_runtime_put device until stream_off for thunderboot
...
The camera device should keep *power on* until stream off, that make
sure the mclk is enable.
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com >
Change-Id: Iad14d6648b24c5e9202ba2cef2199e35fbe18fbb
2022-11-24 19:03:47 +08:00
Wang Xiaobin
39115e823e
media: i2c: gc2093 support get real fps
...
Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com >
Change-Id: I452732edf63ed913360d309ace457097ff8afedd
2022-11-24 19:03:47 +08:00