Commit Graph

1079623 Commits

Author SHA1 Message Date
Guochun Huang
da5c8288d2 arm64: dts: rockchip: rk3588-vehicle-maxim-serdes: remove unused attribute
Change-Id: I53aac65a92b01464d5f39196fd8b5ca1736a70f6
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-03-31 15:45:55 +08:00
Xing Zheng
a79d5a5f0a drm/rockchip: inno_hdmi: fix the noise during pause/resume by application
Since the i2s does not support the clock to be always on, and
snd_pcm_stop() will turn off the i2s clock.

However, the inno HDMI codec still needs to the clock to work, then
it does not do the corresponding clear and leads to abnormal audio
logic inside HDMI without the clock.

This patch adds an AUDIO_PD off/on to clear internal audio logic
during HDMI prepare to solve this problem.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I1ccb486a3fe1729c95d7d755ae2caf88d61a146b
2023-03-31 14:40:08 +08:00
Jianwei Fan
ca99cd1152 media: i2c: jaguar1: fix compile error and add enum_frame_interval api
Change-Id: I93832e248ee6c2c2efc761d2a3bd2e7cea793fae
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-03-31 14:38:41 +08:00
Jon Lin
3193e78fe5 arm64: dts: rockchip: Reserved bar2 memory region for pcie3x4 ep
Change-Id: I5fac8637263c9f9fc351ddc6ae1d7cc37a8a32af
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-03-31 14:37:58 +08:00
Jon Lin
60ce2e8807 PCI: rockchip: dw: Support bar2 memory map
Rerseved memory for bar2 mapping by the dts property
"memory-region", the bar resource mapping rule:
 - bar0 4MB
 - bar2 64MB

for example:
	reserved-memory {
		...
		bar0_region: bar0-region@0x3c000000 {
			reg = <0x0 0x3c000000 0x0 0x00400000>;
		};
		bar2_region: bar2-region@0x40000000 {
			reg = <0x0 0x40000000 0x0 0x04000000>;
		};
	};

	&pcie3x4 {
		...
		memory-region = <&bar0_region>, <&bar2_region>;
		memory-region-names = "bar0", "bar2";
		...
	};

The rule is flexble and change by user as they want.

Change-Id: I1b866919f81892ad5326fb93896384c22c54fe74
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-03-31 14:37:58 +08:00
Wyon Bi
0608f7e239 drm/bridge: maxim-max96745: Remove unused code
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I2f686f7a6395feb72896a3644093fc1acb315e81
2023-03-31 14:36:20 +08:00
Wyon Bi
dd1d5e6715 drm/panel: maxim-deserializer: Add static GPIO ID assignment
bl_pwm - GPIO ID 0

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I0eb4ec5e2e6ff6ad06efbc93f1e7c9837312308f
2023-03-31 14:36:20 +08:00
Wyon Bi
bd05f5d23c arm64: dts: rockchip: rk3588-vehicle-maxim-serdes: Add static GPIO ID assignment
bl_pwm - GPIO ID 0

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I807d578646387cc870e5f825f935f50d12924065
2023-03-31 14:36:20 +08:00
Tao Huang
8ded72f47d arm64: rockchip_gki.config: Disable CONFIG_CHR_DEV_SCH
android13 without these symbols:
__scsi_execute
scsi_device_lookup
scsi_print_sense_hdr
scsi_register_driver

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I22871cf2470b33b9d780daca81c195a7343b3655
2023-03-31 09:48:34 +08:00
Tao Huang
95a8c1b877 net: wireless: rockchip_wlan: bcmdhd: Fix out-of-srctree build
../drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/aiutils.c:25:10: fatal error: 'typedefs.h' file not found

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I425cb52776bb1b3294b8ef67c951b04afe2288a9
2023-03-30 21:14:08 +08:00
Zhang Yubing
d0954732ea drm/rockchip: dw_hdmi-qp: support show split mode logo
Change-Id: I13d62aee86ba911253112be6709d84e86213a59e
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2023-03-29 18:52:50 +08:00
Oliver Peng
f06f540a36 arm64: dts: rockchip: init rk3588-vehicle-evb-v20 dts file
add vehicle-evb-v20 dts file for first time

