Commit Graph

1079963 Commits

Author SHA1 Message Date
Tao Huang
9a2fdb9b46 uapi/rk_vcm_head.h: Fix UAPI compile-test
./usr/include/linux/rk_vcm_head.h:88:2: error: unknown type name 's32'
./usr/include/linux/rk_vcm_head.h:111:30: error: field has incomplete type 'struct __kernel_old_timeval'
./usr/include/linux/rk_vcm_head.h:116:23: error: field has incomplete type 'struct old_timeval32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I603502aaac87c71de8ae6ad027652de23cdcf73d
2023-05-30 16:09:11 +08:00
Tao Huang
9392fc185f uapi/rk-camera-module.h: Fix UAPI compile-test
./usr/include/linux/rk-camera-module.h:180:2: error: unknown type name 'u8'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I388d47ea658b5829df148c8b10eb5c466160a0e7
2023-05-30 16:09:11 +08:00
Tao Huang
4100ee9184 uapi/rk-preisp.h: Fix UAPI compile-test
./usr/include/linux/rk-preisp.h:65:2: error: unknown type name 's32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib1812da340c745600b4e2286ca299db2c1922bce
2023-05-30 16:09:11 +08:00
Tao Huang
d2c8cecdbc uapi/rk-isp32-config.h: Fix UAPI compile-test
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iddda89ca94260056fee99b15c72c0c83cf02a8e1
2023-05-30 16:09:11 +08:00
Tao Huang
36d41c6a18 uapi/rk-isp3-config.h: Fix UAPI compile-test
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I26016e6d1c3dbea0717ea97f80798677ac1b8823
2023-05-30 16:09:11 +08:00
Tao Huang
6c9d8b3eab uapi/rk-ispp-config.h: Fix UAPI compile-test
./usr/include/linux/rk-ispp-config.h:21:43: warning: // comments are not allowed in this language [-Wcomment]
./usr/include/linux/rk-ispp-config.h:132:2: error: unknown type name 'u32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5d9a79af6c1f72a8e969b0664e6b48fbf9e0199f
2023-05-30 16:07:14 +08:00
Tao Huang
97cb4e6b74 uapi/rk-isp1-config.h: Fix UAPI compile-test
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1bacf9575ded157a7c720472c24dfb32ff59c8e1
2023-05-30 16:06:44 +08:00
Tao Huang
7ea15737d0 uapi/rk-isp21-config.h: Fix UAPI compile-test
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id8c9c89b79b621aac379e3f937dfc488772c1b2f
2023-05-30 16:06:44 +08:00
Tao Huang
7e16cc6ce6 uapi/rk-isp2-config.h: Fix UAPI compile-test
./usr/include/linux/rk-isp2-config.h:277:21: error: implicit declaration of function 'BIT' [-Werror,-Wimplicit-function-declaration]
./usr/include/linux/rk-isp2-config.h:288:2: error: unknown type name 'u32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2f98bdcf50638cbe328b310d17d9417b382ab551
2023-05-30 16:06:44 +08:00
Tao Huang
1f70949faa uapi/rkcif-config.h: Fix UAPI compile-test
./usr/include/linux/rkcif-config.h:63:2: error: unknown type name 'u8'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic1c8f6c71c7fcaffd3f44ea8c88fcbeba19f3f7d
2023-05-30 16:06:44 +08:00
Tao Huang
1f72923c99 uapi/rk-video-format.h: include types.h
usr/include/linux/rk-video-format.h:10: found __[us]{8,16,32,64} type without #include <linux/types.h>

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3071683240e04039186c3a1d506835bd732c6716
2023-05-30 16:06:44 +08:00
Tao Huang
35d4f2a5df uapi/rockchip_drm.h: Fix UAPI compile-test
./usr/include/drm/rockchip_drm.h:19:10: fatal error: 'drm/drm_file.h' file not found

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I987b8bb26023e9e7b652962e54b45c24a0231d57
2023-05-30 16:06:44 +08:00
Tao Huang
018299a4ca uapi/dw_hdcp2.h: Fix UAPI compile-test
./usr/include/misc/dw_hdcp2.h:15:1: warning: // comments are not allowed in this language [-Wcomment]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib68c8b37acdc7e7cb11abeae15d1bfd27ec945b3
2023-05-30 16:06:44 +08:00
Tao Huang
78e874e69c uapi/rkflash_vendor_storage.h: include types.h
./usr/include/misc/rkflash_vendor_storage.h:11:2: error: unknown type name '__u32'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia912e65b2f87d2c6bd57eb76019431c4084f6549
2023-05-30 16:06:44 +08:00
XiaoDong Huang
da9a7e29f0 ARM: configs: rockchip: Add rv1106-pm.config
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: Id8375b10d5c9b240a45e451b0a027d362c7ca06a
2023-05-30 10:41:39 +08:00
Wyon Bi
c0ec4e0fa1 drm/panel: maxim-max96752f: Add support for ogm 101fhbllm01
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I99ff2d7abd0d5e5ab7f44b6eda5b82669ab60ecf
2023-05-29 10:17:12 +08:00
Wyon Bi
b65cee7aa1 drm/bridge: max96745: Add tx_rate switch for twisted-pair cable
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I02af1ca0325a0eeb41023f56d7d747da17afab99
2023-05-29 10:17:12 +08:00
Jianqun Xu
0c051c5aec soc: rockchip: iomux fix compile error
The commit 5e0fa7cfef ("pinctrl/rockchip: Sync with upstream") removed
the gpio head file from pinctrl-rockchip head file, but the iomux driver
depends on the gpio head file.

  CC      drivers/soc/rockchip/iomux.o
