Commit Graph

1255328 Commits

Author SHA1 Message Date
Jon Lin
b3a247a0ba phy: rockchip: naneng-combphy: Fix swing from 250mV to 650mV for rk3562 pcie
Fixes: 13639746fa ("phy: rockchip: naneng-combphy: Fix swing to 650mv under 100M refclk for rk3562")

Change-Id: If9bf594ec4183d4be62dd1f9edb24ecd30915f78
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-07-07 15:48:36 +08:00
Sugar Zhang
b147d4da8f ASoC: rockchip: pdm: Fix clear on runtime resume
register PDM_SYSCONFIG is marked as volatile, and for regcache
sync policy, it will skip the registers which marked as volatile.

so, we should do it after regcache sync.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic65bc28d14fefc6e6c70e1b2c26468aa0fcd142e
2023-07-07 11:09:28 +08:00
Jon Lin
39b8455a14 mtd: spinand: gigadevice: Sync with upstream
from commit: 5b7261b mtd: spinand: winbond: Add support for Winbond W35N01JW SPI NAND flash

Change-Id: Iabca09af99d7b94150c847653faf0275228b7144
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-07-07 11:03:10 +08:00
Sugar Zhang
8f23d9cb40 ASoC: rockchip: i2s-tdm: Add support for TDM_MULTI_LANES
Example: RK3588

Use I2S2_2CH as Clk-Gen to serve TDM_MULTI_LANES

I2S2_2CH ----> BCLK,I2S_LRCK --------> I2S0_8CH_TX (Slave TRCM-TXONLY)
    |
    |--------> BCLK,TDM_SYNC --------> TDM Device (Slave)

Note:

I2S2_2CH_MCLK: BCLK
I2S2_2CH_SCLK: I2S_LRCK (GPIO2_B7)
I2S2_2CH_LRCK: TDM_SYNC (GPIO2_C0)

DT:

&i2s0_8ch {
       status = "okay";
       assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
       assigned-clock-parents = <&cru MCLK_I2S0_8CH_TX>;
       i2s-lrck-gpio = <&gpio1 RK_PC5 GPIO_ACTIVE_HIGH>;
       tdm-fsync-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
       rockchip,tdm-multi-lanes;
       rockchip,tdm-tx-lanes = <2>; //e.g. TDM16 x 2
       rockchip,tdm-rx-lanes = <2>; //e.g. TDM16 x 2
       rockchip,clk-src = <&i2s2_2ch>;
       pinctrl-names = "default";
       pinctrl-0 = <&i2s0_lrck
                    &i2s0_sclk
                    &i2s0_sdi0
                    &i2s0_sdi1
                    &i2s0_sdo0
                    &i2s0_sdo1>;
};

&i2s2_2ch {
       status = "okay";
       assigned-clocks = <&cru I2S2_2CH_MCLKOUT>;
       assigned-clock-parents = <&cru MCLK_I2S2_2CH>;
       pinctrl-names = "default";
       pinctrl-0 = <&i2s2m0_mclk
                    &i2s2m0_lrck
                    &i2s2m0_sclk>;
};

Usage: TDM16 x 2 Playback

amixer contents

numid=3,iface=MIXER,name='Receive SDIx Select'
  ; type=ENUMERATED,access=rw------,values=1,items=5
  ; Item #0 'Auto'
  ; Item #1 'SDIx1'
  ; Item #2 'SDIx2'
  ; Item #3 'SDIx3'
  ; Item #4 'SDIx4'
  : values=0
numid=2,iface=MIXER,name='Transmit SDOx Select'
  ; type=ENUMERATED,access=rw------,values=1,items=5
  ; Item #0 'Auto'
  ; Item #1 'SDOx1'
  ; Item #2 'SDOx2'
  ; Item #3 'SDOx3'
  ; Item #4 'SDOx4'
  : values=0

/# amixer sset "Transmit SDOx Select" "SDOx2"
Simple mixer control 'Transmit SDOx Select',0
  Capabilities: enum
  Items: 'Auto' 'SDOx1' 'SDOx2' 'SDOx3' 'SDOx4'
  Item0: 'SDOx2'

/# aplay -D hw:0,0 --period-size=1024 --buffer-size=4096 -r 48000 \
   -c 32 -f s32_le /dev/zero

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I6996e05c73a9d68bbeb9562eb6e68e4c99b52d85
2023-07-06 15:19:28 +08:00
Sugar Zhang
fa86218f9f ASoC: rockchip: i2s-tdm: Optimize TRCM-resume for QUIRKS_ALWAYS_ON
On the QUIRKS_ALWAYS_ON path, we bring up the clk path on probe
to achieve the clk always on function.

