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
861,541 Commits 55 Branches 2,486 Tags
30ebb681b707173baffa4b7105d7cfc8a495d297
Commit Graph

861541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bian Jin chen
14c6e632ad ARM: rockchip_defconfig: enable CONFIG_INCREMENTAL_FS by default 
Test:
    CtsIncrementalInstallHostTestCases
    android.incrementalinstall.cts.IncrementalFeatureTest

This config will enable the Incremental File System, which allows
Android OS to receive streamed APKs over adb.

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I0d903f95ed8c1b1765c36a0bd7fde25695138e5c
 2021-01-04 10:18:15 +08:00
Tao Huang
67f163f569 scripts/gcc-wrapper.py: ignore pseudo_files.c:715 
fs/incfs/pseudo_files.c:715:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I229a33517fbe556abeac4e51b35a8ccd4e91f458
 2021-01-04 10:18:15 +08:00
Tao Huang
112e3d237a ANDROID: Incremental fs: Fix printk format warnings in format.c 
fs/incfs/format.c: In function 'incfs_read_next_metadata_record':
./include/linux/kern_levels.h:5:18: warning: format '%ld' expects argument of type 'long int', but argument 2 has type 'size_t {aka unsigned int}' [-Wformat=]
fs/incfs/format.c:619:3: note: in expansion of macro 'pr_warn'
   pr_warn("incfs: The record is too large. Size: %ld",
   ^~~~~~~

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1a0b1e32761dd4358ff3ca210041893373f0a1a5
 2021-01-04 10:09:45 +08:00
Swapnil Jakhade
d393ebfbb8 UPSTREAM: dt-bindings: phy: Add PHY_TYPE_QSGMII definition 
Add definition for QSGMII phy type.

Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com>
Acked-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/1600327846-9733-5-git-send-email-sjakhade@cadence.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
(cherry picked from commit 51862859fb)

Change-Id: I9d522cea7e3369a7ece722b8df9d3eb473af2568
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2021-01-04 09:38:45 +08:00
Anurag Kumar Vulisha
72d00ccae5 BACKPORT: dt-bindings: phy: Add DT bindings for Xilinx ZynqMP PSGTR PHY 
Add DT bindings for the Xilinx ZynqMP PHY. ZynqMP SoCs have a High Speed
Processing System Gigabit Transceiver which provides PHY capabilities to
USB, SATA, PCIE, Display Port and Ehernet SGMII controllers.

Signed-off-by: Anurag Kumar Vulisha <anurag.kumar.vulisha@xilinx.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20200629120054.29338-2-laurent.pinchart@ideasonboard.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
(cherry picked from commit cea0f76a48)

Change-Id: I1d4d304350ad1d48ce369411110d20c30d7f2a9c
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2021-01-04 09:38:05 +08:00
Dilip Kota
d0a93df32c UPSTREAM: dt-bindings: phy: Add PHY_TYPE_XPCS definition 
Add definition for Ethernet PCS phy type.

Signed-off-by: Dilip Kota <eswara.kota@linux.intel.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-By: Vinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/6091f0d2a1046f1e3656d9e33b6cc433d5465eaf.1589868358.git.eswara.kota@linux.intel.com
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
(cherry picked from commit c5d3cdad68)

Change-Id: I90e09759d281b4a5f561525512b76d469f95291d
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2021-01-04 09:37:02 +08:00
Jyri Sarha
952858f8c7 UPSTREAM: dt-bindings: phy: Add PHY_TYPE_DP definition 
Add definition for DisplayPort phy type.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Reviewed-by: Roger Quadros <rogerq@ti.com>
Reviewed-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
(cherry picked from commit 8a79db5e83)

Change-Id: I326b193f4edef6e5cf0bba7c54f6b32e389ea795
Signed-off-by: David Wu <david.wu@rock-chips.com>
 2021-01-04 09:37:02 +08:00
Weixin Zhou
b2e245c2d7 driver: input: touchscreen: gt9xx: add new config of 768x1024 
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Ibd4577a4d23aefcf673a5e1a6a9b4f207441e0ea
 2021-01-04 09:20:19 +08:00
Alex Wang
1b9f9fb52d arm64: dts: rockchip: rk3568-nvr: enable uboot logo 
Change-Id: Ia6069db57ff17e77098b32796e8bd9b9010f7d3e
Signed-off-by: Alex Wang <alex.wang@rock-chips.com>
 2021-01-04 09:18:06 +08:00
Sandy Huang
5f1d8fecc7 arm64: dts: rockchip: fix cma reserved size error for rk3568-android 
Fixes: 8862f1ad4d ("arm64: dts: rockchip: move reserved_memory to rk3568.dtsi")
Change-Id: I3c85c968e322438fbee208de7f2f31b5f59a7cee
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2021-01-04 09:17:41 +08:00
Zefa Chen
076b562457 arm64: configs: rockchip_defconfig: Enable CONFIG_VIDEO_GC8034 
Add camera gc8034 for rk3566 evb2.

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I392601bf1207101f84b41bcb940d48f6ff6b3a92
 2020-12-31 18:07:54 +08:00
Zefa Chen
9d1c8090d3 arm64: dts: rockchip: rk3566 evb2 add camera gc8034 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2fef40e65e475ad5e6733485b32703d54c576b68
 2020-12-31 18:05:15 +08:00
Sandy Huang
37b5bec67d drm/rockchip: vop2: afbc_tile_num should align up to 16 pixel and divide 16 
Change-Id: Ied67749759268e9ff4acb0322a6517f8ed099c9d
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2020-12-31 17:59:35 +08:00
Sandy Huang
06656c4794 drm/rockchip: vop2: act_w should align as 4 pixel when enable afbc 
Change-Id: I2a9f2ac21ac2187879452af439ec0fefd20702c8
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2020-12-31 17:59:35 +08:00
Weixin Zhou
d8c24ac71e driver: input: touchscreen: gslx680_pad add early suspend support 
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I4b4cc3594fdf00efdbcce349c9f4cdc942524096
 2020-12-31 15:02:23 +08:00
Andy Yan
de88d200e7 drm/rockchip: vop2: Reset plane hdr state for every commit 
When play a SDR video after HDR video, there is a switch process,
look from 70.769811 seconds to 71.006901 seconds:

The HDMI was set to SDR(vcstate->eoftf = 0), the Plane is still HDR
(vpstate->eotf = 2), this will set the window to HDR2SDR state, but
actually we want play a sdr video in sdr state, and this cause the
wrong csc. So we clear vpstate->hdr2sdr_en & hdr_in at the beginning
of every commit.

[   70.657468] Cluster0-win0 vpstate->eotf 2 vcstate->eotf 2
[   70.657501] Cluster0-win0 hdr2sdr_en 0 hdr_in 1 sdr2hdr_en 1 is_input_yuv 1 is_output_yuv 0
[   70.707209] Cluster0-win0 EOTF val: 2
[   70.708056] Cluster0-win0 vpstate->eotf 2 vcstate->eotf 2
[   70.708086] Cluster0-win0 hdr2sdr_en 0 hdr_in 1 sdr2hdr_en 1 is_input_yuv 1 is_output_yuv 0
[   70.769811] rockchip-vop2 fe040000.vop: [drm:vop2_crtc_atomic_enable] Update mode to 3840x2160p60, type: 11 for vp0
[   71.006517] dwhdmi-rockchip fe0a0000.hdmi: Rate 371250000 missing; compute N dynamically
[   71.006901] Cluster0-win0 vpstate->eotf 2 vcstate->eotf 0
[   71.006964] Cluster0-win0 hdr2sdr_en 1 hdr_in 1 sdr2hdr_en 0 is_input_yuv 1 is_output_yuv 0
[   71.007034] Cluster1-win0 hdr2sdr_en 0 hdr_in 0 sdr2hdr_en 0 is_input_yuv 0 is_output_yuv 0
[   71.022511] Esmart0-win0 vpstate->eotf 0 vcstate->eotf 0
[   71.022555] Esmart0-win0 hdr2sdr_en 0 hdr_in 0 sdr2hdr_en 0 is_input_yuv 1 is_output_yuv 1
[   71.022582] Cluster0-win0 hdr2sdr_en 1 hdr_in 1 sdr2hdr_en 0 is_input_yuv 0 is_output_yuv 1
[   71.052015] Esmart0-win0 vpstate->eotf 0 vcstate->eotf 0
[   71.052057] Esmart0-win0 hdr2sdr_en 0 hdr_in 0 sdr2hdr_en 0 is_input_yuv 1 is_output_yuv 1
[   71.052101] Cluster0-win0 hdr2sdr_en 1 hdr_in 1 sdr2hdr_en 0 is_input_yuv 0 is_output_yuv 1
[   71.067202] Esmart0-win0 vpstate->eotf 0 vcstate->eotf 0
[   71.067225] Esmart0-win0 hdr2sdr_en 0 hdr_in 0 sdr2hdr_en 0 is_input_yuv 1 is_output_yuv 1
[   71.067253] Cluster0-win0 hdr2sdr_en 1 hdr_in 1 sdr2hdr_en 0 is_input_yuv 0 is_output_yuv 1

Change-Id: I032f03cfe2bce6ccce874fc04bd3b67cc589a11e
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-12-31 11:14:19 +08:00
Andy Yan
411a740bf9 drm/rockchip: vop2: Add delay number for windows 
Change-Id: Id38812958615fb59b7eb60504368383a519592b4
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-12-31 11:12:55 +08:00
Andy Yan
363b2d2f7b drm/rockchip: vop2: Fix HDR2SDR 
1. Add hdr2sdr_bypass_en and hdr2sdr_auto_gating_en bits, which
unmentationed in TRM.
2. HDR2SDR and SDR2HDR should overlay in RGB color space.
3. Window csc should be disabled when HDR2SDR or SDR2HDR enabled.

Change-Id: Ic3e15c3f0ddb5adf23a4962366749228f5117a9f
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-12-31 11:04:27 +08:00
Weixin Zhou
f2475bcde5 arm64: dts: rockchip: rk3566-rk817-tablet-k108: sync some configs from rk3566-rk817-tablet 
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I99aab0f5f0620d905a23882bbd72f70e05bfe4e5
 2020-12-31 09:51:13 +08:00
Zorro Liu
66c5822355 arm64: dts: rockchip: add rk3566-eink.dtsi 
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: Idc8b628b33b039d2c485ece50094e3a3b2185e75
 2020-12-31 09:15:11 +08:00
Zorro Liu
18a4299e0b arm64: configs: rockchip_defconfig: add rockchip ebc dev driver 
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I0e452a9ef4dc51201793693d1f0fa6555e560694
 2020-12-31 09:10:31 +08:00
Zorro Liu
d7e6aa9821 drm/rockchip: add ebook driver ebc-dev 
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I9e79ffd4938b90d47f68ac1c4ab0ff9fb093bd1e
 2020-12-31 09:09:17 +08:00
Andy Yan
d3a5065ff9 Revert "arm64: rockchip_defconfig: Disable DRM_FBDEV_EMULATION temporarily" 
This reverts commit 80cd79aecb.

This can work now.

Change-Id: I0650a041dbb00011ac9c292d55e4a848bc193a8a
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-12-30 21:07:59 +08:00
Tao Huang
3dccc182fe dt-bindings: clock: Remove rk_system_status.h 
Which is replaced by rockchip-system-status.h.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaebf0f7f15b0becae05193f73d4b6d6816175b2e
 2020-12-30 20:29:19 +08:00
Tao Huang
e91ecc8650 drm/rockchip: vop2: Replace include rk_system_status.h with rockchip-system-status.h 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8506cf89715e6275e2372484f695e64c24301fd2
 2020-12-30 20:29:19 +08:00
Tao Huang
281f00e16b drm/rockchip: vop: Replace include rk_system_status.h with rockchip-system-status.h 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I374203d61c96481c226bc57ac2fe1db2da687f49
 2020-12-30 20:29:19 +08:00
Ziyuan Xu
83cd7dfb99 gpio: rockchip: clear pendings before isr_handler is valid 
Change-Id: I93625437bc4e0096fbc6eca42f6bb3852a672d94
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
 2020-12-30 18:53:57 +08:00
Zhenke Fan
e1d7d04c2c dt-bindings: media: i2c: Document add ov4688 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Ieed535931ccdcc49a6e3c5fbe17eb0250613c8e7
 2020-12-30 18:08:48 +08:00
Weixin Zhou
51544b44a4 arm64: dts: rockchip: rk3566-rk817-tablet: set vcc3v3_pmu to 3v in suspend for save power 
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: If88188a053c5adf1bc66d7ae028d4993368a6231
 2020-12-30 17:40:21 +08:00
Zhenke Fan
07557e4f90 dt-bindings: media: i2c: Document add sc200ai 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Idc1eb72b4b918079ac886b41aa8d671b94c43598
 2020-12-30 17:37:48 +08:00
Zhenke Fan
b766f50b9b dt-bindings: media: i2c: Document add imx378 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I9988822db30e452f4f89c0bb25595a0f2efbe378
 2020-12-30 17:37:21 +08:00
Zhenke Fan
3da9212d04 dt-bindings: media: i2c: Document add gc4c33 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Ie082ad51ee9067f069e995367ba8066e5d8c36bf
 2020-12-30 17:34:41 +08:00
XiaoDong Huang
8a6bede582 firmware: rockchip_sip: add sip macro for scmi 
Change-Id: I1f3d3be1021ff791411928df01b40f4621d9f4e2
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
 2020-12-30 17:32:22 +08:00
Sandy Huang
a69e0de060 arm64: dts: rockchip: enable display for rk3568 iotest android system 
Change-Id: Iac4350ce33f83afe7b99ba12d56c5ff393264127
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2020-12-30 16:50:06 +08:00
Sandy Huang
8862f1ad4d arm64: dts: rockchip: move reserved_memory to rk3568.dtsi 
Change-Id: Ia8888142e718ac0c6a9d7aa777ffd25a44639cda
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2020-12-30 16:49:48 +08:00
Zhenke Fan
c1d49010f6 dt-bindings: media: i2c: Document add gc4663 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Ieca9bb684a8a02ce205eeea26b9f2ffdd7ead2a0
 2020-12-30 16:49:37 +08:00
Andy Yan
ec4bffd288 drm/rockchip: vop2: Fix the max_input/output width of cluster sub window 
According to TRM, the max_intput/output width of a cluster window
should reduce by half when work in two win mode.

Change-Id: I5cbe10605e8895eb307df9591b222c9293bee21a
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-12-30 16:37:56 +08:00
Sugar Zhang
9bc2eb6c70 ASoC: rockchip: i2s_tdm: Add support for clk compensation 
This patch introduces a method to handle clk drift and compensation.

e.g:

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

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

/# amixer -- cset numid=3 -10
numid=3,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=3 10
numid=3,iface=PCM,name='PCM Clk Compensation In PPM'
  ; type=INTEGER,access=rw------,values=1,min=-1000,max=1000,step=1
  : values=10

Change-Id: Id8620ef942e7be20eb6ca502cc198ad97da813f1
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2020-12-30 16:36:25 +08:00
Sugar Zhang
8d9702cd43 clk: rockchip: Add support for clk compensation 
Change-Id: I099261a5906dd72dca15cbbf6acea16179c471ad
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2020-12-30 16:36:25 +08:00
Zhenke Fan
c74052035b media: i2c: add sc430cs driver 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I89d3e58072d0976a61c68a5bd11135af8217a85b
 2020-12-30 16:30:48 +08:00
Cai YiWei
4ee1193154 media: rockchip: ispp: fix panic for vmap at interrupt 
kernel BUG at mm/vmalloc.c:1391!
[<b01f1f30>] (__get_vm_area_node) from [<b01f20c4>] (get_vm_area_caller+0x48/0x50)
[<b01f20c4>] (get_vm_area_caller) from [<b01f2394>] (vmap+0x34/0x64)
[<b01f2394>] (vmap) from [<b04b11e8>] (dma_buf_vmap+0x50/0xec)
[<b04b11e8>] (dma_buf_vmap) from [<b05afb2c>] (vb2_dc_vaddr+0x28/0x30)
[<b05afb2c>] (vb2_dc_vaddr) from [<b05f2014>] (rkispp_frame_end+0x2bc/0x3c8)
[<b05f2014>] (rkispp_frame_end) from [<b05f28a8>] (rkispp_isr+0x19c/0x434)
[<b05f28a8>] (rkispp_isr) from [<b05f589c>] (irq_hdl+0x58/0x60)

Change-Id: Ib4e3814ca77174cd31788f173cadaef01aaa6a4f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-12-30 15:25:43 +08:00
Alex Zhao
b5ce993548 arm64: configs: rockchip_defconfig: enable CONFIG_SDIO_KEEPALIVE 
This is needed by RK356X EVB to support Wi-Fi.

Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I987b5407d9f4a6fbae7766bb8a656f7c4a88e202
 2020-12-30 14:27:16 +08:00
William Wu
1d7f55a765 arm64: dts: rockchip: add dis_u2_susphy_quirk for rk3568-iotest 
Change-Id: I44eb3fa859e99f0b7abca2d969aa95ec776d054b
Signed-off-by: William Wu <william.wu@rock-chips.com>
 2020-12-30 14:23:46 +08:00
Wu Liangqing
16434ee0d2 arm64: dts: rockchip: rk3566-rk817-tablet: adjust backlight value 
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I55443ea45e63e1e7e6371b7ccbeb91754b1ee742
 2020-12-30 14:23:07 +08:00
Zhenke Fan
8baa7b5eaa media: i2c: sc2310: fix bug for gain function error 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I839c0434eda11f66484a9b617cd1c5c346b3a204
 2020-12-30 14:22:26 +08:00
Zhenke Fan
6e31f87379 media: i2c: sc200ai: fix bug for 1x dgain error 
fix bug the hdr parameter reset by __v4l2_ctrl_handler_setup
fix the max gain
replace the hightemp function with write register 0x5799

Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Ie348b550583d7113e243115c5bbf944e80c0378d
 2020-12-30 14:22:08 +08:00
Zefa Chen
aaadd06f52 media: i2c: sc4238 fixed hdr exposure issue 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6a7c09b712c6b917e48f88f07430d69664fd53ea
 2020-12-30 09:40:21 +08:00
Zefa Chen
ca8d82cb93 media: i2c: sc4238 support 2688x1520@30fps 10bit linear mode 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I42a2a9e93a1ea3cd3c94bd67d90c4ea9e315ba7b
 2020-12-30 09:40:21 +08:00
Shunqing Chen
4a30051517 arm64: dts: rockchip: add rk3568-evb2-lp4x-v10-bt1120-to-hdmi 
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I74fb46e07cab0ef0736d62a8ca94f9521add2620
 2020-12-30 09:07:37 +08:00