Commit Graph

1079564 Commits

Author SHA1 Message Date
Ding Wei
e949000501 video: rockchip: mpp: rkvdec2: Add hard-ccu mode
hard-ccu mode:
1. ccu hardware assign the tasks to each core.
2. if one core error, wait dule core idle, and reset dual core
   and ccu.
3. re-run tasks which have not finish.

Change-Id: I3476c0de21de89019ce924122a85ab4352faafd0
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2023-03-17 19:02:04 +08:00
Yandong Lin
0eead2352f arm64: dts: rockchip: rkvdec add hw ccu mode for rk3588
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I926f3afb22cce40ba4cd884ea4f96a2e2f420b66
2023-03-17 19:01:41 +08:00
Tao Huang
68c35de1b6 arm64: dts: rockchip: rk3528-evb1-ddr4-v10: Sort the nodes alphabetically
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib883bfc269906460b1fa93112920cbeea4180ac2
2023-03-17 18:20:52 +08:00
Sandy Huang
6b3b4b544e drm/rockchip: vop3: remove vp1 supported from rk3562
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I334a2d693291c72143bd4cd2d8de38ddba1116f3
2023-03-17 18:20:35 +08:00
Yandong Lin
b278cacd80 video: rockchip: mpp: fix access null point in no mmu case
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I02445a25b68b2ad8e80b46dc5ffc44ef422ab616
2023-03-17 16:59:42 +08:00
Yandong Lin
9aa8154c25 video: rockchip: mpp: fix some buf cache not sync issue
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I3c41ca6e373480e3b2759154ca4445318c7365b6
2023-03-17 16:59:42 +08:00
Zefa Chen
43526c2435 media: rockchip: vicap: rk3588 add iclk_host and rst_host
if not control it together, may cause vicap do cru reset fail

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie8cc81688ab3c0d1d91b8aa27992b028f8aee80c
2023-03-17 16:57:18 +08:00
Zefa Chen
aff37bd786 arm64: dts: rockchip: rk3588: modify vicap/csi2 clk/rst
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I7bac029766591565590e3ca98c7348f53d21b0c6
2023-03-17 16:57:18 +08:00
Zefa Chen
7201f0928f media: rockchip: vicap fixes error of overflow when stop stream
some sensor driver not support get vblank, may cause error state

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I04b869026d262283e055c82b1e9d53233bab3b67
2023-03-17 16:57:18 +08:00
Zefa Chen
80fa2be8ed media: rockchip: vicap refresh cache before memcpy for tools video
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3cfddddd41fe37e9a04547e52abeb337b556aeed
2023-03-17 16:57:18 +08:00
Algea Cao
cdc0984c90 drm/bridge: synopsys: dw-hdmi-qp: Support read ext block edid
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I4dbf6890032953e109863a86deb38fc1094e6938
2023-03-17 16:49:41 +08:00
Tao Huang
aa8ef2bf50 arm64: dts: rockchip: rk3562-rk817-tablet-v10: Sort the nodes alphabetically
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I9bb4a6125c16b144f9105c3d84c4e6b10c2794d1
2023-03-17 16:46:26 +08:00
Finley Xiao
0d66d4c284 arm64: dts: rockchip: rk3562-rk817-tablet-v10: Enable dmc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I2f3f1a5aada9c10d3e07d6367b342064c841c439
2023-03-17 16:31:14 +08:00
Tao Huang
465c984709 arm64: dts: rockchip: rk3562-evb: Sort the nodes alphabetically
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7572489700df436b2c186746937db584c1daea22
2023-03-17 16:26:48 +08:00
Finley Xiao
0a88040426 arm64: dts: rockchip: rk3562-evb: Enable dmc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ie77aa4dfaf38e0d689899eb8b6cdb0bfc392907e
2023-03-17 16:24:54 +08:00
Tao Huang
b4789778e7 arm64: rockchip_gki.config: Enable CONFIG_CPU_RK3562
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5f6be242f581321c6da7d532ad379395ca116b6d
2023-03-16 21:27:03 +08:00
Tao Huang
16ecc189f1 cpufreq: dt-platdev: Add rk3528 project into blacklist
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I59e394fb32be430659eaa36bf1924613ab032f5d
2023-03-16 21:19:39 +08:00
Tao Huang
26610e5433 cpufreq: dt-platdev: Add rk3562 project into blacklist
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic2d5eec24279339ac8e53aa690410ce2f30bf449
2023-03-16 21:18:25 +08:00
Zhen Chen
25b2037af2 MALI: rockchip: upgrade bifrost DDK to g17p0-01eac0, from g15p0-01eac0
In addition, add some more modifications, according to
commit ccf3f0670c ("MALI: bifrost: from ARM: Remove references to PageMovable()").

