shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,060,703 Commits 55 Branches 2,486 Tags
ee20202c9782c8eaabfd23590967a52d4a57d460
Commit Graph

1060703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhen Chen
ee20202c97 arm64: dts: rockchip: rk3588s: gpu: enlarge register space to 0x200000 
Valhall device driver expects that it is at least 0x200000.

Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: Ide488624375fdc2b242442bf023040e8ed8358e8
 2021-11-12 14:10:09 +08:00
Sugar Zhang
1e94be3e6e ASoC: es8323: Fix NULL pointer dereference when shutdown 
Component is null when sound card link failed. So, switch to use regmap
directly in shutdown path.

Unable to handle kernel NULL pointer dereference at virtual address 0000000000000090
Mem abort info:
  ESR = 0x96000005
  EC = 0x25: DABT (current EL), IL = 32 bits
  SET = 0, FnV = 0
  EA = 0, S1PTW = 0
Data abort info:
  ISV = 0, ISS = 0x00000005
  CM = 0, WnR = 0
user pgtable: 4k pages, 39-bit VAs, pgdp=0000000005ff2000
[0000000000000090] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000
Internal error: Oops: 96000005 [#1] PREEMPT SMP
Modules linked in:
CPU: 2 PID: 1 Comm: init Not tainted 5.10.43 #110
Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
pstate: 20400009 (nzCv daif +PAN -UAO -TCO BTYPE=--)
pc : mutex_lock+0x2c/0x64
lr : snd_soc_component_write+0x30/0xd0
sp : ffffffc011e2bc10
x29: ffffffc011e2bc10 x28: ffffff8002200000
x27: 0000000000000000 x26: ffffffc011cf1000
x25: ffffffc011dac000 x24: ffffff80046128c0
x23: ffffff8004612828 x22: 0000000000000001
x21: 0000000000000058 x20: 0000000000000000
x19: 0000000000000090 x18: ffffffc011e25058
x17: 000000000000000a x16: 0000000000000001
x15: 0000000000000000 x14: 0000000000000400
x13: 000000000000276a x12: 0000000029aaaaf0
x11: 0000000001000c2b x10: 0000000007ae1850
x9 : 0000000000000000 x8 : 0000000000000090
x7 : 0000000000000000 x6 : 0000000000000000
x5 : ffffffc011e2bb40 x4 : 0000000000000000
x3 : 0000000000000000 x2 : ffffff8002200000
x1 : 0000000000000000 x0 : 0000000000000090
Call trace:
 mutex_lock+0x2c/0x64
 snd_soc_component_write+0x30/0xd0
 es8323_i2c_shutdown+0x13c/0x1f0
 i2c_device_shutdown+0x44/0x54
 device_shutdown+0x174/0x214
 kernel_restart+0x44/0x110
 __arm64_sys_reboot+0x148/0x21c
 el0_svc_common+0xa4/0x180
 do_el0_svc+0x28/0x88
 el0_svc+0x14/0x24
 el0_sync_handler+0x88/0xec
 el0_sync+0x1a8/0x1c0

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I978764678bd36321d0e3f8ac8e487c328eb7a720
 2021-11-12 11:34:31 +08:00
Tao Huang
52cbc3ce90 arm64: rockchip_defconfig: Enable CONFIG_PRINTK_TIME_FROM_ARM_ARCH_TIMER 
For get boot time better.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Idcde84f57c29c81587e1c0b51c3308f031f1f2e6
 2021-11-12 11:23:51 +08:00
Tao Huang
4214832392 printk: Introduce CONFIG_PRINTK_TIME_FROM_ARM_ARCH_TIMER 
Some examples for console output:

Starting kernel ...

[    1.956071][    T0] Booting Linux on physical CPU 0x0000000000 [0x412fd050]

Change-Id: I0ab5914349ad3e0028954c831c5e79d46fe2d420
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2021-11-12 11:21:16 +08:00
Tao Huang
f4f5c36bc6 arm64: dts: rockchip: Add reboot mode for rk3588 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I56f1ff125d8ec627fa774690764d9e9a99e57ff4
 2021-11-12 10:11:30 +08:00
Sugar Zhang
b161f411c3 ASoC: rockchip: i2s-tdm: Make property 'grf' optional 
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: If50451ec8e4e7b872e4101551bc4c5063ac4e3b8
 2021-11-12 09:35:16 +08:00
Finley Xiao
e4899cdc78 Revert "arm64: dts: rockchip: rk3588: Add pd vdpu before pd rkvdec" 
This reverts commit 24627eab36.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I8308cffccadcb7f585ee19b39f2575477ae0d62b
 2021-11-12 09:23:06 +08:00
Finley Xiao
9adc296fc7 soc: rockchip: power-domain: Only don't power down pd when enable always on 
Fixes: ad7e570f0d ("soc: rockchip: power-domain: Add support to keep domains power on")
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I68a96cec47bd17c9e5f777a21a1b25b86f888715
 2021-11-12 09:22:40 +08:00
Finley Xiao
10f14bf944 soc: rockchip: power-domain: Fix repair status 
Fixes: 57db7e6ba5 ("soc: rockchip: power-domain: Add support to repair memory when power up")

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Id0e8c3a1da54174101626f4e722913ed2e5d5b70
 2021-11-11 23:26:05 +08:00
Andy Yan
03335fc9ad arm64: dts: rockchip: rk3588: Assign ACLK_VOP to 500MHZ 
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I11dc0260bda92bf9870f641f8ca966395d834ce5
 2021-11-11 22:57:45 +08:00
Jianqun Xu
fc3a2449a7 gpio: rockchip: add support for rk3588 
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I6beb25cdcb58eae4b7af74b0990857d9288e5bc0
 2021-11-11 22:48:23 +08:00
Liang Chen
7ecec4c49e arm64: dts: rockchip: rk3588: init ARMCLK_B23 to 1008MHz 
Change-Id: I79625ee71b67a1bc8e86c17832f6331dca8c53d6
Signed-off-by: Liang Chen <cl@rock-chips.com>
 2021-11-11 22:10:28 +08:00
Finley Xiao
24627eab36 arm64: dts: rockchip: rk3588: Add pd vdpu before pd rkvdec 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia19222e78ec772b3f37121f128055f83a5b6094b
 2021-11-11 22:08:29 +08:00
Sugar Zhang
314a46420e arm64: dts: rockchip: rk3588-evb: Fix config for es8388 sound 
Fixes: ea6ea2ba87 ("arm64: dts: rockchip: adjust sound cards for rk3588-evbx and rk3588s-evbx")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I7acedc41e1a34820166ec752990693546dc99064
 2021-11-11 22:06:54 +08:00
Jianqun Xu
448cbad345 pinctrl: rockchip: fix rk3588 drive strength to level 
Fixes: 7c357cd7cf ("pinctrl: rockchip: add rk3588 support")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I48fd9510aebbc107fa23e502ab73779689b70197
 2021-11-11 22:05:00 +08:00
Jianqun Xu
2bb4f7ee43 pinctrl: rockchip: fix rk3588 pinctrl gpio4 pin number 
Fixes: 7c357cd7cf ("pinctrl: rockchip: add rk3588 support")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I76a67d159e0974543538c9a3ff0b61328102e6dd
 2021-11-11 22:05:00 +08:00
Sugar Zhang
a7143c71a5 ASoC: es8323: Fix headphone irq err 
It's optional, so, do nothing when this gpio-irq omitted.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: If82c6ef3610aa47e1be3266b485305514bb1717d
 2021-11-11 21:44:18 +08:00
Andy Yan
4cb725e255 arm64: dts: rockchip: rk3588: Reference pmu for vop 
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I659a7aac3812cc6f12ed19108581be61defbd666
 2021-11-11 20:21:41 +08:00
Andy Yan
8854c8ef52 drm/rockchip: vop2: Add submem power gate support 
RK3588 VOP2 has power gates for VP0/1/2/3, DB0/1/2
and WB.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ie3d67aa804282834949d6950470ba960ea51fcdb
 2021-11-11 20:21:41 +08:00
Jianqun Xu
3df95bb0b9 pinctrl: rockchip: fix rk3588 iomux setting 
Fixes: 7c357cd7cf ("pinctrl: rockchip: add rk3588 support")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: If81e84796da50627497044184d11e5d15784d7e1
 2021-11-11 20:13:17 +08:00
Huibin Hong
01f8963021 arm64: dts: rockchip: rk3588-linux: add debug and cspmu node 
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I5b07ac30bb887edd36a7805bacfa7e1a47649665
 2021-11-11 19:42:12 +08:00
Huibin Hong
763c97523d arm64: dts: rockchip: rk3588-android: add debug and cspmu node 
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: If8102c4f08a0fe4f578129b040212c88cad314e0
 2021-11-11 19:40:48 +08:00
William Wu
603ce88ca3 HACK: arm64: dts: rockchip: rk3588-evb: set max-speed to hs for usb3 
This patch sets the maximum speed to high speed for
USB 3.0 OTG on rk3588 and rk3588s evbs. It's used to
support USB 2.0 ADB during bring up stage.

In the future, if the USB 3.0 PHY driver is ready, we
can revert this patch.

Change-Id: I654894a894e38c39104dc6efe0446867f6894b7b
Signed-off-by: William Wu <william.wu@rock-chips.com>
 2021-11-11 18:17:19 +08:00
Tao Huang
04264f596c arm64: dts: rockchip: rk3588-linux: Remove debug node 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I91e24e7c4c5240956a175b3683dd3c4e187bc028
 2021-11-11 18:03:23 +08:00
Tao Huang
f27234ade9 arm64: dts: rockchip: rk3588-linux: Enable clk/pd always on 
Debug only.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id45fc1641fd07998ea8498c6e18013a6c54af5dd
 2021-11-11 18:03:23 +08:00
Tao Huang
fb7d7606a1 clk: rockchip: Temporarily fix for rk3588 pll 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I15819f3611556e140ec80126b990408edf260c18
 2021-11-11 17:18:31 +08:00
Tao Huang
e0e8de4a77 arm64: dts: rockchip: rk3588: Disable set PLL_CPLL 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1e6d9e26ad56da0e328bf1fb4b8656e5acf7248d
 2021-11-11 17:17:45 +08:00
Tao Huang
a0a7792bbe arm64: dts: rockchip: rk3588-android: Remove debug node 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4c4a312c22b362605dc9362cdeddb71ef38c4637
 2021-11-11 17:16:52 +08:00
Tao Huang
92ce906652 arm64: dts: rockchip: Temporarily disable its for rk3588 
Debug only.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaad2a7279d65e2f14966050777c989041c925c76
 2021-11-11 16:55:11 +08:00
Shunhua Lan
84d94d76d4 arm64: dts: rockchip: rk3588-evb: add hp-con gpio and fix hp-det pin for sound card 
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I0facbe75a554e52eac4bbaa4bebbf8eb5370b42e
 2021-11-11 14:26:33 +08:00
Shunhua Lan
86d67c794f ASoC: codecs: es8323: add hp-con-gpio control and extcon notifier for headset detect 
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I1d0314ce8185df38ff138f2f2d0d3b0f0fae3707
 2021-11-11 14:20:11 +08:00
Jianqun Xu
73158f4b0f pinctrl: rockchip: fix rk3588 pull type to 1V8_ONLY 
Fixes: 7c357cd7cf ("pinctrl: rockchip: add rk3588 support")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ie59a981ed040185014d5f05c1beae6955ca49bfe
 2021-11-11 14:04:28 +08:00
Wangqiang Guo
7f61b3481d input: touchscreen: support ELAN TP_5515 
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: Ic266d2b3ec1697bc2a56c5cbb9c116ecc7251e7d
 2021-11-11 13:08:33 +08:00
Guochun Huang
89f783f024 drm: rockchip: introduce dw-mipi-dsi2 
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I1865ea38e7b9431ad06282b16300a45989ca065f
 2021-11-11 09:46:23 +08:00
Guochun Huang
d7e3e6de15 drm/rockchip: Add dw-mipi-dsi2 driver 
Change-Id: Ib5e6a8eedd8d49b568057550571b4c5685110df9
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2021-11-11 09:46:23 +08:00
Sugar Zhang
ade52cc9ed arm64: dts: rockchip: rk3588-evb: Add mclk-fs for es8388 sound 
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I8912b36e91e935e36a3af773090452b3223d37ee
 2021-11-10 21:18:00 +08:00
Cai YiWei
1a1a1d4ea8 arm64: dts: rockchip: rk3588s: Add isp unite node 
Change-Id: I72ba08632bbec2bb81394bf9eacd0b3136751c81
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-11-10 21:15:13 +08:00
Cai YiWei
37aa6cff08 media: rockchip: isp: add dual isp unite config 
Change-Id: I8b98811f063f260d33c2759277389eb49ba3a0c3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-11-10 21:14:00 +08:00
Cai YiWei
fdf9827947 media: rockchip: isp: fbc support crop 
Change-Id: Idd2ddb7412870bfe7174f414463e03878eb8944f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-11-10 21:14:00 +08:00
Cai YiWei
221b6fccd9 media: rockchip: isp: sync dhaz params for dual isp unite 
Change-Id: I917a6cfdce36ab41d59f61c1f56de972af249982
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-11-10 21:14:00 +08:00
Cai YiWei
e8b2b58cee media: rockchip: isp: params and stats for dual isp unite 
Change-Id: I8d950102877ea37423baced71b1fec50aa9a92f6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-11-10 21:14:00 +08:00
Cai YiWei
da2794bb29 media: rockchip: isp: dual isp unite process image 
Change-Id: Ia85adab95cce029ea0967c00bd7d0d51863d7d76
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-11-10 21:14:00 +08:00
Cai YiWei
7faaa53254 media: rockchip: isp: add cmsk config for isp30 
Change-Id: Iad86abb3127973b3ac3d8f743f27ffe49466f3ee
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-11-10 21:14:00 +08:00
York Zheng
a46235c40e arm64: dts: rockchip: rk3588s evb4: modify hym8563 int pin 
Signed-off-by: York Zheng <zyk@rock-chips.com>
Change-Id: Ifeb703c10f3374aa847983dac0ef6082811ef8c8
 2021-11-10 17:49:00 +08:00
Shawn Lin
15279b0a44 mmc: dw_mmc-rockchip: Fix corner cases of tuning 
We should avoid rolling the phases if 270 and 0 is both
fine in tuning. Otherwise it would chose a middle phase
laid later than 270 which isn't a good.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Fixes: 8d0e882790 ("mmc: dw_mmc-rockchip: Skip all phases bigger than 270 degrees")
Change-Id: I87bd3e957623d6a5fdf38226be65564e353b01b6
 2021-11-10 17:00:31 +08:00
Shawn Lin
3f26edfb23 mmc: dw_mmc-rockchip: Restore slot's clock if it's updated 
slot's clock is cached before calling ->set_ios for sub-driver.
If the clock is updated by sub-driver, it's better to restore
the cached slot's clock. Or we can see a unexpected clock as the
driver didn't know the slot's clock is updated and still use the
old clock to calculate divider. So we may see a lower clock. It
theory, it's won't be a problem because any rate lower than 400k
should be fine, and we even didn't start issuing any command during
the lower clock. But still it's right to update slot's clock to reflect
the correct clock and may fix some potential unknown problems.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I06581320547bb06c306da57e141d06f9206ea585
 2021-11-10 17:00:31 +08:00
York Zheng
ca8c7fcedd arm64: dts: rockchip: rk3588s evb4: modify pwm config for backlight 
Signed-off-by: York Zheng <zyk@rock-chips.com>
Change-Id: I4a4911f93e447d4aef5c83670c9eb0c4c8f79fc2
 2021-11-10 16:59:08 +08:00
Alex Zhao
4bfa8f90b5 net: rfkill: add wifi and bt driver 
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I1d399641587124d2291b5b49e5538e7e490a843a
 2021-11-10 16:11:47 +08:00
Tao Huang
c0d53bb51b arm64: rockchip_gki.config: Enable CONFIG_RFKILL_RK 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I58f0f461c4aee4c0ee52ff0c41ad1273a4f33eff
 2021-11-10 16:11:47 +08:00
Tao Huang
f6019fde40 arm64: rockchip_defconfig: Enable CONFIG_RFKILL_RK 
default y on 4.19.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2fb7ee043876d49fe7e04bcd838a930e699ff3e1
 2021-11-10 16:11:47 +08:00