Signed-off-by: Oliver Peng <oliver.peng@rock-chips.com>
Change-Id: If48fa4fee974d84c99989e3014651fc8aacf53e0
2023-03-29 16:34:52 +08:00
Jon Lin
94aced204c arm64: dts: rockchip: rk3562: modify driver strength for spi pins
Change-Id: I5f95608c1b6d5664a45437f37c7dd5b8f53735ad
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-03-29 11:05:06 +08:00
Zhang Yubing
efbd7039b3 drm/rockchp: dw-dp: support HDR
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I7a14f4a8342d44a926fb266bb78bffed7866c469
2023-03-29 10:20:06 +08:00
Guochun Huang
bd43adea36 drm/rockchip: rgb: fix phy power_count may unbalance in resume and suspend
Change-Id: I760db0055f6efcc0a2e1a74942e23e2d432181bd
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-03-29 09:17:15 +08:00
Guochun Huang
f982b75ab5 drm/rockchip: lvds: fix phy power_count may unbalance in resume and suspend
phy->ops->power_on will be called when current phy->power_count equal 0,
and phy->ops->power_off will be called when current phy->power_count
equal 1. but the .power_off and .power_on hook will never be called in
suspend and resume process if phy->power_count is not initialized to 1
in loader_protect.

Change-Id: Ib69f93ac02d396182ee08f55657c71d6cd907329
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-03-29 09:17:08 +08:00
Zefa Chen
913273ca12 media: rockchip: vicap: fixes error of access a nonexistent tools_vdev
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia872c7c14eba23ce9d4f38ec152c7705384fcdf1
2023-03-29 09:16:41 +08:00
Damon Ding
eedd15d9e4 drm/rockchip: rgb: support more display formats
Add MEDIA_BUS_FMT_BGR888_3X8 and MEDIA_BUS_FMT_BGR888_DUMMY_4X8.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I3262b2ab9f671c32263a98b51b4bf79fe49da4c3
2023-03-29 09:16:03 +08:00
Huibin Hong
4cda6bf166 soc: rockchip: rk_fiq_debugger: fix interrupt fires forever
Fix bug that RX TIMEOUT interrupt fires forever.

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I98062debaf549ccbd8e3bda84a396e59588c8309
2023-03-28 10:05:40 +00:00
Cai YiWei
17e4013e9e media: rockchip: rename isp and ispp uapi head
Change-Id: I768baae0c406efc0bdc9b13dc2ac745f1365cf45
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-03-27 09:18:24 +08:00
Zefa Chen
fd32f0f8d6 media: rockchip: vicap: scale video capture follow main stream
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie1d052bae55027d42d8ecb5976c9dccddd1e784c
2023-03-27 09:13:05 +08:00
Damon Ding
10f9176932 arm64: dts: rockchip: rk3562: modify driver strength for bt1120 pins
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I8ad40748f7fc2ecb2ee5cca795b41cdecb17816e
2023-03-27 09:09:08 +08:00
Sandy Huang
b9be1cc4a6 drm/rockchip: vop2: Don't dynamic turn on/off rk3588 PD_ESMART
Close dynamic turn on/off rk3588 PD_ESMART and keep esmart pd on when
enable display.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I154b96d1039dc42a773ec769c81aa054e9f9d79d
2023-03-27 09:06:23 +08:00
Zhang Yubing
2b7835ea77 drm/rockchip: dw-dp: fix dw_dp_bridge_mode_valid() return value type
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Id31da1890c26b5c76e955fe103b62966eec2c126
2023-03-27 09:03:47 +08:00
Jon Lin
014c17ee5f PCI: rockchip: dw: Using __u32 instead of u32
Change-Id: I58cbbb23c6cb74a073da130d70eeb5519b09e121
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-03-27 09:03:27 +08:00
Zefa Chen
73fe7e52d3 media: rockchip: vicap: fixes snprintf warning of mipi csi2 error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie6aed0c88a4ac5d9c5750885ef70fb0b391aa552
2023-03-27 09:01:27 +08:00
Zefa Chen
ddc6266787 media: rockchip: vicap: fixes issue of tools video register
tools video only support chip higher than rk1808

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iec7bfa9e9faa0bf520443f7e259c0519496c7b0f
2023-03-27 09:01:27 +08:00
Cai YiWei
d6fb546c18 media: rockchip: isp: version v2.2.0
Change-Id: I58699277e15b23c7eb8d4730c8d043164fb4746b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-03-23 18:41:04 +08:00
Cai YiWei
f035db5f70 media: rockchip: isp: fix read BP_WR_CTRL reg
Change-Id: I2d448dcd6db98dafeb00209cb9d876a5ee98c51c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-03-23 18:41:04 +08:00
Yiqing Zeng
32c4d89494 ARM: dts: rockchip: rv1106-evb-cam: change os04a10 module name and lens name
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I37f114e048f9e919f8fe02eee749124276e2b402
2023-03-23 17:32:00 +08:00
Shiqin Chen
50c6114437 arm64: configs: rk3588_edge: Enable CONFIG_SENSORS_PWM_FAN
Signed-off-by: Shiqin Chen <chensq@rock-chips.com>
Change-Id: I76ab7f583afe3f891d5680056b12bab24a6b0407
2023-03-23 09:51:24 +08:00
Zorro Liu
535756b972 backlight: pwm_bl: set bl brightness 0 when reboot quiescent
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: Idf24ba57198dfb404d36507e207069c542924eea
2023-03-23 09:29:01 +08:00
Zorro Liu
c9e25627a9 arm64: dts: rockchip: rk3588s: add reboot mode quiescent
Change-Id: I263760f6a4869210ec80eac4ae4437bb7762d625
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2023-03-23 09:26:03 +08:00
Zorro Liu
e760c21d37 dt-bindings: soc: rockchip: add reboot mode quiescent
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I249f7dc7b8f464e0f5dd69797124fba036126b55
2023-03-23 09:22:27 +08:00
Jianwei Fan
232b116165 media: i2c: imx577: fix gain step
Fixes: de9477630d ("media: i2c: imx577: add dgain control")
Change-Id: Ie78a4330a8c38f605db2b07bc867f20cb3a29bb1
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-03-22 17:53:02 +08:00
Shawn Lin
48b91619b8 PCI: rockchip: dw: Double check LTSSM
We saw a link failure after linkup which should fail to probe the device
actually. That was misleading for PCIe stack to scan the device. Add a
double check for that. If that happened, just try to link until the
timeout happened.