Note, the corresponding mali_csffw.bin for DDK g15 MUST be used.

Change-Id: Ie233cd29d8d169202d5b80b00a97ccb90e6bd3f2
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2023-03-16 19:13:26 +08:00
Wangqiang Guo
d19bd18e3e media: i2c: sc850sl: add camera sensor driver.
Change-Id: If3bec0f4a6458ce664ba073565c28d0f9256350d
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
2023-03-16 19:13:12 +08:00
Cai YiWei
e4423ba4ce media: rockchip: isp: support buf early done
Change-Id: Icfa088b48105089c4a77aeeebd6b8358d1e90bef
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-03-16 18:42:41 +08:00
Alex Wang
0bd00b2676 arm64: dts: rockchip: rk3528-demo: include rk-stb-ir-keymap
Change-Id: Id88e0bd5b219b9e99636a01a17c25d18c0fb5886
Signed-off-by: Alex Wang <alex.wang@rock-chips.com>
2023-03-16 18:22:21 +08:00
Alex Wang
f75576ce53 arm64: dts: rockchip: add rk-stb-ir-keymap.dtsi
Change-Id: Iaf102ad2af5e34c6f18df15c5c0fbe7101d6012a
Signed-off-by: Alex Wang <alex.wang@rock-chips.com>
2023-03-16 18:22:15 +08:00
Alex Wang
462aebc05c dt-bindings: input: add rockchip ir key defines
Change-Id: Ib2badc1396ec6b7e34b12ba77900d26a06a19694
Signed-off-by: Alex Wang <alex.wang@rock-chips.com>
2023-03-16 18:22:03 +08:00
Jon Lin
7a64b62246 PCI: rockchip: dw: Support BAR4 for standard ep
Change-Id: Ia6182f410681b76f2d7c8225d0d8467c5664452f
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-03-16 18:20:58 +08:00
Chandler Chen
70c13cc64a arm64: dts: rockchip: rk3528: add shootdown-entire for vcodec mmu
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I57cff6c255f69baec2437b44165ab3e71c89520b
2023-03-16 16:38:40 +08:00
Herman Chen
faa709dab9 video: rockchip: mpp: Add tlb flush
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I4592ae29f05a1db342d2d34682878f4403f02312
2023-03-16 16:38:21 +08:00
Cai YiWei
d0edc7b3e7 media: rockchip: isp: thunder boot with multi sensor
Change-Id: I20efdaf70a24e9b892b40bed6420b2988b8125b4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-03-16 16:30:52 +08:00
Cai YiWei
c8eb54c56b media: rockchip: isp: fix 3a wr with two readback case
Change-Id: Ib6e55e08dc9634706b2114c6f4d64be15a97ff52
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-03-16 16:30:52 +08:00
Cai YiWei
56534c20ec arm64: dts: rockchip: rk3566 and rk3568 update iq feature
Change-Id: I157391733ccd1bdea84ad3e1b270f925b61bb63a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-03-16 16:30:52 +08:00
Damon Ding
c9e65e311a arm64: configs: rockchip_linux_defconfig: enable tve
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I024f9645385398377df526b9ea6af64280f36eac
2023-03-16 16:23:58 +08:00
Sugar Zhang
7e17d0539a arm64: dts: rockchip: rk3528-evb: Enable HDMI Jack
This patch enable HDMI event notify.

Change-Id: Id2e585780e4c372b8de317bd499b0ab2b4788a1d
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2023-03-16 15:05:50 +08:00
Yandong Lin
1765ef7906 video: rockchip: mpp: fix get hw time error issue
Use aclk to calculate hw time.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ic2d218531ae03583e51f6b8016832ca9d2ff3c2d
2023-03-16 15:04:58 +08:00
Xing Zheng
27e305c611 ARM: dts: rockchip: rk3036-evb1: fix the 'pa-ctl-gpios' name
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I01e667086ac41d055ff1c2967f32d871f8e08cea
2023-03-16 15:02:10 +08:00
Xing Zheng
775633a1ed ASoC: inno_rk3036: fixes and clean up some handles
We haven't used the rk3036 codec driver on upstream for
a long time, it seems like it needs some changes to work
well with our EVB.

- Clean up the process of DAC working/closing
- Since there is no mixer on the path, remove the mixer
  widgets to make simple the driver path
- Only keep one control node "Headphone Switch" to simplify
  user operation
- Add the control gpio of power amplifier

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Ia4b41b0148fe9680f58abe4113d1276f260ef1b5
2023-03-16 14:58:31 +08:00
Frank Wang
adb1f241f3 usb: typec: tcpm: fix getting pd_revision
Move up getting pd_revision in case it would be skipped while
power-role is configured as source.

