Commit Graph

1066246 Commits

Author SHA1 Message Date
Jianqun Xu
bc2ba01c88 soc: rockchip: io-domain: dump power supply-map when probe
Tested on RK3568-evb2 with io-domain node as following:
    pmuio2-supply = <&vcc3v3_pmu>;
    vccio1-supply = <&vccio_acodec>;
    vccio3-supply = <&vccio_sd>;
    vccio4-supply = <&vcc_3v3>;
    vccio5-supply = <&vcc_3v3>;
    vccio6-supply = <&vcc_3v3>;
    vccio7-supply = <&vcc_3v3>;

With this patch, the system bootup log shows:
[    0.773089] rockchip-iodomain fdc20000.syscon:io-domains: pmuio2(3300000 uV) supplied by vcc3v3_pmu
[    0.773247] rockchip-iodomain fdc20000.syscon:io-domains: vccio1(3300000 uV) supplied by vccio_acodec
[    0.773426] rockchip-iodomain fdc20000.syscon:io-domains: vccio3(3300000 uV) supplied by vccio_sd
[    0.773603] rockchip-iodomain fdc20000.syscon:io-domains: vccio4(3300000 uV) supplied by vcc_3v3
[    0.773721] rockchip-iodomain fdc20000.syscon:io-domains: vccio5(3300000 uV) supplied by vcc_3v3
[    0.773839] rockchip-iodomain fdc20000.syscon:io-domains: vccio6(3300000 uV) supplied by vcc_3v3
[    0.773989] rockchip-iodomain fdc20000.syscon:io-domains: vccio7(3300000 uV) supplied by vcc_3v3

Change-Id: Ib4bcb78bf932b07beb03b3b39a0224ecb6699a54
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-05-25 19:25:20 +08:00
Jianqun Xu
853772ade4 soc: rockchip: io-domain: build depends on CPU config
Before:
   text	   data	    bss	    dec	    hex	filename
   9217	    240	      0	   9457	   24f1	drivers/power/avs/rockchip-io-domain.o

After:
   text	   data	    bss	    dec	    hex	filename
   2739	    144	      0	   2883	    b43	drivers/power/avs/rockchip-io-domain.o

Change-Id: Ibdaeb4f9e73b4c653fe854c101d181f28d52b481
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-05-25 19:24:56 +08:00
Jianqun Xu
8c65c19483 soc: rockchip: io-domain: rv1126 use separated notify
RV1126 set 3.3V before regulator disable.

Do a fix to rockchip io-domain, follow this orders:

* system running state
  -> io-domain vsel to 3.3V (actually is done by event-disable)
    -> regulator_enable
      -> vsel change according to regulator voltage

* system running state
  -> regulator_disable
    -> io-domain vsel to 3.3V

The bug only instance on RV1126, and tested on RV1126 EVB DDR3 V10.

Change-Id: Ic9d6b05d07b050c392e415786cf6390cc1c5aa9e
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-05-25 19:24:48 +08:00
David Wu
40d4b2db5f soc: rockchip: io-domain: add io selectors and supplies for rk3308
This adds the necessary data for handling io voltage domains on the rk3308.
As interesting tidbit, the rk3308 contains one iodomain area at grf,

Change-Id: Ife72a284a8926d02ef5df7a422d41924494d0300
Signed-off-by: David Wu <david.wu@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-05-25 19:24:38 +08:00
Jianqun Xu
da52f054c9 clk: rockchip: remove depend on ARM64 for rockchip SoCs
A clock driver for a arm SoC should depend on ARM, but for a arm64 SoC,
the driver should not depend on ARM64 since SoC could used as 32bit,
such as the RK3308 aarch32 platform.

Fixes: 5f3de16bb2 ("clk: rockchip: depends on CPU config")
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I9bc2c22b8c20dc6aedecbc288f551de1c0f02216
2022-05-25 18:40:46 +08:00
Tao Huang
baa784a2af ARM: rockchip: Locate kernel add 0x00058000 if CPU_RK3308
128+64KB at the beginning of RAM reserved for ATF.
128KB for pstore.