In file included from drivers/soc/rockchip/iomux.c:18:
drivers/soc/rockchip/../../pinctrl/pinctrl-rockchip.h:338:20: error: field has incomplete type 'struct gpio_chip'
        struct gpio_chip                gpio_chip;
                                        ^
drivers/soc/rockchip/../../pinctrl/pinctrl-rockchip.h:338:9: note: forward declaration of 'struct gpio_chip'
        struct gpio_chip                gpio_chip;
               ^
drivers/soc/rockchip/../../pinctrl/pinctrl-rockchip.h:339:28: error: field has incomplete type 'struct pinctrl_gpio_range'
        struct pinctrl_gpio_range       grange;
                                        ^
drivers/soc/rockchip/../../pinctrl/core.h:17:8: note: forward declaration of 'struct pinctrl_gpio_range'
struct pinctrl_gpio_range;
       ^
In file included from drivers/soc/rockchip/iomux.c:18:
drivers/soc/rockchip/../../pinctrl/pinctrl-rockchip.h:430:24: error: field has incomplete type 'enum pin_config_param'
        enum pin_config_param param;
                              ^
drivers/soc/rockchip/../../pinctrl/pinctrl-rockchip.h:425:6: note: forward declaration of 'enum pin_config_param'
enum pin_config_param;
     ^
drivers/soc/rockchip/../../pinctrl/pinctrl-rockchip.h:467:23: error: field has incomplete type 'struct pinctrl_desc'
        struct pinctrl_desc             pctl;
                                        ^
drivers/soc/rockchip/../../pinctrl/core.h:44:9: note: forward declaration of 'struct pinctrl_desc'
        struct pinctrl_desc *desc;
               ^
4 errors generated.

Change-Id: Ib9596eafe1d128de9be4b4d8462ec92842f7ff3f
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2023-05-27 16:57:33 +08:00
XiaoDong Huang
59d0a1e8b2 firmware: rockchip_sip: fix error in cpu_logical_map_mpidr
If PE support multithread, the mpidr of cpu0~cpu3 in cluster0
and cpu4~cpu7 in cluster1 is as follow:
cpu0~3: 0x81000000, 0x81000100, 0x81000200, 0x81000300.
cpu4~7: 0x81010000, 0x81010100, 0x81010200, 0x81010300.

