Commit Graph

1255138 Commits

Author SHA1 Message Date
Tao Huang
ef7d7abc40 soc: rockchip: ramdisk: Fix for kernel 6.1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If6971efee17ff826d3dd83b1cdda31f6b6a7de11
2023-06-09 11:43:36 +08:00
Tao Huang
ebc9475ec9 fsdax: depend on ZONE_DEVICE || FS_DAX_LIMITED || ROCKCHIP_RAMDISK
So we can use FS_DAX on ROCKCHIP_RAMDISK.

Fixes: f74515986e ("fsdax: depend on ZONE_DEVICE || FS_DAX_LIMITED")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I80b6b36c390fb36a98fa4bd73f7c42efad23788a
2023-06-09 11:43:36 +08:00
Tao Huang
1621bd6b24 Merge commit 'e0716c0140025007b43b1a07dc128c4d4ca5f367'
* commit 'e0716c0140025007b43b1a07dc128c4d4ca5f367': (60 commits)
  media: i2c: lt7911uxc: Fix print format string
  ARM: configs: rockchip: add uvc to rv1106-rndis.config
  media: rockchip: isp: fix isp32 and lite buf output err due to mi on/off
  dt-bindings: suspend: rk3528: add sleep pin defines
  soc: rockchip: pm_config: support sleep-pin-config
  arm64: dts: rockchip: add rk3588-evb7-v11 board
  arm64: dts: rockchip: rk3588: Fixed the init frequency
  Mali: bifrost: disable tiler heap reclaiming temporally
  arm64: dts: rockchip: rk3528-evb: prepare bt sco settings
  arm64: dts: rockchip: rk3528: Split I2Sx pinctrl
  drm/rockchip: dw-dp: notify audio when enable/disable dptx
  media: i2c: lt6911uxe/c: set default timing
  media: i2c: lt7911uxc: update driver to V0.0X01.0X07
  media: i2c: lt6911uxe: add interlaced support
  arm64: configs: update camera sensors for rockchip_linux_defconfig
  arm64: dts: rockchip: add camera sensor configuration for rk3588s-evb1-lp4x-v10-linux.dts
  phy: rockchip: naneng-combphy: Fix Rx squelch for RK3528 U3
  phy: rockchip: naneng-combphy: Fix Rx squelch for RK3562 U3
  phy: rockchip: naneng-combphy: Fix Rx squelch for RK3568 U3
  mmc: dw_mmc: Add normal and idle pinctrl control
  ...

Conflicts:
	arch/arm64/configs/rockchip_linux_defconfig
	drivers/gpu/drm/drm_edid.c
	drivers/media/i2c/lt7911uxc.c
	drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
	drivers/pwm/pwm-rockchip.c

Ignore:
commit 1255f11b25 ("clk: rockchip: clk-out: Add CLK_IGNORE_UNUSED flag").
commit e2a24104ee ("drm/edid: add HF-EEODB support to EDID read and allocation").

Change-Id: I2e320837a80b34092b7964072d4dbcaa4ad79335
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-06-08 19:29:28 +08:00
Tao Huang
e0716c0140 media: i2c: lt7911uxc: Fix print format string
u64 format should be %llu.