for this situation, the refcount always true, so, we should save
the stream dma state on pause and then do restore on resume.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I8e45b78a475a468880ef2fb0b358dbdd1169ff08
2023-07-06 10:27:38 +08:00
Sugar Zhang
3324809cd0 ASoC: rockchip: i2s-tdm: Fix register write failed on QUIRKS_ALWAYS_ON
CLK_ALWAYS_ON should be placed after all registers write done,
because this situation will enable XFER bit which will make
some registers(depend on XFER) write failed.

Fixes: 3644caf8de ("ASoC: rockchip: i2s-tdm: Add support for clk always-on")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Iffcfed18d3805ee575df4e8cf267d4ef6a3fa866
2023-07-06 10:26:47 +08:00
Sugar Zhang
bd3108e757 ASoC: rockchip: i2s-tdm: Add support for pinctrl idle state
This patch switch pinctrl to idle state when runtime suspend.

At the moment, it's used for workaround for I2S0/2/3 (PD_AUDIO)
slave IO issue on RK3588 SoCs.

The issue acts like that when PD_AUDIO off, the BCLK/LRCK pin
will pull down the external clk to half-level.

The root cause is that when PD_AUDIO off, the BCLK/LRCK pin
are clamped as drive output low.

OTOH, the ASoC framework set pinctrl state first and then do
runtime PM resume (enable PD). it's reasonable, but for the
current issue, a few half-level cycles leak after resume, so,
we split pinctrl-clk out to control it separately.

  snd_pcm_open

      for_each_rtd_components(rtd, i, component)
      	pinctrl_pm_select_default_state(component->dev);

      ret = snd_soc_pcm_component_pm_runtime_get(rtd, substream);

e.g. pinctrl idle for i2s0

i2s0_gpio: i2s0-gpio {
	rockchip,pins =
		/* i2s0_lrck_gpio */
		<1 RK_PC5 0 &pcfg_pull_none>,
		/* i2s0_sclk_gpio */
		<1 RK_PC3 0 &pcfg_pull_none>;
};

&i2s0_8ch {
	pinctrl-names = "default", "idle", "clk";
	pinctrl-1 = <&i2s0_gpio>;
	pinctrl-2 = <&i2s0_lrck
		     &i2s0_sclk>;
};

cat /sys/kernel/debug/pinctrl/pinctrl-handles

device: fe470000.i2s current state: idle
  state: default
    type: MUX_GROUP controller rockchip-pinctrl group: i2s0-sdi0 (26) function: i2s0 (24)
    type: CONFIGS_PIN controller rockchip-pinctrl pin gpio1-28 (60)config 00000001
    type: MUX_GROUP controller rockchip-pinctrl group: i2s0-sdi1 (27) function: i2s0 (24)
    type: CONFIGS_PIN controller rockchip-pinctrl pin gpio1-27 (59)config 00000001
    type: MUX_GROUP controller rockchip-pinctrl group: i2s0-sdi2 (28) function: i2s0 (24)
    type: CONFIGS_PIN controller rockchip-pinctrl pin gpio1-26 (58)config 00000001
    type: MUX_GROUP controller rockchip-pinctrl group: i2s0-sdi3 (29) function: i2s0 (24)
    type: CONFIGS_PIN controller rockchip-pinctrl pin gpio1-25 (57)config 00000001
    type: MUX_GROUP controller rockchip-pinctrl group: i2s0-sdo0 (30) function: i2s0 (24)
    type: CONFIGS_PIN controller rockchip-pinctrl pin gpio1-23 (55)config 00000001
    type: MUX_GROUP controller rockchip-pinctrl group: i2s0-sdo1 (31) function: i2s0 (24)
    type: CONFIGS_PIN controller rockchip-pinctrl pin gpio1-24 (56)config 00000001
  state: idle
    type: MUX_GROUP controller rockchip-pinctrl group: i2s0-idle (23) function: i2s0 (24)
    type: CONFIGS_PIN controller rockchip-pinctrl pin gpio1-21 (53)config 00000001
    type: CONFIGS_PIN controller rockchip-pinctrl pin gpio1-19 (51)config 00000001
  state: clk
    type: MUX_GROUP controller rockchip-pinctrl group: i2s0-lrck (24) function: i2s0 (24)
    type: CONFIGS_PIN controller rockchip-pinctrl pin gpio1-21 (53)config 00000001
    type: MUX_GROUP controller rockchip-pinctrl group: i2s0-sclk (25) function: i2s0 (24)
    type: CONFIGS_PIN controller rockchip-pinctrl pin gpio1-19 (51)config 00000001

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ibda030dad44830f9f4eeb6448c14d4053a096fc6
2023-07-06 10:15:26 +08:00
Sugar Zhang
21bb44badd ASoC: rockchip: i2s-tdm: Reduce FIFO XRUN warning prompt
Warning once each time FIFO XRUN occurs, and then disable
it, until the next time the stream resume.