If PE doesn't support multithread, the mpidr of cpu0~cpu3 in cluster0
and cpu4~cpu7 in cluster1 is as follow:
cpu0~3: 0x80000000, 0x80000001, 0x80000002, 0x80000003.
cpu4~7: 0x80000100, 0x80000101, 0x80000102, 0x80000103.

Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: Ib2fb18ad280c6c275850910f18cb4f653c4a108f
2023-05-26 18:34:38 +08:00
Luo Wei
b9d6865a47 arm64: dts: rockchip: vehicle-display: set dsi resolution to 1920x720@60
Change-Id: I3fef41dc1a70b43a43229b4f520692b6ce23b7f2
Signed-off-by: Luo Wei <lw@rock-chips.com>
2023-05-26 18:33:14 +08:00
William Wu
9e36581320 phy: rockchip: inno-usb2: power on phy if linestate is SE1
Some special devices connected to host port, the linestate
maybe SE1 (DP/DM both in High level).

The below devices are the known special devices

Wireless HID: VID = 0xa604, PID = 0x0715
RK3308BS ADB: VID = 0x2207, PID = 0x0006

In order to support these special devices, this patch
handle the linestate SE1 as device connected state,
and power on the phy if it has already suspended.

Change-Id: I55fe83150c18d6c2629fbc857790ef04cdb68da5
Signed-off-by: William Wu <william.wu@rock-chips.com>
2023-05-26 14:26:28 +08:00
William Wu
5da9da3109 usb: dwc3: gadget: prepare at least twice txfifo for each ep
The current logic to assign only one max packet limit
for each IN endpoint txfifo, it's not enough for some
usb functions on Rockchip platforms.

For example, on RV1106 platform usb composite device
with UVC function, if it sets one max packet limit for
IN endpoint txfifo, the UVC function streaming ep may
be assigned with ep4-in or ep5-in which have default
HW value 1048B. But the UVC function needs to support
high bandwidth isochronous transaction in a microframe
(two or three transactions per microframe), the ep4-in
or ep5-in has not enough txfifo space to fit the UVC.

In addition, to meet performance requirement, a minimum
TxFIFO size of 2x MaxPacketSize for BULK/ISOC endpoints
is recommended in DWC3 databook.

So this patch prepares at least twice txfifo for each
IN endpoint on Rockchip platforms.

Fixes: 767a360826 ("UPSTREAM: usb: dwc3: gadget: Fix IN endpoint max packet size allocation")
Change-Id: If97eb74ab6ec1a32fe162758bc8f704c15fa4f3c
Signed-off-by: William Wu <william.wu@rock-chips.com>
2023-05-26 14:26:28 +08:00
Algea Cao
1a6d52236f drm/bridge: synopsys: dw-hdmi-qp: Achieve the same frequency color seamless switch
When the frequency before and after color switching is the
same, the resolution switching process is not performed.
Instead, go through the following process:

connector atomic check--->set avmute--->config hdmi controller
-->config vop-->connector atomic commit-->clear avmute.

This way the HDMI output will not be interrupted, the black
screen time will be shorter, and the user experience will be
better.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ie12fd3c17c5b9ba56391cbe0e976e012dffae0ba
2023-05-25 20:22:56 +08:00
Algea Cao
91a23b0515 phy: rockchip-samsung-hdptx-hdmi: Fix hdmi Inter-Pair Skew exceed the limits
In hdmi2.0 resolution, the phase of D2 lane is probabilistically
ahead of other lanes.  Set phy deskew FIFO works on shared pointer
to fix this problem.

According to vendor, this patch is also available for frl mode.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ic6f5111ede5a553fb6d6511bd340d4f2010f3fe7
2023-05-25 19:19:31 +08:00
Xing Zheng
5110d5de6d ASoC: rockchip: rk817-codec: Be stable PLL status during switch sample rate and mclk
Change-Id: I5f01035efb68fac9800fb62388221210bdb12d93
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2023-05-25 15:07:08 +08:00
William Wu
666bac0de5 FROMLIST: usb: xhci: account for num_trbs_free when invalidating TDs
If a ring has a number of TDs enqueued past the dequeue pointer, and the
URBs corresponding to these TDs are dequeued, then num_trbs_free isn't
updated to show that these TDs have been converted to no-ops and
effectively "freed". This means that num_trbs_free creeps downwards
until the count is exhausted, which then triggers xhci_ring_expansion()
and effectively leaks memory by infinitely growing the transfer ring.

This is commonly encounted through the use of a usb-serial port where
the port is repeatedly opened, read, then closed.

Move the num_trbs_free crediting out of the Set TR Dequeue Pointer
handling and into xhci_invalidate_cancelled_tds().

