Commit Graph

1065646 Commits

Author SHA1 Message Date
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
Li Huang
256ea0c899 video: rockchip: rve: update to 1.0.1
1. support llp mode.
2. improve debugger module.

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I8478804419b1d5f9582fb8b926711ae5418c2e86
2022-03-29 12:07:51 +08:00
Damon Ding
9d83a08e9b ARM: dts: rockchip: rv1103: add bt656-to-hdmi ext board support
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I5f360c625b9bf4bda35714e92c1d721beec37a44
2022-03-29 12:06:42 +08:00
Damon Ding
d62a794dbe ARM: dts: rockchip: rv1106: add rgb2hdmi ext board support
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ib7d35a05463338a58fa5630658500ce08d68267d
2022-03-29 12:04:53 +08:00
Felix Zeng
646548f963 ARM: rv1106_defconfig: Enable rknpu
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: Ieae8f760ba9e703eebfb75f67fcc664195f4f8d5
2022-03-29 10:59:55 +08:00
Felix Zeng
1e714a44c9 driver: rknpu: Update rknpu driver, version: 0.7.0
* Add support for rv1106/rv1103

Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: Ic681c8657cf372adbdc39c30284d66d736030775
2022-03-29 10:59:19 +08:00
Zhang Yubing
0bb9818fe4 phy: rockchip: usbdp: add PD-to-HPD IRQ support
When DP output in Tyep-C interface, HPD and HPD IRQ info are
send by PD message, and transfer to phy by mux set callback
function. The usbdp phy need tell the DP controller not only
the HPD info, but also HPD IRQ info.

According to DP Standard 1.4a 3.3 section, the HPD IRQ pulse
width should be in the range from 0.5 ms to 1 ms, setting
the low level time between 750 us nad 800 us to satisfied
the specification.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ie6d6d0537e6633e6e5f12119ceafc4109e32e74e
2022-03-28 20:33:46 +08:00
William Wu
3092561a61 phy: rockchip: naneng-usb2: fix a NULL vs IS_ERR() check
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ie495b234a68972c2bdaa07d105c13f7052f0d0d8
2022-03-28 20:32:46 +08:00
William Wu
5f2da9e8bc phy: rockchip: inno-usb2: Rework clock initialization to be more flexible
The inno usb2 phy binding specifies the clock "phyclk",
however, some Rockchip SoCs (e.g. RV1106/RV1103) have
more than one clock, so this patch reworks the reading
of the clks from the dts to use devm_clk_bulk_get_all()
will fetch all the clocks specified in the dts together.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I07b262e184ee043866b233314c5279f17845b9a4
2022-03-28 20:32:46 +08:00
Tingjin Huang
7a1ea0906b ARM: dts: rockchip: enable pp node for rv1106-evb
Signed-off-by: Tingjin Huang <timkingh.huang@rock-chips.com>
Change-Id: I35c682b59b9fad367045b5e7047da7628d378fe3
2022-03-28 20:30:26 +08:00
Tingjin Huang
b61e413c73 ARM: dts: rockchip: add rkvenc pp node for rv1106
Signed-off-by: Tingjin Huang <timkingh.huang@rock-chips.com>
Change-Id: Ib5a7e84d4c273dcef805d0bc0cc72d285702c25a
2022-03-28 20:02:20 +08:00
Elaine Zhang
2e8db7b0e9 ARM: dts: rockchip: modify the rtc compatible for rv1106
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ied400c91c7962661ea29ba622cd37b46bb647228
2022-03-28 19:16:29 +08:00
Jon Lin
1c049ace1a ARM: dts: rockchip: rv1106g-evb1-v10: Add spi-nor board
Change-Id: Icef9b2714696c9c700aac68e43f6a2f8504b51f5
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-03-28 19:08:34 +08:00
Cai YiWei
97ffe01bcd media: rockchip: isp: isp32 fix frame id to dvbm
Change-Id: Ied1cc94a147832b9c4ccd73cb544bc5083529a9d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-03-28 19:02:05 +08:00
Anthony Iliopoulos
ab70dbfebf UPSTREAM: dma-debug: fix debugfs initialization order
Due to link order, dma_debug_init is called before debugfs has a chance
to initialize (via debugfs_init which also happens in the core initcall
stage), so the directories for dma-debug are never created.

Decouple dma_debug_fs_init from dma_debug_init and defer its init until
core_initcall_sync (after debugfs has been initialized) while letting
dma-debug initialization occur as soon as possible to catch any early
mappings, as suggested in [1].

[1] https://lore.kernel.org/linux-iommu/YIgGa6yF%2Fadg8OSN@kroah.com/

