Commit Graph

1065681 Commits

Author SHA1 Message Date
William Wu
01ccdd1489 usb: gadget: u_audio: improve uac compatibility
Some PC USB Hosts (e.g Dell laptop) fail to send
SetInterface(AltSet=0) to stop capture/playback
when PC enter suspend or play YouTube Video.

To be compatible with these PC, add this patch to
stop capture/playback prior to start again if the
stream_state is true.

Change-Id: Iced57de39b6b88a7c987897dcb123cf8d7cf6473
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2022-04-01 10:48:17 +08:00
Ren Jianing
1abe6982f8 BACKPORT: usb: gadget: u_audio: add uevent for set_alt and set_srate
This patch add uevent to notify the application layer when it should
playback or capture and setting the accuration sample rate.

The event consists of three parts, namely USB_STATE, STREAM_DIRECTION
and STREAM_STATE. For example:

g_audio_work: sent uac uevent USB_STATE=SET_INTERFACE STREAM_DIRECTION=IN STREAM_STATE=OFF
g_audio_work: sent uac uevent USB_STATE=SET_INTERFACE STREAM_DIRECTION=OUT STREAM_STATE=ON
g_audio_work: sent uac uevent USB_STATE=SET_SAMPLE_RATE STREAM_DIRECTION=OUT SAMPLE_RATE=44100

Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>

(backported from develop-4.19 commit 55c7a54911)
Change-Id: I9115a8aa57875a440df96b67bb02c3d50f237b29
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2022-04-01 10:48:10 +08:00
William Wu
02c6e7f24b BACKPORT: usb: gadget: f_uac1: finalize wMaxPacketSize according to bandwidth
According to USB Audio Device 1.0 Spec, Ch4.6.1.1:
The wMaxPacketSize of endpoint is defined as follows:
Maximum packet size of endpoint is capable of sending
or receiving when this configuration is selected. This
is determined by the audio bandwidth constraints of
the endpoint.

In current code, the wMaxPacketSize is limited to 200,
and the bInterval is set to 4 (1ms). That is, the maximum
bandwidth over USB bus is 200 * 1000 = 200000 bytes.

We find an issue about bandwidth limitation when we try to
support UAC1 with 8ch * 16bit * 16KHz on RK3308 platform,
which needs more bandwidth than it can support.

This patch sets the wMaxPacketSize dynamically according
to the parameters of UAC1. It is similar to the same thing
done earlier for f_uac2.

Signed-off-by: William Wu <william.wu@rock-chips.com>

(backported from develop-4.19 commit 573d2e1e2e)
Change-Id: I3304f9eb4d1eee18f4beb44af46a246940c2dfe3
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2022-04-01 10:48:03 +08:00
David Wu
931b12539b net: stmmac: Add integrated phy powe up/down for ethernet up/down
For integrated PHY, there is no stmmac_mdio_reset(), so add callback for
the PHY power control during ethernet interface up/down, and suspend/resume.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ib8ae375ee885aecefc7f5b9a6617523186a3f0e1
2022-04-01 10:47:47 +08:00
Li Huang
c002048f4f video: rockchip: rga3: fixup crash on rga_job_next
1. Free job resource when user exit to call release
2. Support rga_seesion.

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I87d01ce24d80769bb379c6117798063133e922b3
2022-04-01 10:46:41 +08:00
Li Huang
295acc8ce8 video: rockchip: rga3: code optimization
Use pointer to get scheduler form job.

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ie928eb30c171763e31f659da0fc6a8f11b1e3a0e
2022-04-01 10:46:41 +08:00
Li Huang
2be1c5ce62 video: rockchip: rga3: code optimization
1. rename rga_scheduler to scheduler
2. sort rga_internal_ctx_* func

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I1a5fd7f1b8b400728ac00c55b684d401ad269dc1
2022-04-01 10:46:41 +08:00
Li Huang
0a1063e4ac video: rockchip: rga3: fixup RGA3 timeout
When import/release buffer frequently called in parallel, may cause
RGA3 timeout.

