shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity
861,517 Commits 55 Branches 2,486 Tags
3dccc182fe50bbe8770a5db004b69f362c28fda2
Commit Graph

861517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shunqing Chen
8589814a88 drm/bridge: sii902x: add YUV422 input support 
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I0b6cc2a12206eb1cdc9f6c292856196c94b85d90
 2020-12-29 20:20:51 +08:00
Shunqing Chen
53eddceef2 arm64: configs: rockchip_defconfig: enable sii902x 
Add RGB/BT1120 to HDMI support.
This is needed by rk3568-evb2-lp4x-v10-bt1120-to-hdmi.

Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I40987ec96fee9d4d7f99970222bae487f58927df
 2020-12-29 20:19:09 +08:00
Fabrizio Castro
51e827acd9 UPSTREAM: drm/bridge/sii902x: Add missing dependency on I2C_MUX 
kbuild test robot reports:

>> ERROR: "i2c_mux_add_adapter" [drivers/gpu/drm/bridge/sii902x.ko] undefined!
>> ERROR: "i2c_mux_alloc" [drivers/gpu/drm/bridge/sii902x.ko] undefined!
>> ERROR: "i2c_mux_del_adapters" [drivers/gpu/drm/bridge/sii902x.ko] undefined!

Quite obviously the driver depends on I2C_MUX, but adding a "depends on"
introduces a recursive dependency, therefore this patch selects I2C_MUX
instead.

Change-Id: I55a6197cf8f0d782a8efb7816f1bfef7c2713587
Fixes: 21d808405f ("drm/bridge/sii902x: Fix EDID readback")
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Link: https://lists.01.org/pipermail/kbuild-all/2018-November/054924.html
Acked-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1542633978-22064-1-git-send-email-fabrizio.castro@bp.renesas.com
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit ea6b13e9fe)
 2020-12-29 20:08:32 +08:00
Liang Chen
f6773f97c2 arm64: dts: rockchip: correct root compatible for rk3566 board 
Change-Id: I57b9e45b4b5b02e8e0511d1d90a0a57c8f139749
Signed-off-by: Liang Chen <cl@rock-chips.com>
 2020-12-29 18:05:01 +08:00
Liang Chen
3b83bef0ab soc: rockchip: cpuinfo: Add support for rk3566/rk3568 
Change-Id: I199d08b0447b9d761c93a4cb8b97fe20fd2c18b8
Signed-off-by: Liang Chen <cl@rock-chips.com>
 2020-12-29 17:55:40 +08:00
Liang Chen
5d0d27792b irqchip/gic-v3-its: add support for rk3566 
Change-Id: I2b3f0d7857fd9bc9ef567417760f3700009ec587
Signed-off-by: Liang Chen <cl@rock-chips.com>
 2020-12-29 17:52:39 +08:00
Liang Chen
7b82ea84b3 cpufreq: dt-platdev: Add rk3566 project into blacklist 
Change-Id: I110e1b06a7913747fc74497241d03d632727265c
Signed-off-by: Liang Chen <cl@rock-chips.com>
 2020-12-29 17:36:20 +08:00
Liang Chen
cc9529c8ba arm64: dts: rockchip: add cpuinfo node for rk3568 
Change-Id: Ia98489355ca992d19f8c215978dd25699603c6ce
Signed-off-by: Liang Chen <cl@rock-chips.com>
 2020-12-29 16:37:42 +08:00
Saravana Kannan
dcddb5cea9 UPSTREAM: driver core: Avoid deferred probe due to fw_devlink_pause/resume() 
With the earlier patch in this series, all devices that deferred probe
due to fw_devlink_pause() will have their probes delayed till the
deferred probe thread is kicked off during late_initcall. This will also
affect all their consumers.

This delayed probing in unnecessary. So this patch just keeps track of
the devices that had their probe deferred due to fw_devlink_pause() and
attempts to probe them once during fw_devlink_resume().

Change-Id: Id92b3a5d867b5fa8c07c4c40e810928a9631bf9e
Fixes: 716a7a2596 ("driver core: fw_devlink: Add support for batching fwnode parsing")
Signed-off-by: Saravana Kannan <saravanak@google.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200701194259.3337652-4-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 2451e74647)
 2020-12-29 16:11:37 +08:00
Saravana Kannan
99c458503e BACKPORT: driver core: Rename dev_links_info.defer_sync to defer_hook 
The defer_sync field is used as a hook to add the device to the
deferred_sync list. Rename it so that it's more meaningful for the next
patch that'll also use this field as a hook to a deferred_fw_devlink
list.

Signed-off-by: Saravana Kannan <saravanak@google.com>
Reviewed-by: Rafael J. Wysocki <rafael@kernel.org>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200701194259.3337652-3-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit ec7bd78498)
Change-Id: I380aaba3930772d99afb62eea194594435160c62
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2020-12-29 16:11:27 +08:00
Tao Huang
5647c1d492 Merge tag 'ASB-2020-12-05_4.19-stable' of https://android.googlesource.com/kernel/common 
https://source.android.com/security/bulletin/2020-12-01
CVE-2020-0444
CVE-2020-0465
CVE-2020-0466

