Commit Graph

1066677 Commits

Author SHA1 Message Date
Zefa Chen
1e7c74a7aa include: uapi: linux: rk-camera-module: add commond RKMODULE_SET_SENSOR_INFO
Its for sensor adapter to sync all of sensor state, to avoid isp getting the wrong state
in the case of app execution order: sensor0 config param -> run isp0 ... sensorn config param -> run ispn

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I90cc6a1716d5198150b5a0897ada0412622b72d3
2022-07-14 20:09:36 +08:00
Tao Huang
8106e54bdf net: wireless: rockchip: rkwifi: bcmdhd: set vfs-only exports into their own namespace
According to gki commit d483eed85f ("ANDROID: GKI: set vfs-only exports into their own namespace").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie75429695e0f23ada39d8677a918e5b1c0b8fd97
2022-07-14 19:44:59 +08:00
Tao Huang
18f2a774bc rk: Makefile: Call gcc-wrapper.py use absolute path
Fixes: c2482146d1 ("rk: Makefile: add gcc-wrapper")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I6442c206c797573d57ef1976b4a30316235f4e03
2022-07-14 19:44:59 +08:00
Jianqun Xu
f2f7901e85 power: supply: rk817_battery avoid division by zero
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I811e0a0720a17879bfe36c03b44c2bbfd35355a6
2022-07-14 14:37:19 +08:00
Cai YiWei
7b7b2c475a media: rockchip: isp: add slab.h fix compile
Change-Id: Ie062a9ab953c1d8f9210f895af14e35d775917c3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-07-14 14:26:37 +08:00
Algea Cao
37b7830dd3 drm/rockchip: dw_hdmi: Get uboot hdmi color format
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I06bbd4a8888716a4b209a81f219309304a18420f
2022-07-14 14:25:59 +08:00
Zefa Chen
3417af9ec0 phy: rockchip: csi2-dphy: fixed logic error about clk1_en
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I03dc62115346a5908d27ecf83b1705a96dc4bd53
2022-07-14 14:14:40 +08:00
Frank Wang
e96b693e05 usb: gadget: uvc: add uvc_num_request attribute
Adding uvc attribute "uvc_num_request" to set the number of uvc
requests by configfs, the maximum limit is 64, and the recommended
value is 2.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I6031ba0b569a4ff53e16a59a5bcce021d80823db
2022-07-14 11:22:40 +08:00
Michael Grzeschik
8b66f0c181 UPSTREAM: usb: gadget: uvc: make uvc_num_requests depend on gadget speed
While sending bigger images is possible with USB_SPEED_SUPER it is
better to use more isochronous requests in flight. This patch makes the
number uvc_num_requests dynamic by changing it depending on the gadget
speed.

Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Link: https://lore.kernel.org/r/20210628155311.16762-3-m.grzeschik@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bug: 229140375
Signed-off-by: Dan Vacura <w36195@motorola.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I1385bf8f973f3e5ee6c76193bffe0046eca22439
(cherry picked from commit 5d084e9710)
2022-07-14 11:22:40 +08:00
Frank Wang
2df103be0d Revert "usb: gadget: uvc: add a new attribute uvc_num_request"
This reverts commit fbb23b9e8c.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I62ef3bc763ab6d318d80ccef64fdb17d8c67998b
2022-07-14 11:22:40 +08:00
Zefa Chen
e2cb0f408f media: i2c: sensor adapter support set frame_interval
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4273a898c35b52ee16cd7132b08c5eb49bde106b
2022-07-14 11:20:08 +08:00
Jianqun Xu
d741b100b4 clk: rockchip: avoid unintentional integer overflow in rockchip_rk3588_pll_recalc_rate()
Fixes: 58c1fa2ef2 ("clk: rockchip: add pll type for RK3588")
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I840458595475e9e1bb6df74453829ea22dd2d729
2022-07-14 11:18:13 +08:00
Zefa Chen
8704b56415 media: rockchip: vicap supports anomaly detection
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I205c9673f7f567597ec3c9e42d5cec1a58b87f5b
2022-07-14 10:57:58 +08:00
Zefa Chen
f1082a51d0 include: uapi: rkcif-config: add reset CMD
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I52ca7f84b6afcb8f286604fbef7e0940a9b20a4a
2022-07-14 10:57:04 +08:00
Sugar Zhang
bd0b0782e7 ARM: dts: rv1106-uvc: Add support pll frac mode for audio
This patch add pll frac freq around 1G for audio product,
which will do fine tune pll for async clk situation,
such as BT, UAC.