There is a potential for overestimating the actual space on the ring if
the ring is nearly full and TDs are arbitrarily enqueued by a device
driver while it is dequeueing them, but dequeues are usually batched
during device close/shutdown or endpoint error recovery.

Link: https://github.com/raspberrypi/linux/issues/5088
Change-Id: I858a32e6bcbb525cccff3a6d07fe77d2be67f5e7
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
2023-05-25 15:02:08 +08:00
Finley Xiao
a8f20dd9fb arm64: dts: rockchip: rk3528: Add mbist-vmin for cpu gpu and dmc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I664731babae657181e94734b721ae6d1d6a39078
2023-05-24 18:10:07 +08:00
Finley Xiao
d4619c986e arm64: dts: rockchip: rk3528: Add 12500uV for cpu low frequencies
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Icfe74c6edbbb1328a864fa8d42448e09e71a0a46
2023-05-24 18:08:46 +08:00
David Wu
26edc1f09c arm64: dts: rockchip: rk3588: Change tx/rx queue to 1 for gmac
Because to support half duplex, change the default queue to 1, otherwise
half duplex is not supported.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ice6c045dd70f8a41d44696b734ff4bccd511a4f0
2023-05-24 15:50:24 +08:00
David Wu
a1cf510121 arm64: dts: rockchip: Add uio nodes for rk3588
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I9b9421211db4d6f87e984077bd5827c4d8fd94c1
2023-05-24 15:50:24 +08:00
Zhen Chen
22047de6cf MALI: midgard: Fix a bug of dereferencing possible ERR_PTR()
The original error check message:
drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c:371 midgard_kbase_devfreq_init() error: 'kbdev->devfreq' dereferencing possible ERR_PTR()

Modifications here are based on corresponding codes in drivers/gpu/arm/bifrost/.

Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: I6d74d39b92ce89e72814f3a0749b79140338b229
2023-05-24 11:19:04 +08:00
Algea Cao
1805f0c619 drm/rockchip: dw_hdmi: Fix check yuv422 color format err
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I52da76600eafc7d7909cd6017dd3efa0509f2052
2023-05-24 10:03:14 +08:00
Lin Jinhan
5ff1d49a54 crypto: rockchip: fixed probabilistic crashes in multithreading
The protection range of spin lock is optimized to prevent
competition conditions.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I6d3dd088fc5e5c0046df12184108b9e176ac26a7
2023-05-24 10:02:53 +08:00
Sandy Huang
bfc49df515 drm/rockchip: vop3: plane display size check use crtc_* parameter is more correct
Just like some 3D mode, the mode->crtc_* parameter will be recalculate
according the mode->flag, and we use the mode->crtc_* parameter to config
to VOP register, so we need use crtc_* parameter to do plane size check.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I0b8a7de251707bf4737b107b167be73270fe63bc
2023-05-23 19:48:33 +08:00
Sandy Huang
55817cab29 drm/rockchip: dw_hdmi: Fix double register HDR_OUTPUT_METADATA prop at non RK3588 platform
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I65a85b96081d76a1b3936e615cb10d62614c9957
2023-05-23 19:36:40 +08:00
Sugar Zhang
823316b64b ASoC: rockchip: i2s-tdm: Optimize TRCM on slave mode
TRCM require TX/RX enabled at the same time, or need the one
which provide clk enabled at first for master mode.

It is quite a different for slave mode which does not have
these restrictions, because the BCLK / LRCK are provided by
external master devices.