* tag 'ASB-2020-12-05_4.19-stable': (636 commits)
  ANDROID: kbuild: use grep -F instead of fgrep
  ANDROID: GKI: usb: gadget: support claiming indexed endpoints by name
  UPSTREAM: arm64: sysreg: Clean up instructions for modifying PSTATE fields
  Revert "Revert "ANDROID: clang: update to 11.0.5""
  ANDROID: kbuild: speed up ksym_dep_filter
  Revert "drm/atomic_helper: Stop modesets on unregistered connectors harder"
  Linux 4.19.161
  USB: core: Fix regression in Hercules audio card
  x86/resctrl: Add necessary kernfs_put() calls to prevent refcount leak
  x86/resctrl: Remove superfluous kernfs_get() calls to prevent refcount leak
  x86/speculation: Fix prctl() when spectre_v2_user={seccomp,prctl},ibpb
  usb: gadget: Fix memleak in gadgetfs_fill_super
  USB: quirks: Add USB_QUIRK_DISCONNECT_SUSPEND quirk for Lenovo A630Z TIO built-in usb-audio card
  usb: gadget: f_midi: Fix memleak in f_midi_alloc
  USB: core: Change %pK for __user pointers to %px
  perf probe: Fix to die_entrypc() returns error correctly
  can: m_can: fix nominal bitiming tseg2 min for version >= 3.1
  platform/x86: toshiba_acpi: Fix the wrong variable assignment
  platform/x86: thinkpad_acpi: Send tablet mode switch at wakeup time
  can: gs_usb: fix endianess problem with candleLight firmware
  ...

Change-Id: I82ccfc3d6561d3ef3b1b06ac98d48fac997c8fb6

Conflicts:
	drivers/pinctrl/pinctrl-rockchip.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/host/xhci.c
	drivers/usb/host/xhci.h
 2020-12-29 16:10:48 +08:00
Tao Huang
79bdd6a061 Revert "ARM: hw_breakpoint: Workaround for Cortex-A12/A17" 
This reverts commit 15d6bca6c4.

Replaced by commit 2bb93af182 ("ARM: 8997/2: hw_breakpoint: Handle inexact watchpoint addresses")

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2020-12-29 16:09:30 +08:00
Tao Huang
e1db199ebd Revert "Revert "Revert "ANDROID: vfs: add d_canonical_path for stacked filesystem support""" 
This reverts commit f9cb1a06e3.

Replaced by commit 54b41388f5 ("ANDROID: vfs: add d_canonical_path for stacked filesystem support")

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2020-12-29 16:09:21 +08:00
Wu Liangqing
5dba7c1f52 arm64: dts: rockchip: rk3566-rk817-tablet: set lcd_stanby_gpio pull down 
Change-Id: If2f247daccca6adcf5fd1f9c77f89dd24128ac38
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
 2020-12-29 15:34:14 +08:00
Wu Liangqing
b81652bce8 arm64: dts: rockchip: rk356x ddr3 set dmc max-freq 1056Mhz 
Change-Id: I33191a9b62a5b6fec8d88de79119898033b63616
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
 2020-12-29 10:22:58 +08:00
Tao Huang
7914a8fb2b arm64: dts: rockchip: Add arm,no-tick-in-suspend in timer for rk3568 
Arch timer stops during system suspend. Add arm,no-tick-in-suspend
property in timer.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I24ebe7e027593cfbdbfc5476f196425df640e8d7
 2020-12-28 18:01:44 +08:00
Nickey Yang
881ef729dd drm/bridge: synopsys: dw-hdmi: check hdmi status in resume 
HDMI status maybe incorrect in the following condition:
HDMI plug in -> system sleep ->  HDMI plug out -> system wake up.
At this time, cat /sys/class/drm/card 0-HDMI-A-1/status is connected.
There is no hpd interrupt, because HDMI is powerdown during suspend.
So we need check the current HDMI status in this case.
Test on rk3288 & rk3399.

Change-Id: I2fbafd1d80b59628bca65e9e45760a24d1668241
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
 2020-12-28 09:28:33 +00:00
William Wu
b8c2578c5a phy: rockchip: naneng-combphy: check status after deassert phy rst 
Check the phy status after deassert phy reset for USB 3.0
mode, and wait at most 1ms for phy ready. If wait for phy
status ready timeout, just print warning log and continue
phy init for the time being.

Change-Id: I2677679a99153cf9ee0a043ab6cfb56d9e8dfdf2
Signed-off-by: William Wu <william.wu@rock-chips.com>
 2020-12-28 16:55:31 +08:00
Frank Liu
adadbbcb52 media: i2c: fix sc500ai exposure time error 
Signed-off-by: Frank Liu <frank.liu@rock-chips.com>
Change-Id: I678a14e30548d6f797fa86043a0592b961f045fe
 2020-12-28 16:38:53 +08:00
Andy Yan
0bc7b9d548 drm/rockchip: vop2: Enable dclk_div2 for YUV420 output mode 
dclk_div2 and dclk_div2_phase are undocumented in TRM, but
these two bit should be set at YUV420 output mode.

Change-Id: I711336798a7d352c8f7a85f1fedfa5933d8261ec
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2020-12-28 16:37:12 +08:00
Jon Lin
508d2dcbfe soc: rockchip: mtd_vendor_storage: Erase block in initial progress 
Change-Id: Ibbff54cd7a14d5f37ec23a4d52ab557c820caec3
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2020-12-28 14:33:47 +08:00
Jon Lin
6d85832a79 drivers: rkflash: Remove RK vendor support for spinor mtd case 
1.Change to use RK MTD vendor operation
2.RK MTD vendor is incompatible with RK vendor

Change-Id: I7c233b0b0a98c5e93d0722956809a9d6c01663a1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2020-12-28 14:33:47 +08:00
Frank Liu
a30d204193 media: i2c: sc500ai output 2880*1616 resolution image 
Signed-off-by: Frank Liu <frank.liu@rock-chips.com>
Change-Id: I2b61eb0f16e0a3f177c256c1453ef0cc3cf2b7f0
 2020-12-28 14:32:21 +08:00
Hu Kejun
8461719770 media: rockchip: isp: add ioctl to get share buffer fd 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I3b33429007539ccb75859373f6598b5a2c2f7203
 2020-12-28 09:55:57 +08:00