Fixes: 765b15bf79 ("usb: typec: tcpm: amend pd negotiated revision")
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I63d06d622cc00db6bacb301f6e61aba0a36cd854
2023-03-16 14:54:59 +08:00
Sugar Zhang
b87d415824 ASoC: rockchip: i2s-tdm: Simplify clk reparent on TRCM mode
This patch do reparent CLK_TX/RX to the same parent on TRCM mode
in driver instead of assign parent from DT.

Now, the assigned-parent from DT can be removed.

  -assigned-clocks = <&cru SCLK_I2S0_8CH_RX>;
  -assigned-clock-parents = <&cru SCLK_I2S0_8CH_TX_MUX>;

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0abda09a1348d05306e4026f61f7daa2850ae323
2023-03-16 14:40:10 +08:00
Sugar Zhang
fcd99057b0 arm64: dts: rockchip: rk3588-*: Enable HDMI Jack
This patch use rockchip-hdmi machine driver instead of
simple-card to support jack detection.

And also replace card name ',' to '-' to support pluseaudio.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0e085225e89847671e958d0985d678240fdd6295
2023-03-16 14:38:42 +08:00
Sugar Zhang
53222b0849 ASoC: hdmi-codec: Stop stream when plug state changed
Workaround for HDMIIN and HDMIOUT plug-{in,out} when streaming.

Actually, we should do stop stream both for HDMI_{OUT,IN} on
plug-{out,in} event. but for better experience and depop stream,
we optimize as follows:

a) Do stop stream for HDMIIN on plug-out when streaming.
because HDMIIN work as SLAVE mode, CLK lost after HDMI cable
plugged out which will make stream stuck until ALSA timeout(10s).
so, for better experience, we should stop stream at the moment.

b) Do stop stream for HDMIOUT on plug-in when streaming.
because HDMIOUT work as MASTER mode, there is no clk-issue like
HDMIIN, but, on HDR situation, HDMI will be reconfigured which
make HDMI audio configure lost, especially for NLPCM/HBR bitstream
which require IEC937 packet alignment, so, for this situation,
we stop stream to notify user to re-open and configure sound card
and then go on streaming.

Userspace should notice Error-Code(such as -EBADFD) from snd_pcm_write
to do reopen.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I85455e56f843afcdc9a5f1d5c9e85733b6732cdf
2023-03-16 14:37:26 +08:00
Algea Cao
3f1bcfe6ec drm: bridge: dw-hdmi: Fixed ddc error caused by plug out hdmi when reading edid
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ie220584b5ae17822170bf761f699d8897caf9975
2023-03-16 14:35:15 +08:00
Jon Lin
25a47e3925 PCI: rockchip: dw: Support deferred probe for ep
Change-Id: I0f032618d97f88a0cd70ae164c3f6f6ef6494515
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-03-16 11:46:31 +08:00
Zefa Chen
b864542b3f media: rockchip: vicap: fix warning of vb2 cancel or done
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I51079641446159444fd6dc2223e5a3f9062001fa
2023-03-16 11:10:08 +08:00
Sandy Huang
c05a83fed4 drm/rockchip: vop3: fix esmart area[3] register offset error
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ic87252cecfeb161d6bea0572ffc570003350dc86
2023-03-15 14:42:36 +08:00
Tao Huang
a60b314732 ARM: rv1106_defconfig: Set CONFIG_INET_TABLE_PERTURB_ORDER=8
On embedded systems with little memory and no relevant
security concerns, it is beneficial to reduce the size
of the table.

Reducing the size from 2^16 to 2^8 saves 255 KiB
of kernel RAM.

Fixes: 7e8eaa939e ("tcp: configurable source port perturb table size")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5da1509bbc7b539c367b696bccc67722863cafbe
2023-03-14 16:21:44 +08:00
Tao Huang
ee1d33de8b ARM: rv1106_defconfig: Disable CONFIG_RANDOM_TRUST_BOOTLOADER
Fixes: 4603a37f6e ("random: credit cpu and bootloader seeds by default")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I911f729cb469cba0438524ea49ccf11f96a5b941
2023-03-14 16:19:59 +08:00
Tao Huang
9f9f111a7f arm64: rockchip_linux_defconfig: Disable A510 ERRATUM 2051678
-CONFIG_ARM64_ERRATUM_2051678

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Icffee7d1855f0feb142905dfec39b1413a1f8e8d
2023-03-14 09:46:40 +08:00
Tao Huang
4843d38fe8 arm64: rockchip_defconfig: Disable A510 ERRATUM 2051678
-CONFIG_ARM64_ERRATUM_2051678

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I95fd2c9007c1e14cd90f5df16eb655b72fced901
2023-03-14 09:46:36 +08:00
Tao Huang
cc17504307 Merge tag 'android12-5.10-2023-02_r1' of https://android.googlesource.com/kernel/common
android12-5.10 February 2023 release 1

