shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity
861,590 Commits 55 Branches 2,486 Tags
a57c7fa1c7a2a464150bc42ca5fdbaaa6f2ea07a
Commit Graph

861590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shawn Lin
a57c7fa1c7 PCI: rockchip: dw: Fix suspend support for rk356x 
Migrate to noirq phase and only call rk_pcie_reset_grant_ctrl()
when using in RK1808 platforms.

Change-Id: I629dc121457614b17bcf9a1e1d93e09859a4cb26
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
 2021-01-07 15:11:46 +08:00
Jianqun Xu
3b1adb0d79 ARM: mm: fix virtual kernel memory layout display format 
Before this patch:
[    0.000000] Virtual kernel memory layout:
[    0.000000]     vector  : 0xffff0000 - 0xffff1000   (   4 kB)
[    0.000000]     fixmap  : 0xffc00000 - 0xfff00000   (3072 kB)
[    0.000000]     vmalloc : 0xf0800000 - 0xff800000   ( 240 MB)
[    0.000000]     lowmem  : 0xb0000000 - 0xf0000000   (1024 MB)
[    0.000000]     pkmap   : 0xafe00000 - 0xb0000000   (   2 MB)
[    0.000000]     modules : 0xaf000000 - 0xafe00000   (  14 MB)
[    0.000000]       .text : 0x(ptrval) - 0x(ptrval)   (9184 kB)
[    0.000000]       .init : 0x(ptrval) - 0x(ptrval)   (1024 kB)
[    0.000000]       .data : 0x(ptrval) - 0x(ptrval)   ( 331 kB)
[    0.000000]        .bss : 0x(ptrval) - 0x(ptrval)   ( 896 kB)

With this patch:
[    0.000000] Virtual kernel memory layout:
[    0.000000]     vector  : 0xffff0000 - 0xffff1000   (   4 kB)
[    0.000000]     fixmap  : 0xffc00000 - 0xfff00000   (3072 kB)
[    0.000000]     vmalloc : 0xf0800000 - 0xff800000   ( 240 MB)
[    0.000000]     lowmem  : 0xb0000000 - 0xf0000000   (1024 MB)
[    0.000000]     pkmap   : 0xafe00000 - 0xb0000000   (   2 MB)
[    0.000000]     modules : 0xaf000000 - 0xafe00000   (  14 MB)
[    0.000000]       .text : 0xb0008000 - 0xb0900000   (9184 kB)
[    0.000000]       .init : 0xb0c00000 - 0xb0d00000   (1024 kB)
[    0.000000]       .data : 0xb0d00000 - 0xb0d52d4c   ( 332 kB)
[    0.000000]        .bss : 0xb0d52d4c - 0xb0e329b0   ( 896 kB)

Change-Id: I3c77ff89dc5320213f4ff1e0a89b3c688f1d0638
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2021-01-07 15:03:45 +08:00
Jianqun Xu
7a669a6418 mm: cma: add CmaAllocated/CmaReleased info for meminfo node 
Show the CMA pages used by cma_alloc in meminfo node.

Tested on RV1126 EVB DDR3:
CmaTotal:         270336 kB
CmaAllocated:      44408 kB
CmaReleased:      225928 kB
CmaFree:               0 kB

The CmaTotal = CmaAllocated + CmaReleased, and the CmaFree is pages
under cma area unused by system.