Because we have no much more PLLs, and much more devices
share the same PLL, so, we should setup around 1G to serve
all the devices.

PLLs in rv1106:

  APLL: CPU
  DPLL: DDR
  GPLL: DEVICES
  CPLL: DEVICES

  GPLL: 1188MHz
  CPLL: 1000MHz

* PLLs support frac mode:

  GPLL
  DPLL

So, the only way to use audio pll frac freq is to switch to
use GPLL. and switch the role of GPLL and CPLL.

  GPLL: audio frac freq (~1G)
  CPLL: 1188MHz

Tested by UAC product, so, we first address this. and, of course,
there still have chance apply this to other situation, such as IPC.
but, need more test. at this time, we just handle for UAC.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ief13456b6274802836266228d3288d91a148feff
2022-07-13 17:31:12 +08:00
Sugar Zhang
1fd942ea8b clk: rockchip: rv1106: Add pll frac freq for audio
This patch add pll frac freq around 1G for audio product,
which will do fine tune pll for async clk situation,
such as BT, UAC.

Because we have no much more PLLs, and much more devices
share the same PLL, so, we should setup around 1G to serve
all the devices.

PLLs in rv1106:

  APLL: CPU
  DPLL: DDR
  GPLL: DEVICES
  CPLL: DEVICES

  GPLL: 1188MHz
  CPLL: 1000MHz

* PLLs support frac mode:

  GPLL
  DPLL

So, the only way to use audio pll frac freq is to switch to
use GPLL. and switch the role of GPLL and CPLL.

  GPLL: audio frac freq (~1G)
  CPLL: 1188MHz

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: If26f464ac88cd21195db14084f8b4e9ffb457890
2022-07-13 17:31:12 +08:00
Jon Lin
01dd2b51d5 spi: rockchip-test: Support ACPI
Change-Id: I380953abb9ee33193bed7a40402d65cbfff8fd5d
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-07-13 16:41:21 +08:00
Jon Lin
dc77526fb0 spi: rockchip: Support ACPI
1.Remove the dependence on the linux clock framework
2.Change to use the compatible APIs to get device property
3.Add the necessary device property "clock-frequency" for ACPI

Change-Id: I6b996ad4fba8af8d871633947a9eb6a38b8c8707
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-07-13 16:41:21 +08:00
shengfei Xu
1294d14b48 arm64: configs: rockchip_defconfig: enable CONFIG_CHARGER_SGM41542
Enable CONFIG_CHARGER_SGM41542 used for sgm41542 which found on
rk3588s tablet

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ieeeebfe2dde83f40a7589a6fa0418e01ad3433cf
2022-07-13 16:30:43 +08:00
Jianqun Xu
9b7d213684 regulator: rk806: fix a copy-paster error
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I8b632e809c10da9d5eb5627d32a63d6418967f9f
2022-07-13 16:19:29 +08:00
Jianqun Xu
66a2112baa soc: rockchip: rockchip_system_monitor: fix a likely copy-paster error
The global structure system_monitor is same as argument from the
function for rockchip_system_monitor_parse_dt, fix to monitor to make
code easy to read.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I2e0412e9aac697e34e3cc35e1547e837ae7f69b8
2022-07-13 16:16:16 +08:00
Jianqun Xu
35a6ba5aa9 gpio/rockchip: avoid division by zero
If the clk_get_rate return '0', it will happen division by zero.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I1d2c6b12b961a78629f22496fe8f8b685b27dc09
2022-07-13 16:15:03 +08:00
Jianqun Xu
498aa5fd36 phy: rockchip: phy-rockchip-typec fix bad bit shift operation
Remove PHY_DP_POWER_STATE_DISABLED.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Reviewed-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I374341916916a0a3e0753b9fb7d071cea949bfa5
2022-07-13 15:58:34 +08:00
Chen Shunqing
ec31f2140f media: rockchip: hdmirx: add hdcp2 support
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I71146b743c1957a97333cbe1e35c1754cf6f1c90
2022-07-12 16:34:37 +08:00
Algea Cao
f023c52a1f drm/bridge: synopsys: dw-hdmi-qp: Support VSI packet
1.Support 3d mode.
2.Support hdmi1.4 4K resolution VIC number.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ifa424fc89f35ba8045de53929a925821d3e24c92
2022-07-12 16:29:33 +08:00
Lei Chen
62f29586ed drm/rockchip: logo: add resolution types without EDID
Fix the problem that the kernel cannot match the corresponding resolution
when 1080P is used to force output