Change-Id: I1306daec44c65258ff6668f6760be4981d7ca932
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2022-05-25 18:40:46 +08:00
Tao Huang
5a8c565bcc ARM: decompressor: fix start of RAM alignment
256KB alignment is not work for (textofs & 0xf0000) > 0x40000.
Change to 1MB.

Change-Id: I9803b22d7d64a244842dcc811e47e214d247fc0c
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2022-05-25 17:35:52 +08:00
Lin Jianhua
4f2a451d97 arm64: dts: rockchip: support rk3308bs evb v11 board.
Change-Id: Ie5b2f63a32b01b72ad4e854e779ac345787fa0d7
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
2022-05-25 16:06:30 +08:00
Jianqun Xu
c106a565f6 pinctrl: rockchip: fix drive strength set for rk3308bs/px30s/rk3326s
Sync driver with v4.4 and v4.19, support rk3308bs/px30s/rk3326s whose io
type is new called as smic type.

The smic type io configure drive strength with 3 bit, the highest bit is
from slew rate bit for the origin io type, that also means the smic io
not support slew rate setting.

The drive strength setting difference:

regval  RK3308B  RK3308BS
0       2mA      0mA
1       4mA      2mA
2       8mA      4mA
3      12mA      6mA
4                6mA
5                8mA
6               10mA
7               12mA

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ibcbdc06eefa819dae114a4b9adc32cdff42d32f2
2022-05-25 16:03:24 +08:00
Jianqun Xu
61a32e157e dma-buf: dma-heap: heap ops supports get_phys
This patch makes the dma-heap device support to get physical address by
DMA_HEAP_IOCTL_GET_PHYS. The sub heaps can add a support to this ops.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I1daf65f742ce48db5548aa3fb860bb3fb4e2291d
2022-05-25 15:13:52 +08:00
Jianqun Xu
dcbfe3bd8c dma-buf: cma_heap: support dmabuf partial sync
Add partital sync support for begain/end of cpu access.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I36cc7d2fffd1e22d796d429c76a990542acb8dd2
2022-05-25 15:10:38 +08:00
Jianqun Xu
33b98bf612 dma-buf: system_heap: do force sync only if attachment list empty
When the dmabuf attachment list is empty, do force sync with the heap
device, it is useful for partial access for cpu.

Fixes: 21f2fd663e ("dma-buf: system_heap: support cpu access partial dma-buf")
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ie266767aeb03a361e1541ba9e84f3dd027350a75
2022-05-25 10:50:57 +08:00
Wyon Bi
22e04a3fa8 Revert "drm/bridge: Add support for Lontium LT8912"
This reverts commit 230f7f0610.

Remove unused driver.

Change-Id: Id4ae232cbc6a76af85aaedbf80749de18f16b5bb
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2022-05-24 17:55:04 +08:00
Wyon Bi
f2ff5c1ed3 Revert "dt-bindings: display: bridge: Document Chipone ICN6211 MIPI-DSI to RGB bridge bindings"
This reverts commit 4d076eca04.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I243d6a7daec50744d5133f685369444b727aaea2
2022-05-24 17:55:04 +08:00
Wyon Bi
2a026e7a11 Revert "drm/bridge: Add support for Chipone ICN6211"
This reverts commit 7b2a7b73e4.

Remove unused driver.