So, we just set the right clk path value on TRCM register on
stage probe and then drop the trcm value to make TX / RX work
independently.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I104f168d75787d79625ca7765a1bda1e77cdde12
2023-05-23 17:02:13 +08:00
Jun Zeng
99bdd6ef7d arm64: dts: rockchip: rk3588-vehicle-evb: initialize default pull up RK3308 reset pin
Change-Id: Id99945cdb96cb35f7f351206fd8f94d9fc73824d
Signed-off-by: Jun Zeng <jun.zeng@rock-chips.com>
2023-05-23 16:49:39 +08:00
Algea Cao
c72cacb13e drm/bridge: synopsys: dw-hdmi-qp: Fix cec irq register failed
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I78f13a83b8be35978946eb3600bcc2c7a7f3a540
2023-05-23 15:50:37 +08:00
Tony Zheng
dfd19a220a arm64: dts: rockchip: Add rk3308b-evb-amic-v10-amp.dts
Signed-off-by: Tony Zheng <tony.zheng@rock-chips.com>
Change-Id: I5ca026dc6b0c7cbec12b2e62f0d1de3d49b7c3fd
2023-05-23 15:09:07 +08:00
William Wu
65ffb8b532 arm64: dts: rockchip: rk3588: Disable u1 and u2 state for USB OTG1 device
The USB3.0 OTG1 interface support Dual-Role Device (DRD)
features, it means that supports either device or host
operation separately, not simultaneously. In most application
scenarios, the OTG1 is used as host mode. But there are
some scenarios that need two USB devices at the same time
on the RK3588 platform, in this case, it needs to set both
the OTG0 and OTG1 in device mode. In order to improve the
OTG1 USB3.0 device performance and stability, this patch
disable the u1 and u2 state for OTG1, like what the OTG0
has done.

Change-Id: Iec3249227d7b767e7dc0904fea0424c14ae00670
Signed-off-by: William Wu <william.wu@rock-chips.com>
2023-05-22 15:07:31 +08:00
Damon Ding
d15c6d975b drm/rockchip: dsi: get bus_flags from display_info in atomic_check
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I716554af116c729a7635adc8fe264f36447b767c
2023-05-19 17:49:52 +08:00
Hisping Lin
34571a196e dt-bindings: nvmem: add rockchip-secure-otp bindings
Change-Id: Ia8b0ca44256d602b771346dd8c46f67ef3f6864f
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2023-05-19 17:46:27 +08:00
Hisping Lin
c974b1e69d arm64: dts: rockchip: rk3528: Add secure otp node
Change-Id: I0e8cb8ac44d0f1144d4ff709b3cff172aeb1e409
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2023-05-19 17:43:38 +08:00
Hisping Lin
9aed3d5071 nvmem: add Rockchip Secure OTP driver
Support kernel read and write non-protected oem zone
in secure otp, It dependent on tee driver, Confirm that
the tee drive is open.

Change-Id: I31936256f5535bf7a6fb63a9ec52eec70c054423
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2023-05-19 17:43:38 +08:00
Luo Wei
bd79dcc287 arm64: dts: rockchip: rk3588-vehicle-evb: add rgmii phy rtl9010a support
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I07371f33a0560cbf819dc34f5b277aaa84decc99
2023-05-19 17:28:33 +08:00
Shaoxing Chen
fcc91742d4 net: phy: realtek: Add rtl9010a support
If have RTL9010A ethernet, need enable CONFIG_REALTEK_PHY config

Change-Id: I935a638a3ce480046a71ce74bfe048410b5893ed
Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
2023-05-19 05:23:21 -04:00
Shaoxing Chen
70dee7045b net: stmmac: Add 100Base-T1 and 1000Base-T1 support
Change-Id: I854394757b30042da0c448451affd616278846ce
Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
2023-05-19 16:52:39 +08:00
Yingsong Ye
3437b88e21 media: i2c: Add imx492 support
Change-Id: I9b6249e0f15027c4b8ce2a1d3509d6eff487ff08
Signed-off-by: Yingsong Ye <alexhazel.ye@rock-chips.com>
2023-05-19 16:11:33 +08:00
Algea Cao
2b5a59ab08 drm/rockchip: dw_hdmi-qp: Fix crash when disable uboot logo
Reading register that do not require dclk enable to
check whether hdmi is enabled in uboot.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I951efabf3271246f2e68a4550ec166428c9cc10c
2023-05-19 14:47:35 +08:00
Michael Zheng
cb635605ff arm64: configs: add rk3562_robot.config fragments
The rk3562_robot.config is specifically for robotic by
 - tuning for performance, energy senseless
 - removing unused modules like screen, charge, mouse, ethernet
 - removing features are not for rk3562

Change-Id: I6a80bac8a0e9a9db1fc2d4ee00d6d90d5e6b00e4
Signed-off-by: Michael Zheng <zhengsq@rock-chips.com>
2023-05-19 10:16:12 +08:00