Signed-off-by: Lei Chen <lei.chen@rock-chips.com>
Change-Id: I5ccc7ee026d4d68935e91f7d05fa3d21a5b26811
2022-07-12 16:29:17 +08:00
Tony Xie
85adeb4f55 serial: 8250_dw: don't set clk when clk is null for rockchip
Fixes: b205560ab1 ("serial: 8250_dw: set uart clk according to baudrate")
Change-Id: I89593824840b2d1c3f5671f46cd92ddea5929d46
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2022-07-12 16:09:24 +08:00
Wang Xiaobin
9622c8cd5a ARM: dts: rockchip: rv1106g-smart-door: reserved memory for meta
Since meta is enabled, remove unnecessary bootargs.

Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com>
Change-Id: Ief0a0f9788d2d3c6532d5385595a94f1decc8cf4
2022-07-12 15:25:26 +08:00
Lin Jinhan
16684192b2 ARM: dts: rockchip: rv1106-smd-cam: drop rkcif_mipi_lvds1_sditf
rkcif_mipi_lvds1_sditf is a virtual node that is used to link to ISP node.
An error occurs if you do not link to ISP node when stream off.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I441de230b7af955ff34af0e88ba8d0f318154cfc
2022-07-12 14:10:22 +08:00
Yandong Lin
986d8f9d5f arm64: dts: rockchip: Enable vepu node for rk3588 boards
Fixes: 94a5dd9f32 ("arm64: dts: rockchip: add vepu support and separate jpege for rk3588")
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Idc14891685c81f0103477d264d44a58585756cd5
2022-07-12 11:44:40 +08:00
Yu Qiaowei
759eaa8274 video: rockchip: rga3: Remove useless memory maps
Update driver version to 1.2.16

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I655c4cbc7dcf91769a978ad61700c43fb0e97d90
2022-07-11 20:23:22 +08:00
Yu Qiaowei
88d6006732 video: rockchip: rga3: Add default mapped device
1. The default_domain is used when the IOMMU device calls dma-buf api,
so it is necessary to save the dev of the main core as the default_dev.
2. The default mapped device will be able to get all the memory
information required by the device.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I0ed1487dc0bfad65bbb1aafb8d2f31255cc4c9fe
2022-07-11 20:23:21 +08:00
Yu Qiaowei
011f061059 video: rockchip: rga3: rename rga2_mmu_info -> rga_iommu
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I0a1722f5034aea25306573156da0111f5aec558c
2022-07-11 20:23:20 +08:00
Yu Qiaowei
bb6df4d8d0 video: rockchip: rga3: add binding for iommu
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I521412c1a57fd0747f2a0673489b5d4ff32ac647
2022-07-11 20:23:19 +08:00
Yu Qiaowei
d7aa7cf45c video: rockchip: rga3: Move global rga_mmu_info to rga_drvdata
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I92f68a238d4fa2190baf746663d65d59f1f29076
2022-07-11 20:23:19 +08:00
Wang Panzhenzhuan
30ee6498f4 media: i2c: s5kjn1: fix binning aligned & channel info get issue
1. set binning output 32 pixel aligned.
2. fix channel info omitted copy from user issue.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ib67deb7648ac88fc5e9e9b0ab6950d6661f76bcc
2022-07-11 18:58:00 +08:00
Algea Cao
d2f8138d0c arm64: dts: rockchip: rk3588: Optimize hdmi ddc compatibility
Set hdmi ddc pin smt enable.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I12bc18f960bdd5890bb6281607a5edf88e5ddfb7
2022-07-11 15:50:02 +08:00
Jason Zhu
799fe35bfc ASoC: rockchip: add 'rockchip,no-dmaengine' for i2s/tdm/pdm
This patch add support for property 'rockchip,no-dmaengine'.
it is a boolean property. if present, driver will do not
register pcm dmaengine, only just register dai. if the dai
is part of multi-dais, the property should be present. Please
refer to rockchip,multidais.txt about multi-dais usage.