Change-Id: I9628d07910b5705773fb5c5cf72e34ec28e53601
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2022-05-24 17:48:58 +08:00
Jon Lin
030a8a1290 rkflash: Add clang compile version
Change-Id: I04cadb7734604cb63460af465462f192bb67d5b5
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-05-24 17:43:30 +08:00
David Wu
c6e9fc1900 net: phy: rk630phy: Read txlevel from efuse
Add the function of reading efuse txlevel, if it cannot be read,
use the default value.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I1d92f139312e0ea67f96017cac2370fe00a7de31
2022-05-24 17:30:40 +08:00
David Wu
afac3d7850 ethernet: stmmac: dwmac-rk: Read bgs value from efuse for rv1106
Add the function of reading efuse bgs, if it cannot be read,
use the default value.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I6895766d342407a0a0b6011f0ea121770008e291
2022-05-24 17:30:40 +08:00
David Wu
ab214f610d ARM: dts: rockchip: rv1106: Add efuse otp property for ethernet
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I74a44c65a070e9da57168e8a01549ea2ab67b714
2022-05-24 17:24:35 +08:00
Li Huang
54e7d90e84 video: rockchip: rve: fixup memory leak
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I4d98bd853120e1ff35317595c739a942eae2c1f3
2022-05-24 16:13:30 +08:00
Li Huang
1bf753648b video: rockchip: rve: update to 1.0.4
The internal context is automatically canceled after calling commit
by default.

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I40f14fa0bddb95475a5cc76911a30df2ea1e122c
2022-05-24 16:13:30 +08:00
Steven Liu
f43f47a4cb soc: rockchip: amp: support Power Domain protection.
For some rockchip SOCs, Power Domain protection is supported
in AMP system.

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I1e0cbde37df44dba466fc580b7f67d0053d09e3d
2022-05-24 14:34:25 +08:00
Ziyuan Xu
4f34bb9c60 ARM: dts: rockchip: rv1106g-evb2: add cmdline partitions layout
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I7919dafe1943e5bdd63a8c52363c2eebdab72e87
2022-05-24 09:24:59 +08:00
Frank Wang
12b2ec6090 mailbox: rockchip: add irq wake up support
Parse and enable irq wakeup if the "wakeup-source" property was present.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I21b974d65dc02c1f3bd5f0e52a1372367b77a6e4
2022-05-24 09:21:20 +08:00
Frank Wang
30a38eea6d dt-bindings: mailbox: rockchip: add wakeup-source
Mailbox irq can be used as a wakeup source when the "wakeup-source"
property was present.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I11df0a1ced263214a8204c4944343e21d5935454
2022-05-24 09:21:20 +08:00
Li Huang
64ae074863 video: rockchip: rga3: debugger support dump pid info
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I4ee2f64e31e33fa95ea85d0db07d55d8d3626142
2022-05-23 16:40:59 +08:00
Damon Ding
2e8ee4879f drm/rockchip: rgb: add support for mcu interface and panel
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Idb70e76517b27adbd719b21ffa7ca8589636f8cf
2022-05-23 16:27:30 +08:00
Li Huang
5e20e620a5 video: rockchip: rve: disable signal interruptible
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ib70ca76d4e82cd12982b67581af4e5095372c97a
2022-05-23 16:24:19 +08:00
Yu Qiaowei
1a95c96067 video: rockchip: rga3: Make sure to write to the correct virtual address
Update driver version to 1.2.13

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I1373fba20207471eab0b9d587e5da6537e6daf0b
2022-05-23 15:10:55 +08:00
Sandy Huang
23d9761745 drm/rockchip: rgb: of_device_id->data maybe null
Fixes: b7224cb77c ("drm/rockchip: rgb: add encoder atomic API mode_valid")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I69bcec337b2adddf24c9f8930ea98afc23a76cc5
2022-05-23 10:31:44 +08:00
Wang Panzhenzhuan
f284e1d74e dt-bindings: media: i2c: add aw36518
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ifa931cbb5523d5601baf890a7ec4c254d5434685
2022-05-23 10:28:21 +08:00
Wang Panzhenzhuan
312c8af489 media: i2c: add aw36518 flash driver
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I4a5f2fd77257a83699b2c6d5e72d6044b2a78ae0
2022-05-23 02:19:43 +00:00
Wang Panzhenzhuan
7c80e0d9bf media: i2c: sgm3784: fix compile error
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I7ba480f5e76d98dcdd801c7ea7ab13173427f3ca
2022-05-23 10:01:41 +08:00
Finley Xiao
dccdbe6e4f arm64: dts: rockchip: rk3308k use rockchip,high-temp-max-freq
As the opp voltage may be changed if enable pvtm, it's better to use
rockchip,high-temp-max-freq.