IOMMU op need pm_runtime_get_sync to flush tlb.

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I5dd61f287740da682975189fa69dce73ee570f04
2022-04-01 10:46:41 +08:00
Zefa Chen
ac1a792365 media: rockchip: vicap check the synchronization of each group of frames
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic2c40899649bfc5a8fc4ef291f5b05f586f328d7
2022-04-01 10:45:51 +08:00
Shawn Lin
d2821ac28f PCI: rockchip: dw: Add rockchip,perst-inactive-ms property support
Some devices need more #PERST inactive time, so we need expose
DT property.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I95e2236f7c2005942c2c6247f069ebe24ba5c182
2022-04-01 10:43:41 +08:00
Finley Xiao
7b43769a16 clk: rockchip: rk3588: Remove CLK_IGNORE_UNUSED for lpll, b0pll and b1pll
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Iafdd1ae6e545fd018dd4becab0083a60a0570fb1
2022-04-01 10:43:14 +08:00
shengfei Xu
3b7f60deed mfd: rk806: update rk806 volatile reg range
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I1f73137e033a5eacebbd3e2f5000527efd874160
2022-04-01 10:42:07 +08:00
Lian Xu
e76af5fc7c media: rockchip: isp: Solve the wrap_line frame rate problem
Change-Id: I6a949723c1b8caa90897b111a37d19f32644b6ba
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2022-04-01 10:04:07 +08:00
Lian Xu
9542500c18 media: rockchip: isp: Solve the problem of invalid mirror
Change-Id: Ifbe8ff9f4bca7f42352e398cc86c6329b281dcc0
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2022-04-01 09:34:34 +08:00
Cai YiWei
4bcf50f7a6 media: rockchip: isp: add isp reg cache read/write api
Change-Id: I9db97c3ae4dc3f0a9418f427026a5689ee73750f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-01 09:34:27 +08:00
Finley Xiao
cb62fa6675 MALI: bifrost: Change clock source to normal pll when suspend
When call pm_runtime_get_sync(), the runtime callback will change clock
source to normal pll, but now pm_runtime_get_sync() is called in a delay
work and the wakelock seems to be invalid on linux system,
so when suspend the pm_runtime_get_sync() may not be called.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I0a951b455c10158ca63d747e35e9001cdbdde91c
2022-04-01 09:33:18 +08:00
Cai YiWei
a78431756f media: rockchip: isp: power on to set pipeline default format
Change-Id: Icdd040e9f9d6aac7bb84ba1ec22516fc04884b6e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-31 19:43:02 +08:00
Cai YiWei
b4cb093eee media: rockchip: isp: set isp subdev crop and also check stream crop
Change-Id: I92ef9af47b9e5e9ebfb034b62214506548296164
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-31 19:42:55 +08:00
Yanchao Hu
1e18c2b6de ARM: dts: rockchip: Add support for RV1106G IPC38 SPI NAND Board
Signed-off-by: Yanchao Hu <yanchao.hu@rock-chips.com>
Change-Id: I7d41a903b8dc6e2af6c33ed0c0d2b793443d5bd3
2022-03-31 19:21:50 +08:00
Li Huang
65d129a414 video: rockchip: rve: Update to 1.0.2
support config ASYNC

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I762cf8e67dbd9ceaebc3d58120652c8d89f6e92a
2022-03-31 19:14:19 +08:00
Li Huang
bac6b534b7 video: rockchip: rve: Fixup some error on insmod ko
1. Fixup misc_register fail
2. Close power always on
3. Move timer init after register success

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I4b7753b6e6fe5f7c1dc3a8b4591ea7ccce690421
2022-03-31 19:14:19 +08:00
Li Huang
0949545400 video: rockchip: rve: Optimize statistics on bandwidth & cycle
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I9260b41adbc5a1a0bab6be099fd40971324586ce
2022-03-31 19:14:19 +08:00
Jianqun Xu
c2a93573e4 ARM: configs: rv1106_defconfig: DMABUF_HEAPS_ROCKCHIP_CMA_ALIGNMENT=0
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I164cc9a27020e653655839283bf3a2e2e2077a84
2022-03-31 10:00:28 +08:00
Mark Huang
56a0e2ce87 ARM: rv1106-evb.config: Enable UVC/UAC/HID
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: I9577c4f159622d8648fc5d3ce83c7adcdf645bd6
2022-03-30 20:33:12 +08:00
Li Huang
f863ae5dd0 video: rockchip: rga3: fixup scheduler load
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I60a2357d1fd517092d1721cfcd16cd1a2e2dba04
2022-03-30 17:47:39 +08:00
Weiwen Chen
19d26d75b6 ARM: rv1106-evb.config: support spi nand
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ic1156239064abf7b83f19b6bac8239d6ab548b5f
2022-03-30 17:21:07 +08:00
Jon Lin
01a8559fe6 ARM: dts: rockchip: rv1106: Add rknpor_powergood node
Change-Id: Ib41b419f0df96298389be67a2ddbee7aebddcbbf
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-03-30 16:17:22 +08:00
Jon Lin
ecbe5f051c soc: rockchip: Add rockchip_npor_powergood
Powergood integrated on npor is an interrupt signal that triggers
an interrupt when a specific level value is detected.

Do some software protection for the system when the interrupt is
triggered.