Fixes: db473bd423 ("media: i2c: lt7911uxc: update driver to V0.0X01.0X07")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iadd65d15d690222da7561a9ea67bd70082d79b45
2023-06-08 19:04:04 +08:00
Weiwen Chen
d600ae58b7 ARM: configs: rockchip: add uvc to rv1106-rndis.config
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I83de76ba4e7a0827f0bcfc4840db1c1b4adcacc7
2023-06-08 16:32:47 +08:00
Cai YiWei
5cad0068f7 media: rockchip: isp: fix isp32 and lite buf output err due to mi on/off
Change-Id: I7d78a12861c075e99f3005af5b8ffab2958a10b2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-06-08 16:32:00 +08:00
Tao Huang
d4cdea389f media: rockchip: isp: fix rkisp_tb_helper build error for kernel 6.1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2a87fe29e9d4c6ad207b86c7d6e4ae59b6a2898c
2023-06-08 16:17:06 +08:00
XiaoDong Huang
9004c277ca dt-bindings: suspend: rk3528: add sleep pin defines
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I6bffbb885c5d09bbf0c92db32112eac246f2bc56
2023-06-08 14:27:49 +08:00
XiaoDong Huang
68a0cca2c3 soc: rockchip: pm_config: support sleep-pin-config
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I93f52766bfa1ce0cf97d826dc1cad5af0134a4c1
2023-06-08 14:27:49 +08:00
Wu Liangqing
1e135f352e arm64: dts: rockchip: add rk3588-evb7-v11 board
Change-Id: If9788078dd3a428e7be8e102dff274a5aecd10a6
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2023-06-08 14:19:31 +08:00
Elaine Zhang
fd4c1a5ee2 arm64: dts: rockchip: rk3588: Fixed the init frequency
Make sure that the init frequency is within the design range

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I1aea3638e0aa70e425410e71060ce89fa96e1869
2023-06-08 11:20:12 +08:00
Zhen Chen
eaf544c6d9 Mali: bifrost: disable tiler heap reclaiming temporally
Comes from mail "230423: 15:04: ARM support: Yao: ".

This patch and fw_230426 can resolve the occurrence
of "Unhandled Page fault" and CS_FAULTs exceptions
in the stress test "Dvfs+Gl_retrace+Rockx+emmc".

In another mail, Yao said "before any further suggestion or conclusion from RD,
you could temporally WA the issue by disable tiler heap reclaim".

Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: If06aa8e207b05f1a277aae9a86d1ff76b9a9f93b
2023-06-08 11:18:42 +08:00
Zou Dengming
c5cdbfc2eb arm64: dts: rockchip: rk3528-evb: prepare bt sco settings
we don't directly add bt-sco cards because it may take some
i2s/pcm, which may use dma, but dmas may limit.
so we just prepare this settings, then if any one who want to
support bt-sco, he/she can just add dts in board-level dtsi.

For example diff in "rk3528-evb1-ddr4-v10.dtsi":

+&bt_sco {
+       status = "okay";
+};
+
+&bt_sound {
+       status = "okay";
+};
+
+&sai0{
+       status = "okay";
+};

The default pcm/i2s setting is:
Format: PCM, dsp_a, MSB first, short sync, rising edge and 1 bclk.
rockchip soc: master; Bt controller: slave

Change-Id: I64e76c2ae4b8449e2ee345587e080b3a70521ed9
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-06-07 14:14:25 +08:00
Steven Liu
dcc194b4d4 arm64: dts: rockchip: rk3528: Split I2Sx pinctrl
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ibfc99cfbd5ef324f549ae356059b7fc7ab45fe96
2023-06-07 13:13:25 +08:00
Zhang Yubing
1d030d294e drm/rockchip: dw-dp: notify audio when enable/disable dptx
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I61e07cce16f8e0a30e6a67ff508be03a5b249563
2023-06-06 19:47:14 +08:00
Jianwei Fan
6676316bd0 media: i2c: lt6911uxe/c: set default timing
Change-Id: Id22160e280ef23d93e9ad8cbe5ab972eb6f98c11
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-06-06 19:45:48 +08:00
Jianwei Fan
db473bd423 media: i2c: lt7911uxc: update driver to V0.0X01.0X07
1.fix driver probe sequence.
2.set default timing
3.fix dcphy params
4.fix hotplug event report