Change-Id: I615389d4c630cd4fa7482c99f4faef1e3bb87b3c
Fixes: 15b28bbcd5 ("dma-debug: move initialization to common code")
Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 173735c346)
2022-03-28 19:01:23 +08:00
Finley Xiao
67031fb1cc arm64: dts: rockchip: rk3588s: Add leakage information
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Icaa30bcda38461cb7fc69d83672e9ff8fe73abd3
2022-03-28 18:57:29 +08:00
Shunqing Chen
5c428cc16e media: i2c: add rk628 hdmi in support
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: Id0412c73b4c6e91c9fd03a16e640300b4a596ea2
2022-03-28 18:57:19 +08:00
Xing Zheng
54a7a1cc01 clk: rockchip: rv1106: remove the mclk_acodec_rx
Dues to the broken doc, there is no path of
mclk_i2s0_rx to mclk_acodec_rx, we need to
remove it directly and let mclk_acodec_tx
below to the mclk_i2s0_8ch_tx.

- Before:
          clk_i2s0_8ch_rx_src         1        1        0   594000000          0     0  50000
             clk_i2s0_8ch_rx_frac       1        1        0    12288000          0     0  50000
                clk_i2s0_8ch_rx       1        1        0    12288000          0     0  50000
                   mclk_i2s0_8ch_rx       2        2        0    12288000          0     0  50000
                      mclk_acodec_rx       1        1        0    12288000          0     0  50000
          clk_i2s0_8ch_tx_src         1        1        0   594000000          0     0  50000
             clk_i2s0_8ch_tx_frac       1        1        0    12288000          0     0  50000
                clk_i2s0_8ch_tx       1        1        0    12288000          0     0  50000
                   mclk_i2s0_8ch_tx       2        2        0    12288000          0     0  50000
                      mclk_acodec_tx       1        1        0    12288000          0     0  50000

- After:
          clk_i2s0_8ch_rx_src         1        1        0   594000000          0     0  50000
             clk_i2s0_8ch_rx_frac       1        1        0    12288000          0     0  50000
                clk_i2s0_8ch_rx       1        1        0    12288000          0     0  50000
                   mclk_i2s0_8ch_rx       1        1        0    12288000          0     0  50000
          clk_i2s0_8ch_tx_src         1        1        0   594000000          0     0  50000
             clk_i2s0_8ch_tx_frac       1        1        0    12288000          0     0  50000
                clk_i2s0_8ch_tx       1        1        0    12288000          0     0  50000
                   mclk_i2s0_8ch_tx       2        2        0    12288000          0     0  50000
                      mclk_sai        0        0        0    12288000          0     0  50000
                      mclk_dsm        0        0        0    12288000          0     0  50000
                      mclk_acodec_tx       1        1        0    12288000          0     0  50000

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I223189b6852f2e796eeb01ad4ce957fde7f9a52c
2022-03-28 18:56:33 +08:00
Jon Lin
2547122058 ARM: dts: rockchip: rv1106g-evb1-v10: Support spinand dts
Change-Id: I711c7034753c3b659f4af01baebac1f3800c5821
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-03-28 18:54:47 +08:00
Liang Chen
cfa5feae96 ARM: dts: rockchip: rv1106: add tclk for watchdog node
Change-Id: I5fee23f43796f9cf9df5970807860a29ec77a08a
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-03-28 18:53:18 +08:00
Yandong Lin
e18dd28625 video: rockchip: dvbm: fix dvbm config issue
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ia1abe5b1589fc6e02495c28b01e0ee83ef823f0f
2022-03-28 18:43:22 +08:00
Elaine Zhang
bde6673e74 ARM: dts: rockchip: add vdd_arm node for rv1106-evb-v10
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I53bfae86878e0de0b3a32721a7319499bfa71d65
2022-03-28 18:42:02 +08:00
Elaine Zhang
00e0392c18 regulator: pwm-regulator: set init voltage before pwm enable
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I37c35eb97dd1e205a4966792acb4df2bb2bf69f1
2022-03-28 18:30:36 +08:00
Lin Jinhan
931258edcb ARM: dts: rockchip: rv1106: modify crypto v3 compatible
Modify crypto v3 compatible from "rockchip,crypto_v3" to
 "rockchip,crypto-v3".

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I1bf62136f095e668024969aae354207b37dc0c93
2022-03-28 18:30:08 +08:00
Lin Jinhan
6b2fcae1a6 crypto: rockchip: v3: add crypto version check
Add automatic check, can be automatically trimmed according
 to the register supported algorithm.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Ie807cba240389466be1d1f177bbc9b35a47efecb
2022-03-28 18:29:07 +08:00
Lin Jinhan
f68bea16c9 crypto: rockchip: v3: add crypto V3 support
Add a new generation of Crypto IP drivers and add
 multithreaded cipher/hash support.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Iaefda28a1efc9c5af29b71cd3453d108b6e9260a