Before:
  rockchip_i2s_tdm_isr: 234 callbacks suppressed
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  ...

  cat /proc/interrupts | grep i2s
  21:      514 0 0 0 0 0 0 0 GICv3 213 Level  i2s

After:

  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun
  rockchip-i2s-tdm fe480000.i2s: TX FIFO Underrun

  cat /proc/interrupts | grep i2s
  21:        4 0 0 0 0 0 0 0 GICv3 213 Level  i2s

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ibe3b07d94b31f421fd637296cb137d5ba1071fcc
2023-07-06 10:12:23 +08:00
Sugar Zhang
9ab6a82fd6 ASoC: rockchip: i2s-tdm: Add support for IEC958
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I58243b194cd15b7d57e9b580d6917c2e054a1e67
2023-07-06 10:08:54 +08:00
Sugar Zhang
f905bac260 ASoC: rockchip: i2s-tdm: Fix error path in prepare_enable_mclk
[smatch] sound/soc/rockchip/rockchip_i2s_tdm.c:206 i2s_tdm_prepare_enable_mclk()
warn: 'i2s_tdm->mclk_rx' from clk_prepare_enable not released.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I7af416e1a79c8fc229c5ea42b09785282d71bf10
2023-07-06 08:47:41 +08:00
Tao Huang
d8c4254b9a arm64: rockchip_linux_defconfig: Disable A510/NVIDIA erratum
-CONFIG_ARM64_ERRATUM_2077057
-CONFIG_ARM64_ERRATUM_2658417
-CONFIG_ARM64_ERRATUM_2441009
-CONFIG_NVIDIA_CARMEL_CNP_ERRATUM

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2cddde1dac4deaabdab7c51b90bd7d624c7b8edc
2023-07-05 10:45:34 +08:00
Yandong Lin
2349ea26cb iommu/rockchip: support av1d iommu
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ic7cbb95b83cef361ea4d62c969d5585318ec0dac
2023-07-04 20:02:12 +08:00
Simon Xue
4b02081506 iommu/rockchip: refactor iommu to support 3rd_party iommu
Take av1d-iommu as example:

make av1d-iommu as rockchip-iommu sub-driver, all av1d-iommu ops
transform from rockchip-iommu ops.

av1d-iommu should implement struct third_iommu_ops_wrap for transform

Change-Id: I98f059aa890adaecbc5c35763db2efba88b09055
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2023-07-04 20:01:53 +08:00
Yandong Lin
65768b30e3 arm64: dts: rockchip: rk3588 boards: enable av1d node
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ifb1db3812402d13671ec57d4c154bfab801d08eb
2023-07-04 18:14:56 +08:00
Yandong Lin
18f2c0f6af arm64: dts: rockchip: rk3588s: fix av1d_mmu compatible
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I2dba0f5fb3748837a817a0c5dfc6085802d9927e
2023-07-04 18:14:10 +08:00
Yandong Lin
0e31084baa video: rockchip: mpp: av1d: adapt to kernel 6.1
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I395b0d3b18b687ca048983635dc18cf1968a25bb
2023-07-04 18:05:14 +08:00
Yandong Lin
81cd0e2548 video: rockchip: mpp: import DMA_BUF module namespace
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I9cc4d2ca46f5ea96bbf9e4a324fbdbc6fa379b2c
2023-07-04 15:17:15 +08:00
Alex Zhao
8ab667299a net: wireless: update bcmdhd driver to 101.10.591.33.20
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I3131de541a9c86bce209035a138055a67dec8604
2023-07-04 09:54:34 +08:00
Shawn Lin
02e11db293 arm64: dts: rockchip: rk3562: Fix PCIe node
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I6deb77ddd8ce5593cd6daf636ac85d2274214fb9
2023-06-29 11:24:19 +08:00
Shawn Lin
7c71be7bbb arm64: dts: rockchip: rk3528: Fix PCIe node
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I0056c9260f30c30120e34a4d8d74d71950456a6d
2023-06-29 11:24:09 +08:00
Shawn Lin
5c7c022717 arm64: dts: rockchip: rk3588: Fix PCIe node
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Iac3f0af7d8911cf188cc29788b4777a446536362
2023-06-29 11:23:56 +08:00
Shawn Lin
7439ad8700 arm64: dts: rockchip: rk3588s: Fix PCIe node
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Iac3f0af7d8911cf188cc29788b4777a446536361
2023-06-29 11:23:46 +08:00
Tao Huang
aea0f350c4 Merge commit '5dfd3c6a1be9482099ea2a70479e3e50ae92b698'
* commit '5dfd3c6a1be9482099ea2a70479e3e50ae92b698':
  rfkill: bt: fix unbalanced wake_host_io
  drm/rockchip: rgb: add support for rgb666_3x6 and rgb565_2x8 modes
  drm/rockchip: vop: add support for rgb666_3x6 and rgb565_2x8 modes
  media: uapi: add MEDIA_BUS_FMT_RGB666_3X6 media bus format
  driver: rknpu: Compatible with kernel 6.1 compilation, version: 0.8.9
  misc: Add rk628 misc drivers
  drm/rockchip: vop3: update acm info when it change