Change-Id: Ibd97f1498169798ff2a73e23330fdcb51b0a27ef
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-06-06 11:13:38 +00:00
Cai YiWei
fa133f475e media: rockchip: isp: fix build error for kernel 6.1
Change-Id: I5f1e2b9ef7f4fdca51752d1b1598db630faaf5e4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-06-06 19:09:22 +08:00
Cai YiWei
814cb480e7 media: rockchip: ispp: fix build error for kernel 6.1
Change-Id: I967380bd5eefb217e2e3554e2ed8740b0310ac4f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-06-06 19:06:44 +08:00
Cai YiWei
c70a37278b media: rockchip: isp1: fix build error for kernel 6.1
Change-Id: I1f373d59ebb8eb736525df2c38383c201f784fde
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-06-06 18:51:02 +08:00
Jianwei Fan
db77afeb1d media: i2c: lt6911uxe: add interlaced support
Change-Id: I09156961998940fa78c87e591c3d89982d91868d
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2023-06-06 17:37:36 +08:00
Caesar Wang
6e858e1a97 arm64: configs: update camera sensors for rockchip_linux_defconfig
1/ Enable CONFIG_VIDEO_LT6911UXE for rk3588 evb1 extboard
2/ Enable CONFIG_VIDEO_OV13855 for rk3588s-tablet
3/ Enable CONFIG_VIDEO_OV50C40 rk3588s tablet & evb1.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I78e7caeb11b7f1db4a7ec74aaba681e895bcc843
2023-06-06 17:32:33 +08:00
Finley Xiao
3b387ddb7d arm64: dts: rockchip: rk3588s: Add trips for some thermal nodes
This patch fixes the below error.

thermal_sys: Failed to find 'trips' node
thermal_sys: Failed to find trip points for tsadc id=1
rockchip-thermal fec00000.tsadc: failed to register sensor 1: -22
rockchip-thermal fec00000.tsadc: failed to register sensor[1] : error = -22
rockchip-thermal: probe of fec00000.tsadc failed with error -22

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I41668a94e5db1a701021df63a6b8fc7f9f267355
2023-06-06 15:16:16 +08:00
Zefa Chen
cf236058d4 phy: rockchip: csi2-dphy: do not to check port when parse fwnode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ifc1317b7a2ee163bd40d479122549fc863d6f19c
2023-06-06 14:39:21 +08:00
Zefa Chen
ace9adc376 media: rockchip: vicap: fixes build error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibe9d903c628d81ef75cf16ad564bc10764700627
2023-06-06 14:25:32 +08:00
Zefa Chen
0b42c92f71 media: i2c: fixes sensor driver for kernel-6.1
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib860c864c8bbe6a2a368a109ed8ff831bd6387c1
2023-06-06 11:40:31 +08:00
Caesar Wang
ff60528776 arm64: dts: rockchip: add camera sensor configuration for rk3588s-evb1-lp4x-v10-linux.dts
Add lt7911d type-c/DP to MIPI CSI-2 bridge dts configuration as an example

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I3ccd33f0f8ecf991c3c0ea4e6d6574009dc0e04c
2023-06-06 10:58:04 +08:00
William Wu
27312ce9d8 phy: rockchip: naneng-combphy: Fix Rx squelch for RK3528 U3
This patch adjust the RK3528 U3 Rx squelch input filler
bandwidth to 3'b110 which is used for rx_lfps, reduce the
bandwidth to avoid filtering valid superspeed data.

With this patch, it can fix the issue that Kingston U3 Disk
(idVendor=0951, idProduct=1666, bcdDevice= 1.10) read error
on RK3528 platforms.

Change-Id: Ifa4eac24bbdebe020db356ba45dae146f4df22f1
Signed-off-by: William Wu <william.wu@rock-chips.com>
2023-06-06 09:30:14 +08:00
William Wu
ae3a28752e phy: rockchip: naneng-combphy: Fix Rx squelch for RK3562 U3
This patch adjust the RK3562 U3 Rx squelch input filler
bandwidth to 3'b110 which is used for rx_lfps, reduce the
bandwidth to avoid filtering valid superspeed data.

