Liang Chen
c44ab0fa47
soc: rockchip: opp_select: adjust opp-table by otp
...
Signed-off-by: Liang Chen <cl@rock-chips.com >
Change-Id: I8d642bbcb4dafcfa62d85cf108623e92f6fd4572
2023-02-15 18:40:44 +08:00
Elaine Zhang
78cef6d343
regulator: fan53555: add tcs452x
...
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I7d9f02f637108e941e526e21bd0e24d6f99cd328
2023-02-15 18:39:49 +08:00
Joseph Chen
b19cb16194
arm64: dts: rockchip: Update tcs425x to tcs4525 or tcs4526
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com >
Change-Id: Ieb3e514877099f1073475cd24b6319ba7db8543d
2023-02-15 18:39:02 +08:00
shengfei Xu
5049740976
regulator: fan53555: support reboot
...
Fixes: 91c0d689ea ("Revert "regulator: fan53555: support reboot"")
Signed-off-by: shengfei Xu <xsf@rock-chips.com >
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I143fc44f49c95f01248c72a8f48282bf984b826b
2023-02-15 18:38:37 +08:00
Rudi Heitbaum
c1700419cd
UPSTREAM: regulator: fan53555: add tcs4526
...
For rk3399pro boards the tcs4526 regulator supports the vdd_gpu
regulator. The tcs4526 regulator has a chip id of <0>.
Add the compatibile tcs,tcs4526
without this patch, the dmesg output is:
fan53555-regulator 0-0010: Chip ID 0 not supported!
fan53555-regulator 0-0010: Failed to setup device!
fan53555-regulator: probe of 0-0010 failed with error -22
with this patch, the dmesg output is:
vdd_gpu: supplied by vcc5v0_sys
The regulators are described as:
- Dedicated power management IC TCS4525
- Lithium battery protection chip TCS4526
This has been tested with a Radxa Rock Pi N10.
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com >
Link: https://lore.kernel.org/r/20210602112943.GA119@5f9be87369f8
Signed-off-by: Mark Brown <broonie@kernel.org >
(cherry picked from commit 5eee5eced9 )
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I9f4d649df82e6b052d74c890abef08dd08eb985e
2023-02-15 18:17:20 +08:00
Axel Lin
a0ccf3aabc
UPSTREAM: regulator: fan53555: Fix missing slew_reg/mask/shift settings for FAN53526
...
The di->slew_reg/di->slew_mask/di->slew_shift was not set in current code,
fix it.
Fixes: f2a9eb975a ("regulator: fan53555: Add support for FAN53526")
Signed-off-by: Axel Lin <axel.lin@ingics.com >
Link: https://lore.kernel.org/r/20210525124017.2550029-1-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org >
(cherry picked from commit 30b38b805b )
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I45888035e0c7591d986803737f983185dee31964
2023-02-15 18:17:20 +08:00
Axel Lin
046932a8e0
UPSTREAM: regulator: fan53555: Cleanup unused define and redundant assignment
...
TCS_VSEL_NSEL_MASK is not used so remove it.
Also remove redundant assignment for di->slew_reg.
Signed-off-by: Axel Lin <axel.lin@ingics.com >
Link: https://lore.kernel.org/r/20210517010318.1027949-2-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org >
(cherry picked from commit 79c7e1447c )
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I9e2d2ec3113e8706053c49f2fe42e14e89d22eaa
2023-02-15 18:17:19 +08:00
Axel Lin
92d2f71eee
UPSTREAM: regulator: fan53555: Fix slew_shift setting for tcs4525
...
Fix trivial copy-paste mistake.
Signed-off-by: Axel Lin <axel.lin@ingics.com >
Link: https://lore.kernel.org/r/20210517010318.1027949-1-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org >
(cherry picked from commit a7f003147b )
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I380536fe8ced404f045745301b538806d7b1f50d
2023-02-15 18:17:19 +08:00
Peter Geis
c998ab0bed
UPSTREAM: regulator: fan53555: fix tcs4525 function names
...
The tcs4525 is based off the fan53526.
Rename the tcs4525 functions to align with this.
Signed-off-by: Peter Geis <pgwipeout@gmail.com >
Link: https://lore.kernel.org/r/20210511211335.2935163-4-pgwipeout@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org >
(cherry picked from commit b3cc8ec04f )
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I553a8f6b28386d78edb9db36f72c0f4b93bc2b76
2023-02-15 18:17:19 +08:00
Peter Geis
73b5c3105e
UPSTREAM: regulator: fan53555: only bind tcs4525 to correct chip id
...
The tcs4525 regulator has a chip id of <12>.
Only allow the driver to bind to the correct chip id for safety, in
accordance with the other supported devices.
Signed-off-by: Peter Geis <pgwipeout@gmail.com >
Link: https://lore.kernel.org/r/20210511211335.2935163-3-pgwipeout@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org >
(cherry picked from commit f9028dcdf5 )
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I68b8935e9e9d76620c54d132e7cb6921d817582e
2023-02-15 18:17:19 +08:00
Peter Geis
b895b708f7
UPSTREAM: regulator: fan53555: fix TCS4525 voltage calulation
...
The TCS4525 has 128 voltage steps. With the calculation set to 127 the
most significant bit is disregarded which leads to a miscalculation of
the voltage by about 200mv.
Fix the calculation to end deadlock on the rk3566-quartz64 which uses
this as the cpu regulator.
Fixes: 914df8faa7 ("regulator: fan53555: Add TCS4525 DCDC support")
Signed-off-by: Peter Geis <pgwipeout@gmail.com >
Link: https://lore.kernel.org/r/20210511211335.2935163-2-pgwipeout@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org >
(cherry picked from commit d4db69eba2 )
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I26e61bbded2df512cbca0989e7df1217b677ca1b
2023-02-15 18:17:19 +08:00
Joseph Chen
9b5ca694ba
UPSTREAM: regulator: fan53555: Add TCS4525 DCDC support
...
TCS4525 main features:
- 2.7V to 5.5V Input Voltage Range;
- 3MHz Constant Switching Frequency;
- 5A Available Load Current;
- Programmable Output Voltage: 0.6V to 1.4V in 6.25mV Steps;
- PFM/PWM Operation for Optimum Increased Efficiency;
Signed-off-by: Joseph Chen <chenjh@rock-chips.com >
[Ezequiel: Forward port]
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com >
Link: https://lore.kernel.org/r/20210421210338.43819-3-ezequiel@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org >
(cherry picked from commit 914df8faa7 )
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I8297b212781059721b37bce1bf15bb1c5804fdd6
2023-02-15 18:17:19 +08:00
Elaine Zhang
a7acf5eb23
Revert "regulator: fan53555: fix up the dcdc is disabled when reboot"
...
This reverts commit 14d85ea556 .
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I5c65709aa3d94e00157b8d73cdba6fb8ba006463
2023-02-15 18:17:19 +08:00
Elaine Zhang
1387f9a1c8
Revert "regulator: fan53555: add TCS4525 DCDC support"
...
This reverts commit 1ca735225a .
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I220561a0e2876bb217309e14305e6e37e6ef51b2
2023-02-15 18:17:19 +08:00
Elaine Zhang
389d57ff48
Revert "regulator: fan53555: add support for Rockchip RK860X regulators"
...
This reverts commit dbeca9d00a .
RK860X please use rk860x-regulator.c
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I5dfb8a363cb5ea14397b5c183d931928792025b6
2023-02-15 18:17:19 +08:00
Elaine Zhang
91c0d689ea
Revert "regulator: fan53555: support reboot"
...
This reverts commit 7d0153aa70 .
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com >
Change-Id: I384b97e360d3954ea3798a127692d76c41433110
2023-02-15 18:17:19 +08:00
Yandong Lin
5df3a678bf
vdieo: rockchip: mpp: fix av1d iommu compile warning
...
drivers/video/rockchip/mpp/mpp_iommu_av1d.c:911 av1_iommu_probe() warn:
missing unwind goto?
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com >
Change-Id: Ia3ae5df50fa9d5ca7df84547b9b31d3ecd229922
2023-02-15 17:52:24 +08:00
Damon Ding
64c43c16fb
dt-bindings: display: virtual-connector: add virtual devices support
...
Signed-off-by: Damon Ding <damon.ding@rock-chips.com >
Change-Id: I409ab14126c42b61340aa806525a8c4d04d37a70
2023-02-15 17:50:29 +08:00
Lin Jinhan
5e16d409fe
arm64: dts: rockchip: rk3528: trng use scmi clk
...
Change-Id: I7a8bb9e824e9e7732a8fc497a2c828980086bd65
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com >
2023-02-15 09:37:43 +00:00
Joseph Chen
e18f50d371
arm64: dts: rockchip: rk3528: crypto use scmi clock and dummy softrst
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com >
Change-Id: I3340c8a2acb2ee4913e42a558f321e62f63899a2
2023-02-15 09:37:43 +00:00
Joseph Chen
b5f76296d3
clk: rockchip: rk3528: Remove trng clock
...
It was moved to scmi clock.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com >
Change-Id: I51d0c70cb408af0c8a82a16133b3706c9c425cde
2023-02-15 09:37:43 +00:00
Joseph Chen
3ca63279a0
clk: rockchip: rk3528: Remove crypto clock
...
They are moved to scmi clock.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com >
Change-Id: I093a0f964c525efdf3a78fe5070c1860edac5a3c
2023-02-15 09:37:43 +00:00
Damon Ding
df5b684fe9
drm/rockchip: vconn: add support for DRM_MODE_CONNECTOR_VIRTUAL
...
Support for multiple virtual connectors. The dts maybe
like:
vconn {
compatible = "rockchip,virtual-connector";
virtual-connector-count = <2>;
/*
* virtual0 connected by default
* virtual1 disconnected
*/
virtual1-disconnected;
status = "okay";
};
Signed-off-by: Damon Ding <damon.ding@rock-chips.com >
Change-Id: I0871031fdeb124c2b7a6d77f5bf1aa111c3e093e
2023-02-15 17:07:08 +08:00
Tao Huang
8cb1b2ad50
rk: scripts: update mkbootimg/unpack_bootimg
...
AOSP f85a2fd5640d ("Revert "unpack_bootimg: Export 'vendor_ramdisk' for vendor_boot v4"")
Revert 7261bb083a97 ("Check DTB image size for boot image header version 2 and above")
which failed to repack image without dtb.
Include gki.generate_gki_certificate.
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
Change-Id: Ibf9543fd4a10547f9d956b6ffc09834389fbb20f
2023-02-15 16:30:35 +08:00
Cai YiWei
5f8124c0ae
media: rockchip: isp: fix build warn
...
Change-Id: I1bf4a66df7f39275a3b670a2ff6dd457f69e6634
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2023-02-15 15:28:01 +08:00
Algea Cao
28c7e47817
phy: rockchip: inno-hdmi: Fix 'warn: missing unwind goto'
...
Signed-off-by: Algea Cao <algea.cao@rock-chips.com >
Change-Id: I7044cc4e7268c9899f43eb927f29084e2e2f34b2
2023-02-15 15:27:28 +08:00
Tao Huang
c52799a13c
clk: rockchip: pvtm: Fix rockchip_clock_pvtm_get_value() timeout
...
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
Change-Id: I04e02ab210c682eca7c78e3f9229498c41568adf
2023-02-15 15:14:57 +08:00
Algea Cao
97811627ff
phy: rockchip-samsung-hdptx-hdmi: Reduce ROPLL loop bandwidth
...
24M clock noise is carried into the PHY ROPLL loop filter.
Due to the low noise frequency, it can pass through the low-pass loop
filter of ROPLL, resulting in hdmi flash. Reduce ROPLL loop bandwidth
can solve this problem.
Signed-off-by: Algea Cao <algea.cao@rock-chips.com >
Change-Id: Ibea774bc26ea8c2b06cf79c84b6cd6456df66ea5
2023-02-15 15:14:18 +08:00
Jon Lin
c544fe878d
PCI: rockchip: dw: Fix warning in initial progress
...
1.missing unwind goto
2.Value stored to 'ret' is never read
Fixes: fa919e9611 ("pcie: rockchip: dw: Support dmatest")
Change-Id: I20ae68b97a6512cbb340668b1ffb7811dc6ef674
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2023-02-15 15:13:06 +08:00
Cai YiWei
3080b1c4e8
Revert "media: rockchip: isp: extend pixel to 32 for isp30 unite mode"
...
This reverts commit b3260da5e9 .
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
Change-Id: I3c322a0d187fcfcf38daac2dbd0f4ada6fd89fe4
2023-02-15 14:13:27 +08:00
Wang Panzhenzhuan
ce99bb8b5b
arm64: dts: rockchip: rk3568-evb1: add dual camera
...
add dtsi & dts for gc2093+gc2053 dual camera module
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com >
Change-Id: I4e0111db8ade20ead54188a2eed5b91dff350cb4
2023-02-15 11:07:11 +08:00
Jianqun Xu
a2e98940ee
Revert "drm/rockchip: gem: add dmabuf sync partial to dma_buf_ops"
...
This reverts commit 64097b127c .
Change-Id: I18917edcda996538b09da55d999dcb76544fdafb
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com >
2023-02-14 17:52:31 +08:00
Wangqiang Guo
002ff3ed95
arm64: dts: rockchip: rk3562-evb2: add camera dtsi.
...
Add dts for gc8034 on rk3562 evb2 board.
Change-Id: I3d190106b40b21f27f9c9f474a882238bcf0cb87
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com >
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com >
2023-02-14 15:52:57 +08:00
Damon Ding
b942725058
arm64: dts: rockchip: rk3562-evb: fix mcu display board naming errors
...
Fix board model and compatible and remove bl-gpios in
mcu_panel node.
Signed-off-by: Damon Ding <damon.ding@rock-chips.com >
Change-Id: I80b696e4df0cd409023b9656c5a13ba850d15340
2023-02-14 15:27:33 +08:00
Zhang Yubing
8b2a7f9145
phy: rockchip-typec: add support to tcpm framework
...
add support to tcpm framework and remove extcon.
Change-Id: I6ea7aa21b65a50eca2d85f8959d8d317184204e2
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com >
2023-02-14 14:44:36 +08:00
Damon Ding
5156642dd9
arm64: dts: rockchip: rk3562-evb: add rgb->panel display board
...
RGB panel FX070-DHM11BOE-A supports RGB666 and RGB888 mode.
Signed-off-by: Damon Ding <damon.ding@rock-chips.com >
Change-Id: Ice4688d7f9ff66094836baf474e09ed8edba747a
2023-02-14 14:31:14 +08:00
Hu Kejun
00d76e6608
media: i2c: dw9714: fix i2c error in resume function
...
Signed-off-by: Hu Kejun <william.hu@rock-chips.com >
Change-Id: Ieb2b4f0c7a3bdef20392b746c7330fb6a0a72df1
2023-02-14 11:20:56 +08:00
Zhang Yubing
982a6aceb1
arm64: dts: rockchip: rk3399-evb-ind: add dp alt mode node
...
Add dp alt mode node to support tcpm
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com >
Change-Id: I8130045074c9bc8c8b8223f44ebe5341db20b97d
2023-02-14 10:01:39 +08:00
Cai YiWei
e83e121d6f
media: rockchip: isp: add iqtool video for isp32 lite
...
Change-Id: If5d31fc2b75e9aa0980044c47a8e429cc7e2a1b5
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2023-02-14 09:54:27 +08:00
Cai YiWei
dcd2ac21b1
media: rockchip: isp: add rk3562 config
...
Change-Id: I52cbcc819036b9b594a1fac0a24e8447c8ea536c
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2023-02-14 09:54:13 +08:00
Cai YiWei
b38fc755a5
media: rockchip: isp: add isp32 lite
...
Change-Id: I3cdd29809e629df7903605d07e2dd2da40bcef01
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2023-02-14 09:54:06 +08:00
Finley Xiao
9fe7f38147
clk: rockchip: rk3562: Add ROCKCHIP_PLL_ALLOW_POWER_DOWN for apll vpp and hpll
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
Change-Id: I95661f4f17245487169afd7f8a70f845f95ddb6d
2023-02-13 19:31:59 +08:00
Finley Xiao
deb2de164b
clk: rockchip: rk3562: Add ROCKCHIP_PLL_ALLOW_POWER_DOWN flag
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
Change-Id: I7047fee17bd26e6b23fb84b431010880ff577276
2023-02-13 19:31:59 +08:00
Finley Xiao
813eabe45b
clk: rockchip: rk3562: Make aclk pclk core CLK_IGNORE_UNUSED
...
Don't add enable count to apll.
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
Change-Id: Id970ba227033599e894b3108af29bc6d2ae0cda5
2023-02-13 19:31:59 +08:00
Finley Xiao
ddea4b4025
clk: rockchip: rk3562: change pll to slow mode before power down
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com >
Change-Id: I7ee6d2478bc012bf70ca061738534ed57d1612f0
2023-02-13 19:31:59 +08:00
Yandong Lin
0ce21e2477
video: rockchip: mpp: fix jpege dma coherence issue for rkvenc2
...
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com >
Change-Id: Ida23480b46ce37bcd40b1f7de7907e889b267fc4
2023-02-13 18:50:37 +08:00
Hongming Zou
3ab683e330
ARM: dts: rockchip: rk3036-evb1: fix es8311 default aec mode
...
For products with light performance like RK3036, the playback
function may not be so important, and the stereo recording can
be guaranteed first. Therefore, the default left channel is ADC
input data.
Change-Id: Iffc51986f58fd5946a35ea39d12104b2e1f2d39f
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com >
2023-02-13 18:40:50 +08:00
Hongming Zou
b7b36e0653
ARM: dts: rockchip: rk3036-evb1: add support multi-sounds and spdif-sound
...
Change-Id: Id0f7286003f08aeb0632a28cf1f08c1f2799010b
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com >
2023-02-13 18:40:50 +08:00
Hongming Zou
ec0ab20967
ARM: dts: rockchip: rk3036: update acodec compatible to rockchip,rk3036-codec
...
Change-Id: I094a62ccd06f4b62bb175cc7260117622628cd30
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com >
2023-02-13 18:40:50 +08:00
Hongming Zou
5ee5151fed
ARM: dts: rockchip: rk3036: remove hdmi_sound node
...
Change-Id: I3cb4010e255559c31eb0fe46c14b3f700b060d64
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com >
2023-02-13 18:40:50 +08:00