[    2.373308] rk-pcie fe180000.pcie: PCIe Linking... LTSSM is 0x3
[    2.455521] rk-pcie fe180000.pcie: PCIe Link up, LTSSM is 0x2
[    2.455658] rk-pcie fe180000.pcie: PCI host bridge to bus 0003:30

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I0f9bcbb42d77a80aa1cb533952427b71096240d6
2023-03-22 17:39:38 +08:00
Wu Liangqing
d031ad7267 arm64: dts: rockchip: adaptive rk3399-sapphire-excavator
Change-Id: I3e7b80091775414c1d51eda1cb14c50c0e930fc2
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2023-03-22 17:39:19 +08:00
cww
379493488c ARM: dts: rockchip: add rv1106g-evb2-v10-dual-camera.dts
Signed-off-by: cww <cww@rock-chips.com>
Change-Id: I7be6cb6a8a4cfccbf24344239b224cb51cdf0bae
2023-03-22 16:29:25 +08:00
cww
959f662239 ARM: dts: rockchip: rv1106-thunder-boot: reserved_mem add rkisp1_thunderboot
Signed-off-by: cww <cww@rock-chips.com>
Change-Id: I5b9dc2321efbf5f851a8a5afeba0e4d63d1cc554
2023-03-22 16:28:44 +08:00
Jon Lin
69059cd5f5 drivers: rkflash: Fixes compiler warnings
drivers/rkflash/nandc.c:393:31: warning: equality comparison with extraneous parentheses [-Wparentheses-equality]
error, forbidden warning:nandc.c:393
                        } while ((fl_reg.V6.tr_rdy == 0));
                                  ~~~~~~~~~~~~~~~~~^~~~