Change-Id: I8ab22d964e62f265715d33a73d76d1144faeddd5
2023-06-29 10:05:56 +08:00
Yao Xiao
5dfd3c6a1b rfkill: bt: fix unbalanced wake_host_io
Change-Id: Ie486db27454a78f145d94b2c71b88e1ce3ab605b
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
2023-06-28 20:10:49 +08:00
Tao Huang
f87e68d7c4 ASoC: codecs: rk730: Remove now redundant non_legacy_dai_naming flag
The ASoC core has now been changed to default to the non-legacy DAI
naming, as such drivers using the new scheme no longer need to specify
the non_legacy_dai_naming flag.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4395bb04b0a959d1372c0a10359b83c75d96efb2
2023-06-28 17:15:36 +08:00
Tao Huang
b44bb22ace ASoC: rockchip: dlp: Fix compilation errors on kernel 6.1
sound/soc/rockchip/rockchip_dlp.c:434:16: error: 'struct snd_soc_pcm_runtime' has no member named 'num_cpus'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaa54add4e0779ba4ddd4f3225799250cde089f1c
2023-06-28 17:11:42 +08:00
Damon Ding
7bdc7c13c5 drm/rockchip: rgb: add support for rgb666_3x6 and rgb565_2x8 modes
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I9ae49745e0e8eca4672f3600d8a770279714fe98
2023-06-28 16:45:31 +08:00
Damon Ding
e9a74303e1 drm/rockchip: vop: add support for rgb666_3x6 and rgb565_2x8 modes
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I6a6f3610c9e9e7c8c7869796c0de318af19666da
2023-06-28 16:45:22 +08:00
Damon Ding
e59bb483a2 media: uapi: add MEDIA_BUS_FMT_RGB666_3X6 media bus format
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Idee22ed5875a58e22c89f7013c7c790a072a2e1a
2023-06-28 16:45:14 +08:00
Felix Zeng
89a2d47db7 driver: rknpu: Compatible with kernel 6.1 compilation, version: 0.8.9
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: I88ca7a85e3ea5e2a410f48a5789f17b57ffb267e
2023-06-28 16:36:49 +08:00
Algea Cao
484d7b1bd6 misc: Add rk628 misc drivers
Customers may use rk628 drivers on different platforms.
Hence we need drivers that do not rely on the FB/DRM
display framework.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Iaab679e4a72d0fb0e5a76bee89b8e1bdac60f4a7
2023-06-28 15:43:53 +08:00
Zhang Yubing
e847ed9deb drm/rockchip: vop3: update acm info when it change
When update acm info, it need disable acm function in the first frame,
then update the acm info and enable acm function in the second frame.
If the acm info is not changed between 2 frames, it don't need update.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Iaedead2fad5951844ca07b037c3588071499e50a
2023-06-28 15:36:09 +08:00
Tao Huang
3c0ee70ad9 input: sensors: accel: mc3230: Fix compilation errors on kernel 6.1
drivers/input/sensors/accel/mc3230.c:126:8: error: unknown type name 'mm_segment_t'
drivers/input/sensors/accel/mc3230.c:222:17: error: implicit declaration of function 'get_fs'; did you mean 'sget_fc'? [-Werror=implicit-function-declaration]
drivers/input/sensors/accel/mc3230.c:223:9: error: implicit declaration of function 'set_fs'; did you mean 'sget_fc'? [-Werror=implicit-function-declaration]
drivers/input/sensors/accel/mc3230.c:223:16: error: 'KERNEL_DS' undeclared (first use in this function); did you mean 'KERNFS_NS'?

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iea2ba6178309fd4654030325ef0d8810e9fa4972
2023-06-28 14:44:01 +08:00
Tao Huang
04c8d294f3 input: sensors: accel: da223: Fix compilation errors on kernel 6.1
drivers/input/sensors/accel/da223_cust.c:286:142: error: 'printk' undeclared here (not in a function); did you mean '_printk'?

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I180c5fa59c92eaf956c3819aefe70ae115e4ee4c
2023-06-28 14:20:32 +08:00
Tao Huang
fcde4be86b iio: light: vl6180: make use of devm_iio_kfifo_buffer_setup() helper
According to commit 17395ce299 ("iio: make use of devm_iio_kfifo_buffer_setup() helper")
and commit f67c6c73cb ("iio: core: Simplify the registration of kfifo buffers").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3b979d16941d5fc326b319c66b56911ca3de4422
2023-06-28 11:54:31 +08:00
Tao Huang
ac41697d6a iio: light: ucs12cm0: make use of devm_iio_kfifo_buffer_setup() helper
According to commit 17395ce299 ("iio: make use of devm_iio_kfifo_buffer_setup() helper")
and commit f67c6c73cb ("iio: core: Simplify the registration of kfifo buffers").