Change-Id: If480a6ffa23efa9213b3b809f3cde320ce2a5ddd
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2022-05-21 20:59:40 +08:00
Finley Xiao
91ac588a05 arm64: dts: rockchip: rk3308 modify cpu opp table for rk3308bs
Change the maximum frequency of cpu to 1104MHz.

Change-Id: I4dddd81907dc3bb7dd55c0a8eda41b16990ca203
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2022-05-21 20:59:40 +08:00
Finley Xiao
be9d5e454a arm64: dts: rockchip: rk3308k change sustainable power for rk3308bs
Change-Id: I83dc3ead5d9a0bed474d80bc5a1b10b61febe5dc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2022-05-21 20:59:40 +08:00
Dingqiang Lin
3ef790140c arm64: dts: rockchip: rk3308 add sfc node
Change-Id: Ie45bd51d2f56d296a9eadd1dfea5d2a903f29e6c
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2022-05-21 20:59:40 +08:00
Jianqun Xu
58dde24831 arm64: dts: rockchip: rk3308 sync dt file
Sync the local dt file with upstream version.

Change-Id: Ied3781bfdde114f86e124dd4e02139ff80e74137
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2022-05-21 20:59:37 +08:00
Finley Xiao
4eee9d85c5 arm64: dts: rockchip: rk3308 add cpu boost device node
Change-Id: Id218fce81d87c103d9b3d4650f66633c6855a26e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2022-05-21 20:58:29 +08:00
Jeffy Chen
86b7ceea2d arm64: dts: rockchip: rk3308 add rk-timer-rtc node
Change-Id: Icc2b598936b3daa2a2b8138315b0cc8f71c91733
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2022-05-21 20:58:29 +08:00
David Wu
0e137ab4d1 arm64: dts: rockchip: rk3308 add mac node
Change-Id: I6023ccfb6d318ede47693c5fe57a481d641df22e
Signed-off-by: David Wu <david.wu@rock-chips.com>
2022-05-21 20:58:29 +08:00
Sugar Zhang
31dac74164 arm64: dts: rockchip: rk3308 add i2s node and pdm node
Change-Id: I9fdc000223ad2f5dbf69e31d67a5bc7b3bc4467d
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2022-05-21 20:58:29 +08:00
Lin Jinhan
f9cd3c093c arm64: dts: rockchip: rk3308 add rng node
Change-Id: I66432ed414a47dc9f7ff1145564cd696cd93805b
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2022-05-21 20:58:21 +08:00
Xing Zheng
9d9eab22d6 arm64: dts: rockchip: rk3308 add acodec node
Change-Id: I76f4a877711d33620bdef295e9047bdba26d4da4
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2022-05-21 18:45:57 +08:00
Dingqiang Lin
bc1e7f87c4 arm64: dts: rockchip: rk3308 add nandc node
Change-Id: If46f74981d71cc325e7459e11651173632c120ea
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2022-05-21 18:45:57 +08:00
Finley Xiao
c1d316d9b8 arm64: dts: rockchip: rk3308 add cpuinfo device node
Change-Id: If91b4a3945a368ad50914cb0fd0cfce41600d514
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2022-05-21 18:45:57 +08:00
Finley Xiao
d8e9b351a3 arm64: dts: rockchip: rk3308 add opp tables
Change-Id: I4dfb21c982884ba7e8f3397f9512c200a50831e5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2022-05-21 18:45:57 +08:00
Huibin Hong
ed31d21f81 arm64: dts: rockchip: rk3308 add fiq debugger node
Change-Id: Ie64336bd0046c1a5619e243775ed6807b0568118
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2022-05-21 18:45:57 +08:00
Huibin Hong
4ce0e91d98 arm64: dts: rockchip: rk3308 add ramoops node
Change-Id: I0b2e4ab39670b20532100a932bf75cd422fc9628
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2022-05-21 18:45:57 +08:00
Finley Xiao
552ddda397 arm64: dts: rockchip: rk3308 change maximum voltage for cpu
Add support for rk3308bs v11 board whose maximum voltage is 1336000uV.

Change-Id: I14474838d4341c8f146a503486c7005f386c1475
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2022-05-21 18:45:57 +08:00