* commit '334c7192e6a968d1d6272fec5c956ae35a02a3db':
drm/rockchip: drv: display logo when specify force output mode
arm64: dts: rockchip: rk3588-vehicle-maxim-cameras-s66.dtsi: camera module and lens name using default
arm64: dts: rockchip: rk3588-vehicle-evb-maxim-max9671(/2)2-d(c)phy0(/3).dtsi: camera module and lens name using default
arm64: dts: rockchip: rk3588-vehicle-evb: move port dts to bridge node for evb20
Change-Id: I13e8ae92a8f8f9143e2ac5c0cc86b07770354a8d
The mx35lf1ge4ab_get_eccsr() function uses an SPI DMA operation to
read the eccsr, hence the buffer should not be on stack. Since commit
380583227c ("spi: spi-mem: Add extra sanity checks on the op param")
the kernel emmits a warning and blocks such operations.
Use the scratch buffer to get eccsr instead of trying to directly read
into a stack-allocated variable.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: Dhruva Gole <d-gole@ti.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/Y8i85zM0u4XdM46z@makrotopia.org
(cherry picked from commit ebed787a0b)
Change-Id: Ifa939753c56926c07bd2bc054d81985093c078d4
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Merge made by the 'ours' strategy.
* commit '0d8cce351f927bad0e649c439c888821e72524a5':
ASoC: rockchip: i2s-tdm: Fix stuck on probe
arm64: dts: rockchip: rk3308: Assign 'i2s-lrck-gpio' for SOF
arm64: dts: rockchip: rk3568: Assign 'i2s-lrck-gpio' for SOF
arm64: dts: rockchip: rk3588: Assign 'i2s-lrck-gpio' for SOF
ASoC: rockchip: i2s-tdm: Fix channels order for TDM_ONE_FRAME
ASoC: rockchip: i2s-tdm: Use GPIOD_ASIS for TDM_MULTI_LANES
ASoC: rockchip: i2s-tdm: Fix warning
ASoC: rockchip: i2s-tdm: Handle HCLK with runtime PM
ASoC: rockchip: i2s-tdm: Simplify clk sync on TRCM mode
ASoC: rockchip: i2s-tdm: Fix multi-channels order for TRCM
ASoC: rockchip: Add dmaengine for TRCM mode
Change-Id: I111f0a538e8e94c4d5e0ecb419fa7bf6e27da9e3
This patch assign the LRCK pin for TDM_ONE_FRAME on Slave mode.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0f0e1a1c778e1e42a5bb5471148358815f6d7b2a
This patch assign the LRCK pin for TDM_ONE_FRAME on Slave mode.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I2ef950170d6646f3d04115662099918942c3cf9d
This patch assign the LRCK pin for TDM_ONE_FRAME on Slave mode.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I28bd554d64f9c63073d2c7f67b9e101c63266c8f
This patch fix multi-channels order for TDM_ONE_FRAME on SLAVE
mode.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ib6543cf0740516d5df1570245abf07fcce9082c3
Situation for 'i2s-lrck':
Should use flag GPIOD_ASIS not to reclaim LRCK pin as GPIO function,
because we use the same PIN and just read EXT_PORT value which show
the pin status.
Situation for 'tdm-fsync':
A. when the pin is a generic gpio as the ref signal pin which is drived from
external. should use flag GPIOD_IN to reclaim as GPIO_IN function.
B. when the pin is the same pin from the 'clk-src' on the same SoC, we can
use the 'clk-src' fsync out signal as the 'tdm-fsync' to query status.
in this case, should use flag GPIOD_ASIS not to reclaim it as GPIO.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I529d982a7e49cb90c02b7670a58759607f4e4f32
This patch fix resources from of_iomap() not released.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I46a7f4996bc751ade34071727a350137a313b446
There are clk sync issue on TRCM mode for RK3308/RK1808/PX30,
and the previous soluation is to make TX/RX reset at the same
time to fix that. Unfortunately, it fails on PX30-I2S0, because
the reset-TX and reset-RX bits can't be addressed at the same time.
Now, we use another way to fix it:
reset_control_assert(i2s_tdm->tx_reset);
reset_control_assert(i2s_tdm->rx_reset);
|
gate the i2s src clk
|
reset_control_deassert(i2s_tdm->tx_reset);
reset_control_deassert(i2s_tdm->rx_reset);
|
ungate the i2s src clk
as shown above, use the pair gate/ungate src clk to make the
TX/RX reset at the same time.
Change-Id: Ib320ad13350516100eb11c7717e1bd9005abaf39
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
TRCM on Master mode require TX/RX enabled at the same time,
or need the one which provide clk enabled at first. In this
situation, one direction's FIFO maybe XRUN which may break
the channels order.
This patch add dmaengine for this mode to handle this situation.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I831aead0371228661620b54188048e4f3daa717e
TRCM require TX/RX enabled at the same time, or need the one
which provide clk enabled at first. In this situation, one
direction's FIFO maybe XRUN which may break the channels order.
This patch add dmaengine for this mode to handle this situation.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I30b4ec134b06516d80de4c1d0ccaf916513294ab
* commit 'ca4e22208b9d2053301e90ff69b526694253b989':
media: i2c: sc530ai: update gain map according to datasheet
hwspinlock: rockchip: object to unlocking someone else's lock
hwspinlock: rockchip: support to set hwlock user in dt
dt-bindings: hwlock: rockchip: add hwlock user id property
Change-Id: I43eec243d439257fd3d334874e60859e34f99ec3
* commit '0a30d6ee1e899f25801c651a6e7612c07cdf4922':
drm/rockchip: dw-dp: filter yuv420 when display mode not support
Change-Id: I3e1343baaa1cc4c7c914a6390dba6274a6ac948f
Merge made by the 'ours' strategy.
* commit '1c6c2f66f3bfb9a9d1ca789c48816e283b7aa828':
mfd: rk808: remove rtc stop for pre init
Change-Id: I301a09edee4790eab24a40fdf987eb968076f44e
If RTC has been started, stop rtc in pre init will affect
the rtc function and accuracy.
Change-Id: Ic601e8e2d622de95638ca1710c1cff8c5c1a90d5
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Merge made by the 'ours' strategy.
* commit '89ba14ab7c6296c499fc3c5c22d252da0a0a4137':
ASoC: rockchip: i2s: Add support for pinctrl idle state
Change-Id: I57f89f225efe91416c370a5e6aa508d9b4174e91
This patch assign the LRCK pin for TDM_ONE_FRAME on Slave mode.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I2ef950170d6646f3d04115662099918942c3cf9d
This patch assign the LRCK pin for TDM_ONE_FRAME on Slave mode.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0f0e1a1c778e1e42a5bb5471148358815f6d7b2a
This patch assign the LRCK pin for TDM_ONE_FRAME on Slave mode.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I28bd554d64f9c63073d2c7f67b9e101c63266c8f
This patch fix multi-channels order for TDM_ONE_FRAME on SLAVE
mode.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ib6543cf0740516d5df1570245abf07fcce9082c3
Situation for 'i2s-lrck':
Should use flag GPIOD_ASIS not to reclaim LRCK pin as GPIO function,
because we use the same PIN and just read EXT_PORT value which show
the pin status.
Situation for 'tdm-fsync':
A. when the pin is a generic gpio as the ref signal pin which is drived from
external. should use flag GPIOD_IN to reclaim as GPIO_IN function.
B. when the pin is the same pin from the 'clk-src' on the same SoC, we can
use the 'clk-src' fsync out signal as the 'tdm-fsync' to query status.
in this case, should use flag GPIOD_ASIS not to reclaim it as GPIO.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I529d982a7e49cb90c02b7670a58759607f4e4f32
This patch fix resources from of_iomap() not released.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I46a7f4996bc751ade34071727a350137a313b446
There are clk sync issue on TRCM mode for RK3308/RK1808/PX30,
and the previous soluation is to make TX/RX reset at the same
time to fix that. Unfortunately, it fails on PX30-I2S0, because
the reset-TX and reset-RX bits can't be addressed at the same time.
Now, we use another way to fix it:
reset_control_assert(i2s_tdm->tx_reset);
reset_control_assert(i2s_tdm->rx_reset);
|
gate the i2s src clk
|
reset_control_deassert(i2s_tdm->tx_reset);
reset_control_deassert(i2s_tdm->rx_reset);
|
ungate the i2s src clk
as shown above, use the pair gate/ungate src clk to make the
TX/RX reset at the same time.
Change-Id: Ib320ad13350516100eb11c7717e1bd9005abaf39
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
TRCM on Master mode require TX/RX enabled at the same time,
or need the one which provide clk enabled at first. In this
situation, one direction's FIFO maybe XRUN which may break
the channels order.
This patch add dmaengine for this mode to handle this situation.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I831aead0371228661620b54188048e4f3daa717e
TRCM require TX/RX enabled at the same time, or need the one
which provide clk enabled at first. In this situation, one
direction's FIFO maybe XRUN which may break the channels order.
This patch add dmaengine for this mode to handle this situation.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I30b4ec134b06516d80de4c1d0ccaf916513294ab
Check hwlock user id and object to unlocking someone else's lock
when invoking unlock() API.
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I46c256fd703fa56ce3d175ff2d721f53d3615ec0
With this commit, we can set hwlock user id in DT with
"rockchip,hwlock-user-id" property, if it is not set, the driver
use default value 0x01 instead.
Change-Id: Ib7ecc3eaf23ba79d85dc82182a9db0760c6d830c
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Set hwlock user id with the "rockchip,hwlock-user-id" property.
Change-Id: I46327ff4146e9c0999def48d67a3538462b82bfb
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
EP support have been moved to pcie-dw-ep-rockchip.c since 5.10 kernel,
so remove the old EP code from RC driver now.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ia1a5907493a38cf6be5f1a97c5690dd9ecaad3c4
