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
860,220 Commits 55 Branches 2,486 Tags
5c308603ba792008ee4eccabd9ff53b8ac826ef8
Commit Graph

860220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yifeng Zhao
5c308603ba arm64: configs: rockchip: Enable ACHI 
before
    text	   data	    bss	     dec	    hex	filename
15989635	7547498	2289288	25826421	18a1475	vmlinux

after
    text	   data	    bss	     dec	    hex	filename
16139178	7628603	2293512	26061293	18da9ed	vmlinux

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I32bfb693d387589fba6b523c2dd8791a32043ff1
 2020-11-13 09:46:29 +08:00
Yifeng Zhao
c258c68ce6 phy: rockchip: naneng-combphy: Add sata configs for CON0~3 regs 
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Id91eb780cbe43cf58862c20a1d8c51b7dc4b39f7
 2020-11-13 09:45:34 +08:00
Tao Huang
d726782f85 arm64: rockchip_defconfig: update by savedefconfig 
Fixes: 45805626ea ("arm64: rockchip_defconfig: enable mpp relative codec")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I563b906e2e5af6f235e0593bd6113f1892993688
 2020-11-13 09:34:20 +08:00
Yifeng Zhao
7e8f733aa5 arm64: dts: rockchip: rk3568-evb1-ddr4-v10: enable combphy2 
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Ib4b31f4df0cbf269fb4abfe73cb280797f569fcc
 2020-11-13 09:20:03 +08:00
Yifeng Zhao
7be685fb2c arm64: dts: rockchip: rk3568: modify sata0-sata2 registers address 
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I4d704200ef596118a308e03542dae089a3d43dfa
 2020-11-13 09:16:45 +08:00
Wang Panzhenzhuan
46028feca7 media: i2c: nvp6324 drivers synchronize with kernel 4.4 
kernel 4.4 commit ends 9784ddae38

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: If7d53e4c6667c09a8db90dca571599f12a2088ce
 2020-11-12 21:39:34 +08:00
Andy Yan
4ac05f48e3 drm/rockchip: vop2: Make sure get the current plane state when calculate bandwidth 
Fix dereference of invalid  virtual address when get a cleanuped
plane state:

[   17.908207] Unable to handle kernel NULL pointer dereference at
virtual address 000000000000000c
[   17.911560] Mem abort info:
[   17.911809]   ESR = 0x96000006
[   17.912081]   Exception class = DABT (current EL), IL = 32 bits
[   17.912624]   SET = 0, FnV = 0
[   17.912910]   EA = 0, S1PTW = 0
[   17.913189] Data abort info:
[   17.913466]   ISV = 0, ISS = 0x00000006
[   17.913809]   CM = 0, WnR = 0
[   17.914083] user pgtable: 4k pages, 39-bit VAs, pgdp =
00000000435c7e47
[   17.914681] [000000000000000c] pgd=000000007a6d7003,
pud=000000007a6d7003, pmd=0000000000000000
[   17.915473] Internal error: Oops: 96000006 [#1] SMP
[   17.915907] Modules linked in: bcmdhd
[   17.916240] Process weston (pid: 548, stack limit =
0x00000000f6c6eefe)
[   17.916825] CPU: 0 PID: 548 Comm: weston Not tainted 4.19.154 #312
[   17.917368] Hardware name: Rockchip RK3566 EVB1 DDR4 V10 Linux Board
(DT)
[   17.917970] pstate: 40400009 (nZcv daif +PAN -UAO)
[   17.918417] pc : vop2_crtc_bandwidth+0x21c/0x2dc
[   17.918825] lr : vop2_crtc_bandwidthwhen

[   17.632811] refcount_t: increment on 0; use-after-free.
[   17.632883] WARNING: CPU: 0 PID: 546 at lib/refcount.c:153
refcount_inc_checked+0x38/0x44

[   17.632896] Modules linked in: bcmdhd
[   17.632922] CPU: 0 PID: 546 Comm: weston Not tainted 4.19.154 #311
[   17.632934] Hardware name: Rockchip RK3566 EVB1 DDR4 V10 Linux Board
(DT)
[   17.632943] pstate: 40400009 (nZcv daif +PAN -UAO)
[   17.632951] pc : refcount_inc_checked+0x38/0x44
[   17.632958] lr : refcount_inc_checked+0x38/0x44
[   17.635052] Call trace:
[   17.635069]  refcount_inc_checked+0x38/0x44
[   17.635088]  drm_mode_object_get+0x40/0x4c
[   17.635104]  __drm_atomic_helper_plane_duplicate_state+0x3c/0x50
[   17.635119]  vop2_atomic_plane_duplicate_state+0x4c/0x74
[   17.635129]  drm_atomic_get_plane_state+0xd0/0x154
[   17.635137]  rockchip_atomic_helper_update_plane+0x64/0x128
[   17.635146]  __setplane_atomic+0x148/0x160
[   17.635160]  drm_mode_setplane+0x1f0/0x24c
[   17.635171]  drm_ioctl_kernel+0x8c/0xfc
[   17.635184]  drm_ioctl+0x324/0x3b8
[   17.635204]  vfs_ioctl+0x58/0x68
[   17.635215]  do_vfs_ioctl+0xb4/0x9d4
[   17.635228]  ksys_ioctl+0x50/0x80
[   17.635237]  __arm64_sys_ioctl+0x28/0x38
[   17.635255]  el0_svc_common.constprop.0+0xe8/0x168
[   17.635267]  el0_svc_handler+0x70/0x8c
[   17.635282]  el0_svc+0x8/0xc

Change-Id: I95f6445ff5008c3505ad0cc68b2d005a196cd881
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-11-12 21:33:08 +08:00
Shawn Lin
2f9fd14733 PCI: rockchip: dw: Increase delay for power to make link stable 
Change-Id: Ib3369aeac9f99004a0b3f5831966cb04c0c7f750
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
 2020-11-12 19:12:09 +08:00
Shawn Lin
537a1fadc3 arm64: dts: rockchip: rk3568: comment out bifurcation mode for PCIe30 
We don't need it and should add this if needed in the evb boards. But
now we leave a comment in rk3568.dtsi to make a reference for BSP
developers.

Change-Id: Idf829f2833dbc8e631b15ecc93baddc72d125d3e
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
 2020-11-12 19:11:38 +08:00
Shawn Lin
4d3d4ee8b4 arm64: dts: rockchip: Move PCIe2x1 from rk3568-evb1-ddr4-v10 to rk3566-evb1-ddr4-v10 
Change-Id: Ia795bb888c8cda5d0c400e358adafc4e70142489
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
 2020-11-12 19:10:55 +08:00
Shawn Lin
75ddeb46da arm64: dts: rockchip: rk3568-evb1-ddr4-v10: add pcie3x2 node support 
Change-Id: Icb63913d6a571f81a5128476a41a3517222cf369
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
 2020-11-12 19:07:37 +08:00
Shawn Lin
eabde4b76f phy: phy-rockchip-snps-pcie3: Fix PMA output clamp mode 
PMA output clamp mode should be configured.

Change-Id: I3f622d8dbde00b7f91caf9ba1c3868d6f9ad8d3e
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
 2020-11-12 19:06:35 +08:00
Shawn Lin
83294f1897 phy: rockchip: naneng-combphy: Add pcie configs for CON0~3 regs 
Change-Id: I2ac42b888c4de9e373c9de91e5cdb1d2c18cc3c2
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
 2020-11-12 19:06:35 +08:00
Simon Xue
8491668b12 iommu/rockchip: fix v2 log_iova 
Change-Id: I75a5ae3424b41d62c28143dc4d14d3cb095a726b
Signed-off-by: Simon Xue <xxm@rock-chips.com>
 2020-11-12 19:05:56 +08:00
Cai YiWei
8430959208 media: rockchip: ispp: fix can't work due to last abnormal exit 
Change-Id: Id389aef8e9506cef7aa0872dd34a7925480f87f0
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-11-12 19:02:44 +08:00
Elaine Zhang
ab0b7f6bfa arm64: dts: rockchip: rk3568: fix up the pcie soft reset ID 
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I479ef28f60e913c894b37dab0eccfd5d3664de04
 2020-11-12 18:23:06 +08:00
Elaine Zhang
7e7e372271 dt-bindings: clock: rk3568: update the pcie soft reset id 
Updates missing parts of the TRM.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ia24cd2986f7b0f11884260132aa4f5782eb58c52
 2020-11-12 18:23:05 +08:00
Jason Song
b86361fa4e arm64: rockchip_defconfig: Enable CONFIG_TOUCHSCREEN_FTS 
Enable focaltech touch driver used on Rockchip RK3566 RKG11 2K TABLET.

Signed-off-by: Jason Song <sxj@rock-chips.com>
Change-Id: I4c25d9a31f697b49e36d3d653435013fe57f9c84
 2020-11-12 10:17:10 +00:00
Wyon Bi
6199db7ccc drm/bridge: analogix_dp: power on phy before aux transfer 
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ie83f914ac149a9384dc0ca529fb3a88c8d3ac845
 2020-11-12 17:33:23 +08:00
Wyon Bi
c582c1bfbb drm/rockchip: analogix_dp: Accept drm_of_find_panel_or_bridge failure 
Not having an endpoint bound in DT should not cause a failure here,
there are fallbacks. So explicitly accept a missing endpoint.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Iea7e2456de05b76cf6d94232ab9bb75425cfffc0
 2020-11-12 17:30:40 +08:00
Wyon Bi
14ba9f8642 drm/bridge: analogix_dp: Fix enhanced framing capability in fast training 
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ib192b52e2421d558c4c7fd5e6683bbaf99a43d5c
 2020-11-12 17:30:07 +08:00
Elaine Zhang
23dfbd105e clk: rockchip: rk3568 export clk id CPLL_333M 
cpll_333m need change rate by ebc.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I39cf3b436d0822c5e9be74f0fa181a74960c3e57
 2020-11-12 17:28:31 +08:00
Weiguo Hu
c7a7525815 net: wireless: rockchip_wlan: realtek wifi: avoid illegal argument when called by ioctl SIOCDEVPRIVATE read 
Illegal argument will cause following kernel panic.

Call trace:
  phy_RFSerialRead_8723B
  PHY_QueryRFReg_8723B
  rtw_hal_read_rfreg
  rtw_wx_read_rf
  _rtw_ioctl_wext_private
  rtw_ioctl
  dev_ifsioc
  dev_ioctl

CNVD-C-2020-259506

Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
Change-Id: I27e7a453a0156371fb96c764df99e8a77dce87fa
 2020-11-12 17:21:08 +08:00
Wyon Bi
54d2c4a177 arm64: dts: rockchip: rk3568: Drop unused xin_osc0_edpphy 
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I117e08e6ab7a7b3655692cda9deda08931b53b18
 2020-11-12 17:09:54 +08:00
Jason Song
3161226167 driver: input: screentouch: support focaltech touch. 
Signed-off-by: Jason Song <sxj@rock-chips.com>
Change-Id: Idd0d772225ed11a5080649d8e962e5cb4c2b89b7
 2020-11-12 17:08:44 +08:00
Shunqing Chen
f701ad8fcf arm64: dts: rockchip: rk3566-evb1-ddr4-v10: enable hdmi 
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: Id8da4262ffa855c70a1ec5b71ea74236c681fe17
 2020-11-12 17:03:16 +08:00
Caesar Wang
41c9c34159 arm64: dts: rockchip: adapter boards configuration for rk3568 
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I6dc5d3051003aa753f16079266838532532a21f5
 2020-11-12 15:47:58 +08:00
Elaine Zhang
1a20aa5621 clk: rockchip: rk3568: fix up the pciephy_ref setting rate error 
Pmucru updates missing parts of the TRM.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I8fdd5d2b1feed2ab40e2b00f77a30686df56dd96
 2020-11-12 15:38:49 +08:00
Xing Zheng
ea0ed9f42b arm64/configs: enable Audio references on Linux configs for RK356X-EVB 
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Icae97bbbde45a558d23894d95bdc34784725e5d5
 2020-11-12 15:35:12 +08:00
Caesar Wang
d95072a003 arm64: dts: rockchip: adapter boards configuration for rk3566 
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I13acc6238bf7512a8327c23dc1a0991d23d48ddf
 2020-11-12 15:34:10 +08:00
David Wu
8f4b73ffda arm64: dts: rockchip: rk3568-evb: Change the delayline for gmac0 and gmac1 
Change-Id: Ia5ee198234562045c028af8d3c3b6f3210efe4ac
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2020-11-12 15:19:21 +08:00
Algea Cao
a46506e8d1 drm: rockchip: dw-hdmi: Add ddc_en_reg description 
Fixes: cdbb863092 ("drm: rockchip: dw-hdmi: Enable 3568 hdmi ddc")
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I424a7235b775aed9510831e6df1a3d9a012d6923
 2020-11-12 15:12:33 +08:00
Algea Cao
2665bc4a84 drm: rockchip: dw-hdmi: Introduce HCLK_VOP for RK3566/RK3568 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ifcc15490b135692d955500114b59cbf8c326cacd
 2020-11-12 15:03:14 +08:00
Algea Cao
aa501b29ee arm64: dts: rockchip: rk3568: Add HCLK_VOP for hdmi 
If hdmi doesn't enable HCLK_VOP, clock reference
count will be abnormal and may cause system stuck.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ibe01d029d1ae69f9f32d4cd0eb149bf72a662381
 2020-11-12 15:02:34 +08:00
Shunqing Chen
3c97807997 arm64: dts: rockchip: rk3568-evb: fix issue of hdmi no sound 
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: Ic3a3366c8336e86ef62cd8af270b4c938832c9ec
 2020-11-12 14:27:57 +08:00
Alex Zhao
a68d8fa144 arm64: dts: rockchip: rk3568-evb1-ddr4-v10 :add wifi/bt for evb1 
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I9cc3bfe1258ba972474e3e60197d0bdb8878e06d
 2020-11-12 14:19:44 +08:00
Andy Yan
489331887b drm/rockchip: vop2: Check the max output width for video port 
Mark the display mode which request a unsupported output width
as MODE_BAD_HVALUE.

Change-Id: I5d4dbefb8cdd97d54512f6a8e4c9de74d849ea89
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-11-12 14:06:06 +08:00
Andy Yan
925153dae7 drm/rockchip: vop2: Convert 10 bits output mode to 8 bits for vp max bpc is 8 
Not all the video ports support 10 bit output, so
we need do a convert here.

Change-Id: I6dbb0c23e9cc1ceaf295e2771606705dacd37994
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-11-12 14:06:06 +08:00
Andy Yan
48c83387b1 drm/rockchip: vop2: Add unique share id for Cluster window 
This make Android hwc happy.

Change-Id: I1b83d512dcd553b2f98e52b808628f71657a1516
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-11-12 14:06:06 +08:00
Andy Yan
75a451f7d9 drm: debugfs: No write dump buffer when crtc is not active 
No framebuffer to dump when crtc is not active.

Change-Id: If05c629644653121f3fd97229eb845ffa30bf941
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-11-12 14:06:06 +08:00
Andy Yan
02deab7718 drm/rockchip: vop2: Add multi area scl support 
Add multi area scaler register.

Change-Id: I1f47f77d444f5cd83a61a31390b4ed5d8558caa6
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-11-12 14:06:06 +08:00
Sugar Zhang
b52bf64a33 arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Add audiopwmout differential 
Change-Id: I5e3631b9d39cb6c213e6d6994b05a66b1ef4bc94
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2020-11-12 12:17:43 +08:00
Sugar Zhang
65f13f2ee6 arm64: dts: rockchip: rk3568-evb: Add audiopwmout differential 
Change-Id: Ifca7a65357137d44326cdf0f5dcec0d35b42b3a1
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2020-11-12 12:17:20 +08:00
Sugar Zhang
279398feba arm64: dts: rockchip: rk3568-pinctrl: Fix iomux for audiopwm 
Change-Id: If6e4bdc04f669dbe06149de24cf1030f66f409d9
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2020-11-12 12:16:52 +08:00
Sugar Zhang
2b2357f465 arm64: dts: rockchip: rk3568: Add CLK_ACDCDIG_I2C for dig_codec 
Change-Id: I74b873c03773a60451e6a829dd27fa6e4774a34e
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2020-11-12 12:16:19 +08:00
Sugar Zhang
6cf335aa30 arm64: configs: rockchip: Enable digital codec interface 
Digital codec interface is used with external codec analog part
with pdm link(e.g.: rk812) or audiopwm out differential.

Change-Id: Ic649cf1861cdcd493d52176a627ba7bbdf3338ae
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2020-11-12 12:04:35 +08:00
Sugar Zhang
ee5f3c03ef ASoC: codecs: rk_codec_digital: Restore register when pm runtime_suspend/resume 
Change-Id: I0730f50faa3fea1823570dd7390ac760efbfe99f
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2020-11-12 12:04:10 +08:00
Sugar Zhang
271b62097e ASoC: codecs: rk_codec_digital: Add CLK_I2C handling 
Change-Id: Ia4320952d55840d95ac22ae230d3e264f86e62d0
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2020-11-12 12:04:10 +08:00
Alex Zhao
89654b82e2 arm64: rockchip_defconfig: add uart number to 10 
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: Ifecbebaf84c74ba4b7566192f661c94c1af1d30d
 2020-11-12 11:43:01 +08:00
Sandy Huang
05d15d5e4a arm64: dts: rockchip: rk356x-evb: move dsi config position 
Change-Id: I01f64a949638c66972fbe57895a5488e0dbc2d59
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2020-11-12 11:26:01 +08:00