Change-Id: I928c05e9dd7c7ac76af54135c7ea73d377c22807
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-03-30 16:17:04 +08:00
Jon Lin
c70280b04a ARM: configs: rv1106: Support RKROCKCHIP_NPOR_POWERGOOD
Change-Id: Icbdc86206b7ba8dcfc1d3ac030cd4f0a9f0f6a94
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-03-30 16:16:44 +08:00
Mark Huang
6f771b8baf arm64: dts: rockchip: rk3588-nvr-demo1-v21: disable dp0 logo
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: Iaa844b717fa94c73a825febbdd83ba223bdb6a7a
2022-03-30 12:12:40 +08:00
Zefa Chen
bf6101f235 ARM: dts: rockchip: rv1106-evb-cam: support camera ircut
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I73feabef84ce9a31b207420e06560ec9976d58f3
2022-03-30 11:54:09 +08:00
Yifeng Zhao
d7d43c9c1c soc: rockchip: vendor storage: add HDCP_14_HDMIRX_ID
Modify SENSOR_CALIBRATION_ID from 13 to 14 and add
SENSOR_CALIBRATION_ID.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Id10be9960c1d7015edebaa7ccf646d8f16cf1d15
2022-03-30 11:10:55 +08:00
Shunqing Chen
7ddd8990c9 arm64: rockchip_defconfig: Enable RK628 HDMI to CSI/BT1120
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I2d925cc00fb4f2c35893abe6a48e2b0b59b1fbfd
2022-03-30 10:51:05 +08:00
Sugar Zhang
52fd300c57 ASoC: rockchip: i2s-tdm: Update params when it real changed
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I81c8ebb49e995f68c56848fbc5475ad305f50233
2022-03-30 10:32:01 +08:00
Su Yuefu
ff850fd4a7 ARM: dts: rockchip: rv1106-evb-cam: match camera module index with ircut
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: I7fbc01a71bd83388c8f4cb062f826a4f2a5a2e56
2022-03-30 10:01:55 +08:00
Ziyuan Xu
559353fe7c ARM: rv1106-evb.config: Enable CONFIG_PWRSEQ_SIMPLE
Most of the sdio devices need a simple pwrseq that is referred by
mmc-pwrseq, otherwise the mmc host will be probed as -EPROBE_DEFER
result.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I2db654076563d49ddf52d91342fff93d39b218e0
2022-03-30 09:36:11 +08:00
Wu Liangqing
7168edebe8 arm64: dts: rockchip: rk3588-evb7: fix bluetooth uart9 iomux error
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I369aecd2f48608e7c298bdb7a6abf63bef398efe
2022-03-30 09:27:47 +08:00
Xing Zheng
e466b62d40 ARM: configs: rv1106: enable the internal acodec by default
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Iec82a5004b7d2d6a4a7314b243656ca7a4052424
2022-03-29 19:31:41 +08:00
Xing Zheng
d9e3c3c1b1 ARM: dts: rockchip: rv1106-evb-v10: add support acodec_sound
Enabling asound_sound by default.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I64734e50dfa16564dd5731236cb062a01c287f8e
2022-03-29 19:28:46 +08:00
Jason Zhu
fcfd0515fa ASoC: codecs: add support rv1106 codec
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I1609467374d3829802cbcd42950a1f206dca50a2
2022-03-29 18:32:28 +08:00
Jason Zhu
d344bdcbe0 ARM: dts: rockchip: rv1106: add support acodec node
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I262d2d075ee163067ab59c3cd211e7ac093aa41b
2022-03-29 18:12:49 +08:00
Simon Xue
ef6f0d23e0 ARM: dts: rockchip: rv1106: fix saradc compatible name
Change-Id: If08e1a9b8fb3f3d2b77b40bb67518b0e8cff60ba
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2022-03-29 18:10:53 +08:00
Simon Xue
05108c78b2 iio: adc: rockchip_saradc: add rv1106
Change-Id: I47cef80e5b64fdce16fce3544424c2ff9acc93d0
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2022-03-29 18:10:22 +08:00
Simon Xue
332f6ade32 iio: adc: rockchip_saradc: fix issue if CONFIG_ROCKCHIP_SARADC_TEST_CHN enabled
Change-Id: I282fb82d15501b566d316ee4d1bee87be3bebe41
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2022-03-29 18:07:59 +08:00
Tao Huang
3731b0cb2b crypto: rockchip: Add missing include of rk_crypto_v2_pka.h
drivers/crypto/rockchip/rk_crypto_v2_pka.c:615:6: warning: no previous prototype for rk_pka_set_crypto_base [-Wmissing-prototypes]
drivers/crypto/rockchip/rk_crypto_v2_pka.c:629:5: warning: no previous prototype for rk_pka_expt_mod [-Wmissing-prototypes]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ifd4335f6355ca173e391851bca536cb63ee7d5f5
2022-03-29 18:07:51 +08:00
Zefa Chen
ecb29c9635 media: i2c: imx327 fixed bus-type error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I22aec81da98aa49731283aebf273b2485df91e2d
2022-03-29 17:56:58 +08:00
Zefa Chen
97d55d0f94 media: i2c: imx307 fixed bus-type error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4a3ba9f628a4177d1187c91c59b139fb912e354a
2022-03-29 17:56:09 +08:00
Zefa Chen
c045b7f3a7 media: rockchip: vicap fixed lvds capture issue for rv1106
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ica1645ce79feb60c5d0da29e943498a70684c99b
2022-03-29 17:55:45 +08:00
Zefa Chen
ad676c401a phy: rockchip: csi2-dphy: fixed bug when use lvds mode for rv1106
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic615c893ba444fe44617e3442e35ae45999369a8
2022-03-29 17:54:35 +08:00
Algea Cao
c29324201e drm/bridge: synopsys: dw-hdmi-qp: Support avi version 3
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ic5edfe72e2f3b6914d0b2f4422984ef4ded39a62
2022-03-29 14:52:58 +08:00