Change-Id: I841701d8518ed1b07838a57614477afc9dd5ab04
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-06-28 11:49:00 +08:00
Tao Huang
c51ca38cc8 iio: imu: lsm6dsr: make use of devm_iio_kfifo_buffer_setup() helper
According to commit 17395ce299 ("iio: make use of devm_iio_kfifo_buffer_setup() helper")
and commit f67c6c73cb ("iio: core: Simplify the registration of kfifo buffers").

Also fixes the following warning:
drivers/iio/imu/st_lsm6dsr/st_lsm6dsr_buffer.c:992:19: error: implicit declaration of function 'of_property_read_bool' [-Werror=implicit-function-declaration]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia8229b4fe1d22c6455ea8b1eeb410a925f71e785
2023-06-28 11:43:38 +08:00
Tao Huang
756a7e4cb2 iio: imu: lsm6dsr: Fix fall-through warning for Clang
drivers/iio/imu/st_lsm6dsr/st_lsm6dsr_core.c:1129:4: error: unannotated fall-through between switch labels [-Werror,-Wimplicit-fallthrough]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaa46d98150f27e1ea410e52a580d636de23b5c28
2023-06-28 11:29:34 +08:00
Tao Huang
1ce4377b68 Merge commit 'ce5da098c4cd46deb075845111383d9fd34afa7a'
* commit 'ce5da098c4cd46deb075845111383d9fd34afa7a': (27 commits)
  drm/rockchip: vop2: update rk3568 max height limit
  drm/rockchip: lvds: update MEDIA_BUS_FMT_RGB666_1X7X3_SPWG description
  mmc: sdhci-of-dwcmshc: support HS400ES for RK3568
  Revert "arm64: rockchip_defconfig: enable CONFIG_ROCKCHIP_DRM_CUBIC_LUT"
  Revert "FROMLIST: drm: Extend color correction to support 3D-CLU"
  drm/rockchip: vop2: move cubic lut to rockchip drm driver
  media: i2c: add ar0822 driver
  media: i2c: max96722: version 1.00.00
  video: rockchip: rga3: add mm_flag 'RGA_MEM_FORCE_FLUSH_CACHE'
  arm64: dts: rockchip: rk3528 boards: btsco enable 16k pcm support
  arm64: dts: rockchip: rk356x boards: btsco enable 16k pcm support
  arm64: dts: rockchip: rk3588 boards: btsco enable 16k pcm support
  arm64: dts: rockchip: rk3562-evb: enable logo display for rgb board
  nvme-pci: add NVME_QUIRK_LIMIT_IOQD32 to fix Phison E15 NVMe controller
  video: rockchip: mpp: fix crash issue when no iommu
  soc: rockchip: mtd_vendor_storage: force config spi nor erase size to 64KB
  PCI: rockchip: dw_ep: Delaying the link training after hot reset
  video: rockchip: rga3: adapt to kernel-6.1/5.10/4.19
  ARM: dts: rockchip: rmii_phy use increment 0 for rv1106-evb
  arm64: dts: rockchip: rk3588: Add opp-info support
  ...

