Commit Graph

861669 Commits

Author SHA1 Message Date
Liang Chen
580882cffa arm64: dts: rockchip: rk356x: adjust system-status-freq for dmc
Change-Id: I8f59c5457029fd9559f4f366257d68b22e9946c7
Signed-off-by: Liang Chen <cl@rock-chips.com>
2021-01-22 20:12:57 +08:00
Liang Chen
a5cb2bba3a arm64: dts: rockchip: rk3568: adjust opp-talbe when low-temp for cpu
Change-Id: I5fd3fc83285e557a454da25d3cb00ee007e6af60
Signed-off-by: Liang Chen <cl@rock-chips.com>
2021-01-22 20:12:57 +08:00
Tao Huang
013e1bdf50 ARM: rockchip_defconfig: set CONFIG_BLK_DEV_LOOP_MIN_COUNT to 16
Sync to gki_defconfig

CONFIG_BLK_DEV_LOOP_MIN_COUNT must be at least 16 in order
to pass VTS.

Change-Id: I3a0f0a77f8a60cf8a3e48683657f10e160927c58
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-01-22 20:12:57 +08:00
Tao Huang
2d6fe1cb7a arm64: rockchip_defconfig: set CONFIG_BLK_DEV_LOOP_MIN_COUNT to 16
Sync to gki_defconfig

CONFIG_BLK_DEV_LOOP_MIN_COUNT must be at least 16 in order
to pass VTS.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I15e46ac79dc6f149914a540e311369177bccdc23
2021-01-22 20:12:57 +08:00
Tao Huang
d797136cae ARM: rockchip_defconfig: Add CONFIG_UNICODE
Sync to gki_defconfig

Before:
    text	   data	    bss	     dec	    hex	filename
13465267	4345690	2113400	19924357	1300585	vmlinux

After:
    text	   data	    bss	     dec	    hex	filename
13473410	4411226	2113400	19998036	1312554	vmlinux

Change-Id: I023ce20549e9d65198b8a23affe4c9739f867103
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-01-22 20:12:57 +08:00
Sugar Zhang
6f048a072e fiq_debugger_arm: Print real address instead of hashed address
This patch replaces %p with %px to print real address for debugging.

Refer to:
Documentation/core-api/printk-formats.rst: Unmodified Addresses

Before:

debug> bt
pid: 0  comm: swapper/0
 r0 00000000  r1 b0d08cb0  r2 00000008  r3 00000001
 r4 b0c50008  r5 00000000  r6 00000000  r7 b0d01ef0
 r8 f0803000  r9 b0d00000 r10 00000000 r11 b0d01f68  mode SVC
 ip 00000000  sp b0d01ec0  lr b010e308  pc b010e314 cpsr 600001d3
  pc: 319691eb (handle_IPI+0x11c/0x18c), lr 3029134f (handle_IPI+0x110/0x18c)
  pc: d0f03ab2 (gic_handle_irq+0x74/0x78), lr d0f03ab2 (gic_handle_irq+0x74/0x78)
  pc: 86ca801d (__irq_svc+0x58/0x8c), lr 86ca801d (__irq_svc+0x58/0x8c)

After this patch:

debug> bt
pid: 0  comm: swapper/0
 r0 00000000  r1 b0d08cb0  r2 0000000c  r3 00000001
 r4 b0c50008  r5 00000000  r6 00000000  r7 b0d01ef0
 r8 f0803000  r9 b0d00000 r10 00000000 r11 b0d01f68  mode SVC
 ip 00000000  sp b0d01ec0  lr b010e308  pc b010e314 cpsr 600d01d3
  pc: b010e314 (handle_IPI+0x11c/0x18c), lr b010e308 (handle_IPI+0x110/0x18c)
  pc: b03b347c (gic_handle_irq+0x74/0x78), lr b03b347c (gic_handle_irq+0x74/0x78)
  pc: b0101a78 (__irq_svc+0x58/0x8c), lr b0101a78 (__irq_svc+0x58/0x8c)

Change-Id: I9ef798f30531c654ef18ff59d56bb85facccb79d
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-01-22 20:12:57 +08:00
Yifeng Zhao
d1dd426374 drivers: rk_nand: support rk3568
1. add compatible "rockchip,rk-nandc-v9"
2. support samsung ss14 8GB MLC NAND FLASH

Change-Id: I0508ac1d7249b40eac5d5b88bbf0695b7e2ba6f3
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2021-01-22 20:12:57 +08:00
Andy Yan
107a0619dd drm/rockchip: vop2: Move window from inactive video port to active vide port
Set all windows to activated video port at init,
try to avoid change port_mux when display on.