2022-03-28 18:23:54 +08:00
Lin Jinhan
415fe72016 crypto: rockchip: v2: move common skcipher/ahash function to utils
Crypto V2 and Crypto V3 have a lot of code to reuse, so simplify
 the code before importing Crypto V3.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Ifcd5314a78c56b8db5d2444863172aeceab310d0
2022-03-28 18:21:58 +08:00
Zhang Yubing
9ea31d1d20 drm/rockchip: dw-dp: support force output
When config dp show log as force output mode, it will not get
edid and detect the connect status(to avoid aux error because
sink may be not physical connected). So it should set default
color format and link info before show kernel logo, which will
be used when select the output color format.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I76ec29cebb101b8629e81eee3d82c93f53cc9102
2022-03-28 17:19:31 +08:00
Sandy Huang
ea3141aacf drm/rockchip: drv: add rockchip default mode when enable force output
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Iebc75e54f4bef12baac694fc54a45af33540c783
2022-03-28 17:19:31 +08:00
Ziyuan Xu
a2db8f2420 ARM: dts: rockchip: rectify camera's properties for rv1106-ipc
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I733bb107b80b589a82905ca0184a8a2d1cca1bdc
2022-03-28 16:25:10 +08:00
Jianqun Xu
dde8daabfc dma-buf: dump each dmabuf info
Loop into each dmabuf and dump its info, including name, exp_name, size
and physical address range from the scatterlist table(sgt).

Since the sgt of dmabuf only exist after device attach/map, but some
dmabufs have not be attach/map by device yet. This patch creates a fake
platform device to do attach/map for a dmabuf who has a empty attachment
list, and unmap/detach after all.

Tested on RV1106 evb: cat /proc/rk_dmabuf

NAME	                          EXPORT       SIZE:KiB   SGLIST

vmpi	                 rk-dma-heap-cma          4 KiB   0: 0x04548000..0x04548fff
vmpi	                 rk-dma-heap-cma          4 KiB   0: 0x04547000..0x04547fff
vmpi	                 rk-dma-heap-cma       5584 KiB   0: 0x05400000..0x05973fff
vmpi	                 rk-dma-heap-cma        920 KiB   0: 0x05300000..0x053e5fff
vmpi	                 rk-dma-heap-cma        232 KiB   0: 0x045c0000..0x045f9fff
vmpi	                 rk-dma-heap-cma          4 KiB   0: 0x04546000..0x04546fff
vmpi	                 rk-dma-heap-cma       5584 KiB   0: 0x04d00000..0x05273fff
vmpi	                 rk-dma-heap-cma        920 KiB   0: 0x04c00000..0x04ce5fff
vmpi	                 rk-dma-heap-cma        232 KiB   0: 0x04580000..0x045b9fff
vmpi	                 rk-dma-heap-cma       5400 KiB   0: 0x04600000..0x04b45fff
vmpi	                 rk-dma-heap-cma       5400 KiB   0: 0x04000000..0x04545fff
(null)	               videobuf2_vmalloc         12 KiB
(null)	               videobuf2_vmalloc         12 KiB
(null)	               videobuf2_vmalloc         12 KiB
(null)	               videobuf2_vmalloc         12 KiB

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Icf46e9d585847ef6dafbddcd24e589046e3ff015
2022-03-28 16:23:49 +08:00
Weiwen Chen
71d3656eaa ARM: configs: rv1106_defconfig enable CONFIG_INOTIFY_USER
TO Fix:
[    0.521444] udevd[52]: starting eudev-3.2.7
[    0.521974] udevd[52]: inotify_init failed: Function not implemented
[    0.522556] udevd[52]: error initializing inotify

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ic97896126a4c1d5e21bc5161112829baf37ee487
2022-03-28 16:13:12 +08:00
Su Yuefu
c510652926 ARM: dts: rockchip: rv1106-evb-cam: compatible to os04a10
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: I43969a1be3bbf8bb7b609d03b36bb452c60b45d0
2022-03-28 15:05:43 +08:00
Su Yuefu
f83e32d567 ARM: dts: rockchip: rv1106-evb-cam: compatible to sc3336 sc4336 530ai
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: Id08faa19f5244f57cde6487d77f957eb27481a95
2022-03-28 15:04:40 +08:00
Addy Ke
d0cca5a3d8 arm64: dts: rockchip: rk3588-toybrick-x0: enable pcie3x4
rk3588 toybrick board pcie3 have only 2 lanes.
set:
rockchip,pcie30-phymode = <PHY_MODE_PCIE_NANBNB>;
num-lanes=<2>;

Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
Change-Id: I3b0357a4a77aa00f578c32424b3bf11f5dd873e9
2022-03-28 15:03:21 +08:00
Xiao Yao
4f9102ad74 ARM: config: rv1106-evb: enable wifi config
Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com>
Change-Id: I4413eea9684d02982f18b58572eba3c66abce608
2022-03-28 15:02:06 +08:00