Artifacts:
  https://ci.android.com/builds/submitted/9611440/kernel_aarch64/latest

* tag 'android12-5.10-2023-02_r1': (5560 commits)
  ANDROID: GKI: Enable ARM64_ERRATUM_2454944
  ANDROID: dma-ops: Add restricted vendor hook
  ANDROID: arm64: Work around Cortex-A510 erratum 2454944
  ANDROID: mm/vmalloc: Add override for lazy vunmap
  ANDROID: cpuidle-psci: Fix suspicious RCU usage
  ANDROID: ABI: update allowed list for galaxy
  FROMGIT: f2fs: add sysfs nodes to set last_age_weight
  FROMGIT: f2fs: fix wrong calculation of block age
  ANDROID: struct io_uring ABI preservation hack for 5.10.162 changes
  ANDROID: fix up struct task_struct ABI change in 5.10.162
  ANDROID: add flags variable back to struct proto_ops
  UPSTREAM: io_uring: pass in EPOLL_URING_WAKE for eventfd signaling and wakeups
  UPSTREAM: eventfd: provide a eventfd_signal_mask() helper
  UPSTREAM: eventpoll: add EPOLL_URING_WAKE poll wakeup flag
  UPSTREAM: Revert "proc: don't allow async path resolution of /proc/self components"
  UPSTREAM: Revert "proc: don't allow async path resolution of /proc/thread-self components"
  UPSTREAM: net: remove cmsg restriction from io_uring based send/recvmsg calls
  UPSTREAM: task_work: unconditionally run task_work from get_signal()
  UPSTREAM: signal: kill JOBCTL_TASK_WORK
  UPSTREAM: io_uring: import 5.15-stable io_uring
  ...

Change-Id: I2b16474d6e3a91f1d702486ec6d1565a7bc310e3

Conflicts:
	Documentation/ABI/testing/configfs-usb-gadget-uac2
	Documentation/usb/gadget-testing.rst
	Makefile
	arch/arm/boot/dts/rk3288-evb-act8846.dts
	arch/arm64/mm/Makefile
	drivers/dma-buf/dma-buf.c
	drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
	drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
	drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/mmc/core/mmc.c
	drivers/pci/controller/dwc/pcie-designware-host.c
	drivers/pinctrl/pinctrl-rockchip.c
	drivers/regulator/core.c
	drivers/usb/dwc3/ep0.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/function/f_hid.c
	drivers/usb/gadget/function/f_uac1.c
	drivers/usb/gadget/function/f_uac2.c
	drivers/usb/gadget/function/u_audio.c
	drivers/usb/gadget/function/u_audio.h
	drivers/usb/gadget/function/u_uac2.h
	drivers/usb/host/xhci.h
	drivers/usb/storage/unusual_uas.h
	drivers/usb/typec/altmodes/displayport.c
	include/linux/page_ext.h
	mm/cma.c
	mm/page_ext.c
	sound/core/pcm_dmaengine.c
	sound/soc/codecs/hdmi-codec.c
	include/linux/stmmac.h
	sound/drivers/aloop.c
	drivers/pci/controller/dwc/pcie-designware.h
2023-03-14 09:44:51 +08:00
Jason Zhu
8fcc8f437c arm64: dts: rockchip: rk3528-evb: support es7243 sound
Use es7243e to record sound. This support in evb1 and evb4.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Iecb118a1b4030c3e2973047455914c81d209625b
2023-03-13 19:53:48 +08:00
Algea Cao
221a84e78a drm: bridge: dw-hdmi: Support ddc io pull down when hdmi disconnected
KONKA TV have the problem that hdmi hpd pin leakage leads to hpd
interrupt and trigger incorrectly. When the hdmi cable is not securely
connected, the hdmitx ddc pin will leak electricity back to hdmitx
through the TV's hpd pin and pull up hpd pin voltage to 1.8v.

Because rk3528 hdmi hpd interrupt trigger voltage is 1.5v,
hpd irq will be triggered by mistake, resulting in
edid reading error. Therefore, hdmi ddc io needs to be pull down
before the hpd pin is actually contacted and stabilized.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Id5f859e1de0dde751cf1d522a8d7647558f0b7f8
2023-03-13 17:18:39 +08:00