drivers/rkflash/nandc.c:393:31: note: remove extraneous parentheses around the comparison to silence this warning
                        } while ((fl_reg.V6.tr_rdy == 0));
                                 ~                 ^   ~
drivers/rkflash/nandc.c:393:31: note: use '=' to turn this equality comparison into an assignment
                        } while ((fl_reg.V6.tr_rdy == 0));

Change-Id: Ib4c422216c61191b924163fedfe1b83f1fd297df
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-03-22 15:30:39 +08:00
Shiqin Chen
57061ad7b6 arm64: dts: rockchip: rk3588-toybrick-x0: Enable pwm fan
Signed-off-by: Shiqin Chen <chensq@rock-chips.com>
Change-Id: I537275a2d35fb28181a3f7512bc11ce01510112e
2023-03-22 14:54:41 +08:00
Algea Cao
15670ab702 drm/rockchip: dw_hdmi: Set default color base on previous color
Fixed color anomalies caused by plug when playing hdr videos.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I487ba996add98e5d474149bae3552fe0e8371ff2
2023-03-22 09:21:03 +08:00
Huang zhibao
e81c289e86 arm64: dts: rockchip: rk3588-pcie-ep-demo: fix i2c port error
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I8a3761983488d29e01c4353894d99e0d746ec280
2023-03-21 18:03:28 +08:00
Guochun Huang
9cadc52d78 Revert "drm/rockchip: dsi2: set escape clk 10MHz default"
solve no response when read back from panel in video mode display

This reverts commit 28eb6929be.

Change-Id: Ic42637d7714169fafa22771185e11c2ddcfa5c95
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-03-21 08:35:05 +00:00
Tao Huang
6811c647e8 dma-buf: destructor only with CONFIG_DMABUF_CACHE
Destructor is only used by dma-buf cache.
So replace CONFIG_NO_GKI with CONFIG_DMABUF_CACHE.

Fixes: 345084a2ed ("BACKPORT: ANDROID: GKI: dma-buf: Add support to set a destructor on a dma-buf")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I08c1a10e8e74c37fbe9677115ca421425e4cdcd4
2023-03-21 15:22:57 +08:00
Jon Lin
a7c40cb119 PCI: rockchip: dw-dmatest: Suppport rc dma
1.Set rc dma as default
2.Changet to ep dma by sending command:
	echo 0 > ./sys/module/pcie_dw_dmatest/parameters/is_rc

Change-Id: I9b16c328c08f220772e487c7c796b8898d74ae10
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-03-21 14:29:01 +08:00
Jon Lin
7152ea12b2 PCI: rockchip: dw: Support ep information
1.Support ep information, including sending ep dma status to rc by using msi
2.Set ep drivers version 0x00000001
3.Support PCIE_DMA_RAISE_MSI_OBJ_IRQ_USER ioctl

Change-Id: I9c1530a1ce8289ce324b78a9dd5fa0cb6a5a1858
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-03-21 14:28:12 +08:00
Jon Lin
051e4d7cf0 PCI: rockchip: dw: Add the specification of ep information
Definition rockchip ep device information, like drivers version
and devices dma status. These information will be store in BAR0
in default.

Change-Id: I33dcc00e9923d10ad63d706ce16ba646f0049480
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-03-21 14:27:27 +08:00
Tao Huang
29686dd3c9 arm64: dts: rockchip: Fix Makefile sorting for rk3588-nvr-demo-v10-ipc-4x-linux
Fixes: b9ef4803ff ("arm64: dts: rockchip: add rk3588-nvr-demo-v10-ipc-4x-linux.dts")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ice0e586660b696cb3757998d3b5513956d9b3812
2023-03-20 20:27:18 +08:00
Yandong Lin
d2fa6b5151 video: rockchip: mpp: fix bus err for px30 dec/enc
When encoding and decoding in parallel, iommu switch failed cause bus
err.
rk_iommu ff442800.iommu: BUS_ERROR occurred at 0x0000000000000000

Rootcause:
Get a invalid dte addr when px30_workaround_combo_init, because of iommu
not enable status.
solution:
read a valid dte addr when iommu enable status.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I4b84c650a6e132928a6dc91a26985abd8c273cfe
2023-03-20 19:24:01 +08:00