With this patch, it can fix the issue that Kingston U3 Disk
(idVendor=0951, idProduct=1666, bcdDevice= 1.10) read error
on RK3562 platforms.

Change-Id: Idb667d159f9dba6b1de0a9ec04af9dae2d065927
Signed-off-by: William Wu <william.wu@rock-chips.com>
2023-06-06 09:30:14 +08:00
William Wu
4bbb16bf87 phy: rockchip: naneng-combphy: Fix Rx squelch for RK3568 U3
This patch adjust the RK3568 U3 Rx squelch input filler
bandwidth to 3'b110 which is used for rx_lfps, reduce the
bandwidth to avoid filtering valid superspeed data.

With this patch, it can fix the issue that Kingston U3 Disk
(idVendor=0951, idProduct=1666, bcdDevice= 1.10) read error
on RK3568 platforms.

Change-Id: I27410c5702862df2d8829a2ca3c2c1d9f57885be
Signed-off-by: William Wu <william.wu@rock-chips.com>
2023-06-06 09:30:14 +08:00
Shawn Lin
60c9e5240f mmc: dw_mmc: Add normal and idle pinctrl control
normal pinctrl is used for sd working mode. idle pinctrl is
used when the card is added or removed, so pull down the
IO to avoid power leak which makes the card unable to work.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I8780b9de735b86918b4d5ba857711e56de740ecf
2023-06-06 09:29:35 +08:00
Sisyphean Zhou
4fa6921109 crypto: rockchip: v2: Fix pointer judgment errors
Change-Id: If13ef9030e42dc88feba351575dd0caa4ea4b66a
Signed-off-by: Sisyphean Zhou <sisyphean.zhou@rock-chips.com>
2023-06-06 09:18:18 +08:00
Qiqi Zhang
c4fc0a5153 input: rockchip_pwm_remotectl: workaround rk3528 IR code reading issue
Change-Id: Ic1cf95c7347324fd5b87e97b8084b7fb2a3d6708
Signed-off-by: Qiqi Zhang <eddy.zhang@rock-chips.com>
2023-06-05 16:54:45 +08:00
Zefa Chen
3852e749f0 media: rockchip: vicap change compact mode by align of width
and it only control with unit and online mode

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibdf6b6969dacdb0f418066594b9c0520d0d9a7fb
2023-06-05 16:54:03 +08:00
Tony Zheng
972d711bd4 arm64: dts: rockchip: rk3308b-amp: Increase the size of AMP reserved memory to 18MB
Signed-off-by: Tony Zheng <tony.zheng@rock-chips.com>
Change-Id: I81a54a11a4b33c3539c760ffc054115e15854dbf
2023-06-05 16:09:46 +08:00
Sandy Huang
82a56746d9 Revert "drm: Not mark crtc state as connectors_changed when a writeback connector attatch to a crtc"
This reverts commit ae488c03ab.

Use the following commit instead:

22fe2c3d386e ("drm/rockchip: vop2: No need for a full modested when the
only writeback connector changed")

Change-Id: If8669d28ebc6c06331beaca588e9842920894a4c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2023-06-05 09:46:34 +08:00
Sandy Huang
c7e2a3387e drm/rockchip: vop2: No need for a full modested when the only writeback connector changed
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I2c1f9e20777de3cb581b4c6678ff4f268cd97522
2023-06-05 09:46:27 +08:00
Algea Cao
e2a24104ee drm/edid: add HF-EEODB support to EDID read and allocation
HDMI 2.1 section 10.3.6 defines an HDMI Forum EDID Extension Override
Data Block, which may contain a different extension count than the base
block claims. Add support for reading more EDID data if available.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Id2c7bd846330ae9ec9547db32e151bbf387e5734
2023-06-05 09:44:54 +08:00
Tao Huang
ccfdb826e5 net: wireless: rockchip_wlan: remove unused drivers
Move to external driver repository.

Change-Id: Iffef1967344b10749f6afa7b8b3948cf93cd0ec4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-06-02 20:02:04 +08:00
Sugar Zhang
1255f11b25 clk: rockchip: clk-out: Add CLK_IGNORE_UNUSED flag
It's used for compatible for old style mclk reference
which do not use the "mclkout_x".

The clk framework will disable all unused clk after
system boot done. in this situation, it is failed to
output mclk with old style DT, because "mclkout_x"
was disabled by framework.

We add CLK_IGNORE_UNUSED flag to clk-out to allow old
style usage still work well.

Suggest to drop this flag for totally new SDK or SoCs
in the future. at the moment, we still need this flag.

Fixes: b3cfac5e37 ("clk: rockchip: Add support for clk input / output switch")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9d0a6b04637d055bc8beb0a03a630804108d4b28
2023-06-02 16:52:26 +08:00
Liang Chen
bf5cd86041 cpufreq: interactive: fix compile error kernel 6.1
drivers/cpufreq/cpufreq_interactive.c:1050:3: error: field designator
'default_attrs' does not refer to any field in type 'struct kobj_type'
        .default_attrs = interactive_attributes,
         ^
1 error generated.

Change-Id: I3d9ccc23a30f5be8bd10fd846f60c3611fb62a6f
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-06-02 16:24:32 +08:00
Weiwen Chen
840f3f259f ARM: configs: add rv1106-nand.config
Change-Id: Ibdc0c656f9a371c90ebf68b35d7274badfc9ba41
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
2023-06-02 15:09:05 +08:00
Yu Qiaowei
ee55fc9efa video: rockchip: rga3: fix compile errors on kernel-6.1
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I3b0de1f1da992975c13f99de7574ff0cd0865e25
2023-06-02 10:58:56 +08:00
Cai Wenzhong
0eee997bed media: i2c: max96712: add rk3588 dcphy param get and set ioctl cmd.
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: Ie548dbecfd049b70a19ef1232530bbcc238c75b4
2023-06-02 10:49:49 +08:00
Wangqiang Guo
3f2bd70899 media: rockchip: hdmirx: notify the bound cpu to bl31.
Change-Id: I4354213eb23c734626a7b51ee90feb31d6a66c3e
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
2023-06-02 10:48:51 +08:00
Xing Zheng
760cdbbc19 ASoC: es8323: fix 32kHz coeff configurations
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I2f74a42dd133c40e90b29b872f41d1d501913d8e
2023-06-02 10:33:46 +08:00
Zefa Chen
a41b37cce2 phy: rockchip: csi2-dphy: fixes build error for kernel 6.1
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I12808b5d617789d87fe4e528d8335fdb5ac5b4be
2023-06-01 19:38:00 +08:00
Zefa Chen
983b411763 phy: rockchip: mipi-rx: fixes build error for kernel 6.1
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia4fe55b20738c5be310d73edf7716615da849615
2023-06-01 19:34:10 +08:00
Yu Qiaowei
086a82237c video: rockchip: rga3: fix compile errors on kernel-6.1
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I3b0de1f1da992975c13f99de7574ff0cd0865e25
2023-06-01 19:33:27 +08:00
Tao Huang
d664f49dd0 arm64: rockchip_linux_defconfig: Use DEBUG_INFO_REDUCED
We've had DEBUG_INFO enabled for arm64 defconfigs since the initial
commit.  This is probably not that frequently used but substantially
inflates the size of the build tree and amount of I/O needed during the
build.  This was causing issues with storage usage in some automated CI
environments which don't expect defconfigs to be quite this big, and
generally increases the resource consumption for both them and people
doing local builds.  The main use case for the debug info is decoding
things with scripts/faddr2line but that doesn't need the full
DEBUG_INFO, DEBUG_INFO_REDUCED is enough for it, so enable that by
default.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaed05d8e472d331692e6a58b41edd81d600cf529
2023-06-01 19:13:49 +08:00