The CmaAllocated can be calculated by CMA_DEBUGFS.
Tested on RV1126 EVB DDR3:
cat /sys/kernel/debug/cma/*/used
10756
346

The results from cma used is in page count, 1 page = 4kByte
CmaAllocated = 44408kB = 10756 + 346 pages

Change-Id: Ib79001367562c968e6432816b158cba551978173
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2021-01-07 14:16:12 +08:00
Andy Yan
adb17e773c drm/rockchip: vop2: Register format_modifiers 
Userspace can check format_modifiers to know if
we support afbc or other format.

Change-Id: I6c74876551877e5bef1d98d2d85d4c3d84e2104b
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2021-01-07 14:05:21 +08:00
Wyon Bi
22e1c3dbb7 drm/bridge: analogix_dp: Fix voltage_swing/pre_emphasis level calculation 
Fixes: d7ad116fb3 ("drm/rockchip: analogix_dp: Add support for rk3568")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I6da4a8c0c4b5486bac6bb054aee6535118e81f60
 2021-01-07 11:42:15 +08:00
Cai YiWei
ebb99ecd46 media: rockchip: ispp: add virtual video for iqtool 
Change-Id: I33229d46cb476e8ab036883238815821fe6119d2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-07 11:36:59 +08:00
zhangqing
c6be2b1160 arm64: dts: rockchip: rk3568: modify gpu clk 
GPU clk using SCMI,replace <&cru CLK_GPU> with <&scmi_clk 1>

Signed-off-by: zhangqing <zhangqing@rock-chips.com>
Change-Id: I12d263b29caa8dd5b635a5d6bbf86677ed12414d
 2021-01-07 11:30:22 +08:00
Elaine Zhang
d8f8857b7e clk: rockchip: rk3568: add READ_ONLY flag for clk_gpu 
clk_gpu is not allow to set rate, just read only.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I59b31b059cfe941104765c066a0c678b1ca50312
 2021-01-07 11:29:55 +08:00
zhangqing
36f64d7150 arm64: dts: rockchip: rk3568: modify cpu clk 
CPU clk using SCMI,replace <&cru ARMCLK> with <&scmi_clk 0>

Signed-off-by: zhangqing <zhangqing@rock-chips.com>
Change-Id: I321493604d95690ca2a2b4040dfcf8acd9f77697
 2021-01-07 11:29:45 +08:00
XiaoDong Huang
bd22b8ce75 arm64: dts: rockchip: rk3568: Make some changes for scmi 
1. Use DDR 1M+60K~1M+64K instead of sram to be share memory.
2. Delete property "shmem" in scmi_clk node.
3. Change smc-id to 0x82000010.

Change-Id: I97f25dec6b61fb749b1ef79ef9875abe48fa662e
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
 2021-01-07 11:27:37 +08:00
Yao Xiao
e5235d6a08 net: rockchip_wlan: update cywdhd to "1.363.125.19 (r)" 
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: I4be636719d780978486d8ad204472cfb1023ca99
 2021-01-06 18:20:16 +08:00
Caesar Wang
9ccfa45cf3 arm64/configs: update rockchip_linux_defconfig 
1/ enable sii902x
Add RGB/BT1120 to HDMI support, this is needed by
rk3568-evb2-lp4x-v10-bt1120-to-hdmi.

2/ enable CONFIG_SDIO_KEEPALIVE
This is needed by RK356X EVB to support Wi-Fi.

3/ add rockchip ebc dev driver.

4/ remove unused CONFIG_I2C_MUX.

5/ enable CONFIG_PCIE_DW_ROCKCHIP for PCIE devices.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I3076aefab88fa2b166a8af89e8681fa46a69e7f9
 2021-01-06 18:15:37 +08:00
Daniel Vetter
97fd895541 UPSTREAM: dma-buf: Fix SET_NAME ioctl uapi 
The uapi is the same on 32 and 64 bit, but the number isn't. Everyone
who botched this please re-read:

https://www.kernel.org/doc/html/v5.4-preprc-cpu/ioctl/botching-up-ioctls.html

Also, the type argument for the ioctl macros is for the type the void
__user *arg pointer points at, which in this case would be the
variable-sized char[] of a 0 terminated string. So this was botched in
more than just the usual ways.

Change-Id: Iaffffa806de8f6f10cd167881bb63fdabd6724a2
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Chenbo Feng <fengc@google.com>
Cc: Greg Hackmann <ghackmann@google.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Cc: minchan@kernel.org
Cc: surenb@google.com
Cc: jenhaochen@google.com
Cc: Martin Liu <liumartin@google.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Tested-by: Martin Liu <liumartin@google.com>
Reviewed-by: Martin Liu <liumartin@google.com>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
  [sumits: updated some checkpatch fixes, corrected author email]
Link: https://patchwork.freedesktop.org/patch/msgid/20200407133002.3486387-1-daniel.vetter@ffwll.ch
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit a5bff92eaa)
 2021-01-06 18:13:00 +08:00
Jianqun Xu
604baba3e7 android: ion: set sg address by sg_dma_address 
Change-Id: I20b6d34a93aa3bc2b0044cfbc004e13ca60d2b2f
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2021-01-06 18:03:33 +08:00
Jianqun Xu
479227ac66 android: ion: add debug node for ion heap 
Add debug node [system/cma]_stats for ion [system/cma]-heap

Change-Id: Ib8ea98f516586c9598e17efe310f7673421fa02a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2021-01-06 17:58:37 +08:00
Jianqun Xu
7e32ad8b9a android: ion: add exp_name for dma buffer 
Add the exp_name for dma buffer with KBUILD_MODNAME, heap->name, current->tgid
and task_comm.

Such as ion_alloc-ion_system_heap-263-allocator@4.0-service

Module: ion_alloc
Heap  : ion_system_heap
tgid  : 263
task  : allocator@4.0-service

Change-Id: I4f11394ae2470dcd2b113b4cfd01d70be9c67c8d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2021-01-06 17:56:50 +08:00
Weiguo Hu
d9d3e43de1 net: wireless: rockchip_wlan: realtek wifi: p2p ioctl illegal parameter protect 
References: CNVD-C-2020-309986, CNVD-C-2020-309987, CNVD-C-2020-309988

Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
Change-Id: I611e16f8155bac6431e0d786c29ef1425ff792d2
 2021-01-06 17:08:25 +08:00
Jianqun Xu
6bb31db2cf mm/cma: show cma bitmap in hex format 
Change-Id: I0f8b49202e3e173961f8f2697e0e3494a07afa1d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2021-01-06 16:59:56 +08:00
Weixin Zhou
12c78422e2 driver: input: touchscreen: Make sure that suspend/resume is called only once 
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I198581c45baf31f62b9ffa6ba6d9ec15cf4c606d
 2021-01-06 16:19:13 +08:00
Hu Kejun
e5c26944dd media: rockchip: isp: get stats only when meas done is on 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I52b167b0aa52a0e4e636334d3b874fa5616dc6da
 2021-01-06 16:18:54 +08:00
Cai YiWei
56130b06e8 media: rockchip: isp: remove rx enable config 
rx auto enable by csi op_mode

Change-Id: I0e4f807071ceceb1a9c53df5ede0a586febc442a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-06 16:16:23 +08:00
David Wu
1847729a77 arm64: dts: rockchip: rk3568: Add xpcs support 
Change-Id: I431393b2346f5f7fd6b0d74f79e643df9a586479
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2021-01-06 15:24:40 +08:00
Alex Zhao
b59b1c0040 mmc: add a file to debugfs for changing host max clock at runtime 
Usage is as follows:

rk3566_rgo:/ # cat /sys/kernel/debug/mmc1/max_clock
150000000

rk3566_rgo:/ # echo 200000000 > /sys/kernel/debug/mmc1/max_clock
rk3566_rgo:/ # cat /sys/kernel/debug/mmc1/max_clock
200000000
rk3566_rgo:/ # echo 200000000 >  /sys/kernel/debug/mmc1/clock

rk3566_rgo:/ # dmesg -c
[  285.884348] mmc_host mmc1: Bus speed (slot 0) = 198000000Hz (slot req 200000000Hz, actual 198000000HZ div = 0)

Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I7ac9649b231c50b0c6c066407e28954e8c94510c
 2021-01-06 15:18:42 +08:00
David Wu
6f8089df70 phy: rockchip: naneng-combphy: Add SGMII/QSGMII mode support 
Change-Id: I56f30af84b8a2c2207a1c61afa1638736705d1f8
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2021-01-06 10:14:41 +08:00
David Wu
8768a53391 phy: rockchip: naneng-combphy: Sort rockchip_combphy_grfcfg struct member by register 
Change-Id: I3c0593574a442c4de460ff3b0dde651a7fcae901
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2021-01-06 10:14:41 +08:00
Wyon Bi
7c35a5ac27 clk/rockchip/regmap: rk628: Add CLK_SET_RATE_PARENT flag to clk_hdmirx_aud 
Change-Id: I368512b92f5c5068a4f1b9b3c03e82cd5702a05b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
 2021-01-05 19:40:02 +08:00
Elaine Zhang
b4f60fb98b arm64: dts: rockchip: rk3568-evb: add can nodes 
add can0\1\2 node.
set disabled by default.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I9493d640e9afcf1ae4db57e0ad2d680b8922cb92
 2021-01-05 19:30:47 +08:00
Elaine Zhang
9823a37f80 net: can: rockchip: canfd: fix up the bus error 
Fix up tdc calculation rules.
Enable auto retransmission mode.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ia909a71572be768be6639455129ef5c8885f4720
 2021-01-05 19:28:21 +08:00
William Wu
ec7b288bbc usb: dwc3: core: disable device wakeup for rk356x usb host 
RK356x SDK will power off logic and grf module in suspend.
So we don't need to enable device wakeup for rk356x usb host
to keep usb controller PD on. With this patch, it can call
rk356x combphy init by usb_phy_roothub_init during resume,
and fix the usb3.0 host function failure after resume.

Change-Id: I40f9a34b5f2aaeede833f9e46153f60b767ea3f0
Signed-off-by: William Wu <william.wu@rock-chips.com>
 2021-01-05 19:05:18 +08:00
Wu Liangqing
7a81c1f7f5 arm64: dts: rockchip: rk3568-evb: adjust rknpu_reserved size 
Change-Id: I4c691edd02041813f9364802cf92416b03dea4f0
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
 2021-01-05 18:51:32 +08:00
David Wu
1fc7cbfe9e ethernet: stmicro: stmmac: Add SGMII/QSGMII support for RK3568 
Change-Id: Iab9dd6ee61a35bf89fd3a0721f5d398de501a7ec
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2021-01-05 18:30:12 +08:00
David Wu
883ad9f863 ethernet: stmicro: dwmac-rk: Add null pointer check for gmac ops 
Change-Id: Ic00540c0f018ba5115ebc3dad62b007024f6a6ad
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2021-01-05 18:04:43 +08:00
Alex Zhao
a6107c8add Revert "arm64: dts: rockchip: change the wifi power-on method for rk356x evb" 
This reverts commit e37604f00f.

Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I90a96482445710b6089acd5b6ad19264462b35f7
 2021-01-05 17:53:47 +08:00
Algea Cao
67be194d10 drm: rockchip: dw-hdmi: Fix display err between kernel logo and bootanimation 
If the hdmi color format is set to DRM_HDMI_OUTPUT_YCBCR_HQ or
DRM_HDMI_OUTPUT_YCBCR_LQ when the system boot, The actual color
formats is YUV444/YUV422/YUV420. This leads to misjudgment that
the color format has changed, hdmi will be reset. That cause
display err between kernel logo and bootanimation.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I5d4784ecb64df82ab40723fddb6aef94cb493c5e
 2021-01-05 17:34:56 +08:00
Liang Chen
88169e6e3b MALI: bifrost: Fix wrong voltage for devfreq 
(kbdev->current_freqs[i] > freqs[i]) will be always false becasue kbdev->current_freqs[i]
has been updated to freqs[i], so we need save current_freqs[i] to old_freqs[i].

Change-Id: I3f8a06d474a359cf292460878c53592c4ce1472b
Signed-off-by: Liang Chen <cl@rock-chips.com>
 2021-01-05 14:52:16 +08:00
Ren Jianing
0035a1a225 arm64: dts: rockchip: add maximum-speed at DWC3 host for rk3568-evb6 
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I7f70a40e633b2ec1549334954fefdc5ef11e3b4e
 2021-01-05 14:36:44 +08:00
Vicent Chi
05f884ba7a media: i2c: add tp2855 driver 
Change-Id: I0df90801fc5ca04ec92f10071915c5706f642f44
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
 2021-01-05 14:23:46 +08:00
Xiao Ya peng
f87a80b733 arm64: configs: rockchip_linux_defconfig: enable spi nand flash and ubifs. 
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
Change-Id: Ifab48fa09836244da7a300bcd00f901ca51c7faa
 2021-01-05 10:21:47 +08:00
Sugar Zhang
93773ea1ee ASoC: rockchip: pdm: Add support for path map 
This patch adds property 'rockchip,path-map' for path mapping.

e.g.

"rockchip,path-map = <3 2 1 0>" means the mapping as follows:

  path0 <-- sdi3
  path1 <-- sdi2
  path2 <-- sdi1
  path3 <-- sdi0

Change-Id: Ief7ef83cbcf8c57ee9dc07e49d70ea7e5da9e5cc
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2021-01-05 09:18:17 +08:00
Sugar Zhang
3a294df494 dt-bindings: sound: pdm: Document property 'rockchip,path-map' 
This is an optional property to describe data path mapping.

Change-Id: I99fb91a5d1be2e3ec9c7edac206760f589949df5
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2021-01-05 09:16:33 +08:00
Sandy Huang
f33ddff87a drm/rockchip: vop2: move write_back close time point 
Change-Id: Ia9cd0f2c479bb25488a43835a721c32f7a314f36
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2021-01-04 19:08:33 +08:00
Sugar Zhang
593aff088a ASoC: rockchip: i2s-tdm: Add support for half frame fsync 
This patch parses property 'rockchip,tdm-fsync-half-frame' from
DT to config tdm fsync width.

Change-Id: I3254d753a213b7a74462bb85a20ea33d8c3fc3fc
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2021-01-04 19:06:19 +08:00
Sugar Zhang
b6a8de0be6 dt-bindings: sound: i2s-tdm: Document property 'tdm-fsync-half-frame' 
Change-Id: I7ec07f17dafd6ec4d9c919f74454e84a77d2950f
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2021-01-04 19:06:11 +08:00
Xiao Ya peng
e1d9a5d5b7 arm64: dts: rockchip: add rk3568-nvr-demo-v10-linux-spi-nand 
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
Change-Id: Ic27b5f894f88523faa78f32e8bb5e2445a0b4adc
 2021-01-04 18:15:22 +08:00
Andy Yan
09c9eeed00 drm/rockchip: vop2: Add writeback support 
VOP2 has a writeback with max 1920 x 1080 output.
Writeback work as a connector in drm system.

Change-Id: I670ca8de5155f1102454c618c62dd0c51fa45202
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2021-01-04 16:41:27 +08:00
Shunqing Chen
ad33a4d0b5 arm64: dts: rockchip: rk3566-rk817-tablet: set power_off_thresd to 3350mv 
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I374db3d7fdc2209cb42b8ced5d0741d0b2887b1e
 2021-01-04 15:34:14 +08:00
Shawn Lin
40173a73f0 PCI: rockchip: dw: Power up before phy init 
For external OSC phy, such as RK3568 PCIe 3.0, it needs the
power supply to be stable before configuring phy parameter
as the 100MHz refclk is also supplied by 3V3 power.

Change-Id: Ic4c7b49d3613c55d7cd8b5b24e81581c9094294a
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
 2021-01-04 15:31:20 +08:00
Zefa Chen
4aa642d4dc dt-bindings: media: i2c: Document add gc2093 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I955a4e4fb6be4cde50f675e276442eaf58d1f81c
 2021-01-04 12:40:16 +08:00
Zefa Chen
2167eab1b5 dt-bindings: media: i2c: Document add gc2053 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Idbbb9a286b28592b004257c226fa81846d949db9
 2021-01-04 12:39:55 +08:00
David Wu
30ebb681b7 clk: rockchip: Fixed xpcs_mii clock for rk3568 
Change-Id: I3dfa606f4d790a8b8882bafb268a236a4c245529
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2021-01-04 10:21:46 +08:00