Change-Id: I29b7b0b0a610580ac6e07cc1d8ef35b51d86b8b0
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-22 20:12:57 +08:00
Andy Yan
e3fd547c39 drm/rockchip: vop2: Update date port_mux for all vp when one of them changed
Change-Id: I364b19b94d00ee95fad6ccf25f769f7d123e106c
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-22 20:12:57 +08:00
Andy Yan
9d1bc38156 drm/rockchip: vop2: Init window and video port map.
Read port_mux register to get the window and vp map.

Change-Id: If18c55754592df2e9bb8e3fe93e66624cd2cedb9
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-22 20:12:57 +08:00
Andy Yan
e40785303b drm/rockchip: vop2: Fix start mixer_id find for vp
Change-Id: I08107a9ffb5eb719809d76a6a0d9efe16c92543b
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-22 20:12:56 +08:00
Andy Yan
4719c4e177 drm/rockchip: vop2: wait for next frame when close to frame start of previous vp
Only config done the current vp at the first 3/4 frame time
if there is another vp waiting for config done.

Change-Id: I0ee33182cf11cd6d502e0bf02684c8b09f3df26b
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-22 20:12:56 +08:00
Andy Yan
2fc439df49 drm/rockchip: vop2: Read vp config done bits before change it
The config done bits of VP0, VP1, VP2 on RK3568 stands on
the first three bits on REG_CFG_DONE register without mask bit.

If two or three config done events happens one after
another in a very shot time, the flowing config done
write may override the previous config done bit before
it take effect:
 1: config done 0x8001 for VP0
 2: config done 0x8002 for VP1

 0x8002 may override 0x8001 before it take effect.

So we do a read | write here.

Change-Id: I35ad380b1c2751542697c9c7cdacea12dd08d924
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-22 20:12:56 +08:00
Weixin Zhou
ceaaf760e6 arm64: dts: rockchip: rk3566-rk817-eink-w6: add charger leds
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Id2edd426c626b8cc9e3d86626f9e9dc766f91ff6
2021-01-22 20:12:56 +08:00
Yifeng Zhao
2810efc860 soc: rockchip: mtd_vendor_storage: fix write issue
The page offset is need point to empty page. And also need to deal
case with ECC error.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I459345f18823b63cc5084be63c9a64c36838a151
2021-01-22 20:12:56 +08:00
Cai YiWei
a2eee96da1 media: rockchip: isp/ispp get vaddr in buf queue
avoid to map vaddr when vb2_plane_vaddr at interrupt

Change-Id: Id391a405973a9838fbc97065e4e27f6b88c07b8c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-22 20:12:56 +08:00
Tao Huang
2711475ad6 input: touchscreen: tp_suspend: Remove set but unused variable 'ret'
drivers/input/touchscreen/tp_suspend.h:77:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]

Fixes: ef0b86754e ("driver: input: touchscreen: gt9xx: add ebc suspend notify support")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1fd66d6b8664e6f09cc4aad1544bfef424565dc0
2021-01-22 20:12:56 +08:00
Steven Liu
ca67e68942 ARM: dts: rockchip: Fix UART pull-ups on rv1108
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I46de2a34695075956d66de140c20f3d1b63a18be
2021-01-22 20:12:56 +08:00
Steven Liu
6e0dd2d946 ARM: dts: rockchip: Fix UART pull-ups on rk3288
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I6ab6f53c76b2dc72b9656080e7231f98e1d75ab3
2021-01-22 20:12:56 +08:00
Steven Liu
c599250109 ARM: dts: rockchip: Fix UART pull-ups on rk322x
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I3e57d7c8646c4df6a24c94dcecc774acbd0a2c20
2021-01-22 20:12:56 +08:00
Steven Liu
31acfe769e ARM: dts: rockchip: Fix UART pull-ups on rk3188
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I660b0c7732305d73d4255be877aa48fa9c9afb01
2021-01-22 20:12:56 +08:00
Steven Liu
026248a29f ARM: dts: rockchip: Fix UART pull-ups on rk312x
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I42c00d7e7777cd8ef1012f78aef049b39045b311
2021-01-22 20:12:56 +08:00
Steven Liu
dd2f0befb2 ARM: dts: rockchip: Fix UART pull-ups on rk3066a
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I7466ab47baa86c81bf1f2fe47556aa03fbe67671
2021-01-22 20:12:56 +08:00
Steven Liu
eb04688f6f ARM: dts: rockchip: Fix UART pull-ups on rk3036
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I01e1effcc185fec6207cebb38b7f12701a7ebd35
2021-01-22 20:12:56 +08:00
Zorro Liu
a01e6dba20 drm/rockchip/ebc-dev: dsp output low when power off
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I34b11e07f2dd34262a9b7730e8251af9209b0d8e
2021-01-22 20:12:56 +08:00
Sugar Zhang
452ebfb0a2 power: reset: reboot-mode: Register callback for kernel pre restart
This patch register boot mode into kernel pre restart call chain
to support 'reset [cmd]'