Change-Id: I9aa2ddb15f5a27202f90bf32804f214435cc0b73
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2022-07-11 15:44:02 +08:00
Jason Zhu
930b74b2d7 ASoC: rockchip: multi_dais_pcm: support compile multidais_pcm
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I392c8f5f4f294e1c4f83b7be6d08d0eedcd56e2d
2022-07-11 15:44:02 +08:00
Jason Zhu
50f2627330 dmaengine: pl330: add support for interlace size config
Change-Id: Ia1008d689591f80ee2b3c08e1596b83ccd762f63
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2022-07-11 15:44:02 +08:00
Luo Wei
513d3e3b09 arm64: dts: rockchip: rk3588-vehicle-evb: modify sdio wifi gpio
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I7b43d1713e1332e44420c00e6bf29eb99f65944e
2022-07-11 15:25:21 +08:00
Alex Zhao
6513b9fbdd net: wireless: update bcmdhd driver to 101.10.361.20
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I7beac9c4e228865b7a07a0d2f88e2968ac7e5e8e
2022-07-11 15:17:37 +08:00
Cai YiWei
271bc93c62 media: rockchip: isp: fix isp30 cgc and cproc range
cgc fix to full range output, the range:
cgc(full)->(input: full)cproc(output: full or limit)

Change-Id: Iad7448f75d9c76f62f063673d8d5780a44d7ea3d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-07-08 17:31:30 +08:00
Jianwei Fan
55ec37f513 arm64: rockchip_defconfig: enable CONFIG_VIDEO_THCV244
used for rk3588 vehicle evb

Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I6b4ed374c21b751a7f957941324a7914898bc361
2022-07-08 17:31:30 +08:00
Jianwei Fan
1a1b2faf0b arm64: dts: rockchip: rk3588-vehicle-evb: add thcv244 camera configuration
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I0a3914bae12a711f04ff586ac0b4f5e150c55aa9
2022-07-08 17:31:30 +08:00
Liang Chen
006bc386d7 ARM: dts: rockchip: rv1106: adjust cpu opp-table
Change-Id: I0c22d73108740a0f13d8fcf271809ac84b6c23f5
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-07-08 17:31:30 +08:00
Wang Panzhenzhuan
d912177e8b media: i2c: cn3927v: reduce vcm collision noise
adjust resume & suspend logic to reduce kaka noise

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I41ed140b13f62d8041804716e3e484ea3ff5db11
2022-07-08 17:31:30 +08:00
Wang Panzhenzhuan
734a63bdb1 media: platform: cif: support config adapt to android usb camera hal
usage:
&rkcif {
    ...
    rockchip,android-usb-camerahal-enable;
    ...
};

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Id556c38b65fa528de436443434f50c619a7c9ecc
2022-07-08 17:31:30 +08:00
Frank Wang
18ef66dbd8 usb: typec: tcpm: add get max power support
Traverse fixed pdos to calculate the maximum power that the charger
can provide, and it can be get by POWER_SUPPLY_PROP_INPUT_POWER_LIMIT
property.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I3533beaa2eb2482de371c271db3f601d50e1be73
2022-07-08 17:31:30 +08:00
Jianqun Xu
0373c12d82 iommu/iova: drop codes about rcache from iova_dump
Not to do flush in iova_dump(), and drop to dump the rcache.

Fixes: 0c51523b06 ("iommu/iova: dump iova when alloc failed")
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Iab4a923960d4aace0645d5276705b47dc00ebeea
2022-07-08 17:31:29 +08:00