Conflicts:
	drivers/gpu/drm/drm_atomic_helper.c
	drivers/media/i2c/Kconfig
	drivers/media/i2c/Makefile
	drivers/media/i2c/max96722.c
	drivers/nvme/host/pci.c
	drivers/pci/controller/dwc/pcie-dw-rockchip.c

Ignore:
	commit 49520417ba ("PCIe: dw: rockchip: Disabled BAR0 and BAR1").

Change-Id: I41d947eda90f8b547ef2af30c3b093f556521803
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-06-28 10:19:01 +08:00
Sandy Huang
ce5da098c4 drm/rockchip: vop2: update rk3568 max height limit
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ic323e783452e1d97a0b4df955ad7d11ead8da17a
2023-06-27 20:40:08 +08:00
Sandy Huang
96a4ade24f drm/rockchip: lvds: update MEDIA_BUS_FMT_RGB666_1X7X3_SPWG description
Refer to the following information:

https://www.kernel.org/doc/Documentation/devicetree/bindings/display/panel/panel-lvds.txt

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I9ea389605940911d576e5ed0c0be20f892f41390
2023-06-27 20:40:08 +08:00
Yifeng Zhao
4fa16359d6 mmc: sdhci-of-dwcmshc: support HS400ES for RK3568
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I0491bcb3def6e1f5975a94b8e8921027a9d6e271
2023-06-27 20:37:32 +08:00
Sandy Huang
79f0bdb4fc Revert "arm64: rockchip_defconfig: enable CONFIG_ROCKCHIP_DRM_CUBIC_LUT"
This reverts commit d7c77171a7.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ifff2f6bccc17c78fd6d449613da8b9c352293c70
2023-06-27 20:31:20 +08:00
Sandy Huang
7f9e600004 Revert "FROMLIST: drm: Extend color correction to support 3D-CLU"
This reverts commit 4b81d4e560.

Change-Id: I501bc346b574df3143a505abb509e331a5afc7b6
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2023-06-27 20:30:33 +08:00
Sandy Huang
3325b43a1a drm/rockchip: vop2: move cubic lut to rockchip drm driver
move cubic lut support from drm croe to rockchip drm driver and remove
depend on NO_GKI.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I8fb6ba4fc927bf9f7e1b38c180986b1e25393347
2023-06-27 20:30:23 +08:00
Yingsong Ye
be4fe51d5b media: i2c: add ar0822 driver
Change-Id: I8a860b248528cb6ad1e263ea5e10b89efd503bf9
Signed-off-by: Yingsong Ye <alexhazel.ye@rock-chips.com>
2023-06-27 20:08:26 +08:00
Cai Wenzhong
b114426b90 media: i2c: max96722: version 1.00.00
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I59fafb4aa4bfa06b989b9d13ae9b88aa25dc65df
2023-06-27 20:04:44 +08:00
Yu Qiaowei
1d2f80aa5e video: rockchip: rga3: add mm_flag 'RGA_MEM_FORCE_FLUSH_CACHE'
Use the RGA_MEM_FORCE_FLUSH_CACHE flag to force the flush cache for
the current buffer, not by judging the memory type.

Update driver version to 1.2.27

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ife6d26faf59c1e33a2cddc389ded7c93b63a22a5
2023-06-27 20:01:30 +08:00
Zou Dengming
ac3b62bb63 arm64: dts: rockchip: rk3528 boards: btsco enable 16k pcm support
In android 9,10,11,12,13, we have already support 16k wbs in
hardware level code. So, enable 16k support in kernel dts default.

Info:
In future, to support BTSCO 16k, it only need to change the
default setting of bluedroid's "DISABLE_WBS" setting.

Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
Change-Id: Ide2435eb0fb9e8e0ffb705d8ba4b43af95dd37ff
2023-06-27 19:59:39 +08:00
Zou Dengming
2093b6351a arm64: dts: rockchip: rk356x boards: btsco enable 16k pcm support
In android 9,10,11,12,13, we have already support 16k wbs in
hardware level code. So, enable 16k support in kernel dts default.

Info:
In future, to support BTSCO 16k, it only need to change the
default setting of bluedroid's "DISABLE_WBS" setting.

Change-Id: I382bfdb47a6e13c54c53e8e666aecbad6e135f41
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-06-27 19:59:18 +08:00