e.g.

/# fiq
Welcome to fiq debugger mode
Enter ? to get command help
debug> help
FIQ Debugger commands:
 reset [<c>]   Hard reset with command <c>
debug>
debug> reset loader
DDR Version V1.04 20201030
DDR4, 328MHz
BW=32 Col=10 Bk=4 BG=2 CS0 Row=16 CS=1 Die BW=16 Size=2048MB
...
boot mode: loader
...
RKUSB: LUN 0, dev 0, hwpart 0, sector 0x0, count 0x1d1f000

Change-Id: Ic1792bdd0262c77a09fd780c7ac3e6d912b09008
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-01-22 20:12:56 +08:00
Sugar Zhang
e656a9a56a reboot: Introduce kernel pre restart handler call chain
This patch renames kernel_i2c_restart to kernel_pre_restart
for general purpose.

This call chain is expected to be executed before kernel_restart
to do something before reset system. such as, i2c restart,
boot mode config.

Change-Id: I67c80c297ca5de83deb4736b5dab0f2c9c8543a6
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-01-22 20:12:56 +08:00
Sugar Zhang
385f6d70a7 ASoC: rockchip: i2s: Add support for clk compensation
This patch introduces a method to handle clk drift and compensation.

e.g:

/# amixer contents
numid=1,iface=PCM,name='PCM Clk Compensation In PPM'
; type=INTEGER,access=rw------,values=1,min=-1000,max=1000,step=1
: values=0

/# arecord -D hw:0,0 --period-size=1024 --buffer-size=4096 -r
16000 -c 2 -f s16_le /dev/zero &

/# amixer -- cset numid=1 -10
numid=1,iface=PCM,name='PCM Clk Compensation In PPM'
; type=INTEGER,access=rw------,values=1,min=-1000,max=1000,step=1
: values=-10

/# amixer -- cset numid=1 10
numid=1,iface=PCM,name='PCM Clk Compensation In PPM'
; type=INTEGER,access=rw------,values=1,min=-1000,max=1000,step=1
: values=10

Change-Id: I6be8d7275ccf985f43ebc2980ce284c83504ddbc
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-01-22 20:12:56 +08:00
Sugar Zhang
8634d871e4 dt-bindings: sound: rockchip: i2s: Document property 'mclk-calibrate'
Change-Id: I05fa565ba77d77704f82e473ee3b35d6fcc8a6ec
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-01-22 20:12:56 +08:00
Sugar Zhang
70838da2b1 ASoC: rockchip: pdm: Add support for clk compensation
This patch introduces a method to handle clk drift and compensation.

e.g:

/# amixer contents
numid=1,iface=PCM,name='PCM Clk Compensation In PPM'
; type=INTEGER,access=rw------,values=1,min=-1000,max=1000,step=1
: values=0

/# arecord -D hw:0,0 --period-size=1024 --buffer-size=4096 -r
16000 -c 2 -f s16_le /dev/zero &

/# amixer -- cset numid=1 -10
numid=1,iface=PCM,name='PCM Clk Compensation In PPM'
; type=INTEGER,access=rw------,values=1,min=-1000,max=1000,step=1
: values=-10

/# amixer -- cset numid=1 10
numid=1,iface=PCM,name='PCM Clk Compensation In PPM'
; type=INTEGER,access=rw------,values=1,min=-1000,max=1000,step=1
: values=10

Change-Id: Ibc70ce8ccec6dddb082161fa544d066c706c37bc
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-01-22 20:12:55 +08:00
Sugar Zhang
ef3def055b dt-bindings: sound: rockchip: pdm: Document property 'mclk-calibrate'
Change-Id: I64f010b9876fdf736ac6778c7bac52c47e9d905f
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-01-22 20:12:55 +08:00
Liang Chen
8b764766dc arm64: dts: rockchip: rk3568: add opp-table for npu
Change-Id: Ia2e7aadda6c0049003d3c715c0217b3731ffa6a1
Signed-off-by: Liang Chen <cl@rock-chips.com>
2021-01-22 20:12:55 +08:00
YouMin Chen
7441599a38 arm64: dts: rockchip: rk3568: reduce the size of sram
Change-Id: I3ba4273cb4730080a3512551126392a6e3343a05
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2021-01-22 11:21:10 +08:00
Wu Liangqing
0c07360f25 arm64: dts: rockchip: rk3566-evb3: enabled sata1
Change-Id: Ic6c63a1fdcea6b13917c9bb29b9f1eccb611acf9
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-01-12 19:07:15 +08:00
Cai YiWei
23bbd27fb4 media: rockchip: isp/ispp add vb2_rdma_sg_memops to support contiguous page
Change-Id: Ic33bfe6fe5d6e095fc1943fd2933376c42360f17
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-12 19:02:10 +08:00
Cai YiWei
c5068a72e0 Revert "media: videobuf2-dma-sg: support contiguous page by dma attrs"
This reverts commit 46e7d9882b.

Change-Id: I8b7511cd20ae6a0b5cf853e1e07888ea55932bac
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-12 19:02:10 +08:00
Ding Wei
3972dc1b35 video: rockchip: mpp: optimize power for video codec
if have no task then put the power domain.

Change-Id: Ib03484b3f1254feeb32f826f840817efc29b4dd9
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-01-12 17:02:22 +08:00
Wu Liangqing
cafbb426eb arm64: dts: rockchip: rk3566-evb3: uart1 add pinctrl
Change-Id: If3953b43b96db258a0c62d19a1d37d79108cd9eb
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-01-12 14:35:17 +08:00
Zorro Liu
ea05a14df8 drivers: eink pmic: tps65185: add power en pin control
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I1e4aaf46baf65408094b9bda17bb2d0a6b6b8836
2021-01-12 10:55:26 +08:00
Wu Liangqing
2c5b90231b Revert "Revert "Revert "arm64: dts: rockchip: Temporarily disable its for rk3568"""
This reverts commit b14e969b5e.

Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Ie16159d8b8e4eeac9bc39df23baf15d69126af57
2021-01-12 10:54:19 +08:00
XiaoDong Huang
7c679639eb irqchip/gic-v3-its: flush base table if rk3568 or rk3566
Change-Id: Ia2b0dd3d47742c43939eb99d3f8adac8e1107603
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2021-01-12 10:17:04 +08:00
XiaoDong Huang
330a359767 irqchip/gic-v3-its: set flag "ITS_FLAGS_SAVE_SUSPEND_STATE" if rk3568 or rk3566
Change-Id: I5ed122b6480f2fef1ed21bbe0b3ef0ae7c84d3b4
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2021-01-12 10:09:14 +08:00
Weixin Zhou
ef0b86754e driver: input: touchscreen: gt9xx: add ebc suspend notify support
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I8ee3be2aec10416d9f742de3e000a915750c23d3
2021-01-12 09:23:54 +08:00
Tao Huang
4f08cb9303 drm/rockchip/ebc-dev: Add stubs for ebc notify
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I20a397789b591afec36f93b83cb0e64599e4995e
2021-01-12 09:10:38 +08:00
Sandy Huang
14b88ae99c drm/rockchip: vop2: rename vp->nr_wins to vp->nr_layers
vp->nr_layers is more correct than vp->wins

Change-Id: I75c7d7c11cdeee243e6a15539f1c1efbb0cf85a5
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-01-12 09:05:53 +08:00
YouMin Chen
0956f41b35 arm64: dts: rockchip: enable dmc for rk356x board
Change-Id: I483b79784619285b254fa92489e94e325e4e713f
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2021-01-11 20:15:37 +08:00
Weixin Zhou
f405fda4c6 arm64: dts: rockchip: add RK3566 eink w6 board
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Ia0c5f86577e9372f824246f55427670d39cd4d20
2021-01-11 19:33:38 +08:00
Steven Liu
ec23468023 arm64: dts: rockchip: Fix UART pull-ups on rk3399
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I0682ef0afce02947cfefef2e5cd2357692402e8c
2021-01-11 19:06:27 +08:00
Steven Liu
0c77f7cc9f arm64: dts: rockchip: Fix UART pull-ups on rk3368
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I34c7e3afbe225d251fbf27ba57a16b009e6325d7
2021-01-11 19:06:27 +08:00
Steven Liu
f1634ea667 arm64: dts: rockchip: Fix UART pull-ups on rk3328
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ia3acf3223d294e5b53732f626a79e59be01cbe23
2021-01-11 19:06:27 +08:00