Commit Graph

859298 Commits

Author SHA1 Message Date
Wyon Bi
3631fa6e38 ARM: dts: rockchip: Add support for rk3288-evb-rk628 board
Change-Id: I7b900c16a9ea30590220a1cf95a84e018fa701e2
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:59 +08:00
Wyon Bi
d6feca9685 ARM: dts: rockchip: Add dtsi file for rk628
Change-Id: I4b2a092d4c403a17c83371c5a6165b2ae5ec0eb8
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
afd057d164 ARM: rockchip_defconfig: enable CONFIG_DRM_ROCKCHIP_RK628
Change-Id: I5026a61d973ca264f3c7cb2bb9088a5f2cffabb3
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
e285c9b20e drm/rockchip: Add rk628 display driver
Change-Id: I7be65c5ed58df2be2cf2cfe819feacf8a610e880
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
bd9377a5be phy: add GVI/HDMI modes to the phy_mode enum
This patch adds more generic PHY modes to the phy_mode enum, to
allow configuring generic PHYs to the GVI/HDMI mode by
using the set_mode callback.

Change-Id: Ib859024d7bd59cd39bff5e06f2b2ca133b023414
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
96ebaa7857 ARM: rockchip_defconfig: enable CONFIG_MFD_RK628
Change-Id: I4ceffc60908c6c1a974936673f36180aed41d85d
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
c4586725c3 mfd: Add rk628 mfd driver
Change-Id: Ibf4334f82f91237bff6a04b24bb390391a5c8130
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Weixin Zhou
4a70b21012 pinctrl: rk628: add rk628 pinctrl driver
Change-Id: If9d0fdcd63e7ceb9a52039f558961c2b67739747
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
a416ee3e3a clk/rockchip/regmap: Add rk628 cru driver
Change-Id: Idf8d8a654c6d6d5e382f8bf591e7c9c8135ff1d4
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
962d002400 clk/rockchip/regmap: Prepare RK628 PLL support
Change-Id: I45049b298de7635c08f92cd89db08b86ba6901f3
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
459a08874a clk/rockchip/regmap: pll: limit postdiv2 max value
Change-Id: I0dcb5001960cf0dcaa82f992b7d428f6d08678ff
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
0d3f9ae026 clk/rockchip/regmap: pll: fix integer overflow in clk_pll_round_rate
Change-Id: I94c90f400f69351f9e592f44c2e167a98d96945f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:58 +08:00
Wyon Bi
d6a89a1517 clk/rockchip/regmap: pll: fix integer overflow in frac rate calculation
Change-Id: I6f538a3cb77c5d4099c9fd4f704c4b5b09c97408
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:57 +08:00
Wyon Bi
5364dbebf7 clk/rockchip/rk618: rename directory to "regmap"
Change-Id: Ia2446b588d4fecc947caa87751ea988deafa25fe
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:36:57 +08:00
Wyon Bi
3540f8b38b clk/rockchip/rk618: Add codec fractional divider support
Change-Id: I2c8aaee30ad04f4e8c598658326e9c7587814316
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:22:18 +08:00
Wyon Bi
6817aad45a clk/rockchip/rk618: composite: allow fractional divider
Change-Id: I932d59aefe43831d54230e767f46f3876d5b1404
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:22:18 +08:00
Wyon Bi
886bf5ab97 clk/rockchip/rk618: support for fractional divider
Change-Id: I02d065ec3dda1d089d2c9788384e84e7289b2820
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-10-19 15:22:18 +08:00
Yao Xiao
dd052636f6 net: rockchip_wlan: rkwifi: Kconfig: remove unuse config
Fixes: ef0479c9ed ("net: rockchip_wlan: ap6xxx: support keepalive during host shutdown")
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: Ife4048deebd7a76b572865ce7094a623508df29d
2020-10-19 14:10:06 +08:00
Steven Liu
377d6ef68f pwm: rockchip: Get pwm clk_rate in pwm_probe function
The clk_get_rate function is used in pwm_apply and pwm_config.
And it is not allowed in interrupt calls due to a mutex.
So move it into pwm_probe function.

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I1766f282ccd1047e41f30cc55e3312fefe4b7388
2020-10-19 09:36:32 +08:00
Hu Kejun
d383f0568f media: rockchip: isp: fix lsc error when ldch is on
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I51c31edbf098367b9917170b3611de4c597fd7ca
2020-10-16 18:10:10 +08:00
Shunqing Chen
7e7bfdb784 drm/bridge: synopsys: dw-hdmi: Fix color abnormal of RGB to YCBCR 10bit
Change-Id: Ia045ef5c36db806dd702193dc9188cb303ac9284
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2020-10-16 15:40:35 +08:00
Shunqing Chen
e87a9de45c drm: rockchip: dw-hdmi: add YCbCr420 support for RK3288W
Change-Id: I47621ca905b9e32550f0274efe6dc35df0490e3a
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2020-10-16 15:40:18 +08:00
Shunqing Chen
f6800c8bd6 drm: bridge: dw-hdmi: Fix the issue of EXTCON_DISP_HDMI state error
First, echo off > sys/class/drm/card0-HDMI-A-1/status, the EXTCON_DISP_HDMI state is 0.
Then, echo detect > sys/class/drm/card0-HDMI-A-1/status, the EXTCON_DISP_HDMI state still is 0.
As a result, HDMI has no sound.

Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I6d7904cb75fec21899389dbaba8acbd266dac7cd
2020-10-16 15:40:09 +08:00
Zhen Chen
3e0ba08f66 arm64: dts: rockchip: rk3568: Add GPU device node
Change-Id: Icaf7dd79b1c8bd82184e6f27ff6bc2c57c7657f9
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2020-10-16 15:20:23 +08:00
Steven Liu
2980da404a dt-bindings: pwm: rockchip: Add pwm center-aligned optional property
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ic1b8c9e13d12bc730eab2564784c71eb0d0ce796
2020-10-16 15:00:44 +08:00
Tao Huang
9426f36ed1 Revert "pwm: add rockchip-pwm.txt"
This reverts commit e623668278.
Remove unused Documentation/devicetree/bindings/pwm/rockchip-pwm.txt.

Change-Id: Ic938aea5aee8174f3c4d51bbe58a2a49c819ecc6
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-10-16 14:15:24 +08:00
Steven Liu
8ec4d4522f pwm: rockchip: Add pwm output center aligned mdoe
Support pwm output aligned mode to switch from  left-aligned
to center-aligned. In dts, add "center-aligned".

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I3e699c873a9ef533e59e11dbf9777001f205b4d9
2020-10-16 10:25:51 +08:00
Ding Wei
b9d7e4ad9e video: rockchip: mpp: add session info for rkvenc and vepu2
usage:
    show all session info
        cat /proc/mpp_service/session_summary
    show session info for rkvenc
        cat /proc/mpp_service/rkvenc/session_info
    show session info for vepu
        cat /proc/mpp_service/vepu/session_info

Change-Id: Ide903ddbe2c1584eb07fc56693b324c70012e20e
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-15 20:15:14 +08:00
Shawn Lin
0fe7f82bb2 mmc: sdhci-of-dwcmshc: Initial support for rockchip platform
Change-Id: I25a54059a56f939996de89076550e6a0bb8404e0
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-15 19:57:35 +08:00
Yu Qiaowei
3d9255c8df video/rockchip: rga2: Fix src cannot be set to BT.601-range0.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: If4a68da68e4e6c99ac00ee50fec9eaa2f0112ebf
2020-10-15 19:47:54 +08:00
Finley Xiao
57dfaaf4e6 ARM: dts: rockchip: rv1126: Add leakage info for cpu, npu and vepu
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia0f0b61f77d22708064058960d38b240988d9bc3
2020-10-15 19:46:07 +08:00
Finley Xiao
3aa3abee3e soc: rockchip: opp_select: Add support to get leakage for rv1126
The leakage value is a decimal on RV1126, let it multiply by 1000 for
changing voltage and frequency scale according to leakage. And round up to
the nearest whole number for calculating static power, it does not need
to be precise.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I8ae256eb8e725503c744be2011a5edc7275d47cc
2020-10-15 19:44:59 +08:00
Sugar Zhang
0e5a994307 nvmem: rockchip-otp: Add write protection for oem zone
This patch reserved 16 bytes at the tail for write protection
and future extension.

+----------+------------------+--------------------------+
| TYPE     | RANGE(byte)      | NOTE                     |
+----------+------------------+--------------------------+
| system   | 0x000 ~ 0x0ff    | system info, read only   |
+----------+------------------+--------------------------+
| oem      | 0x100 ~ 0x1ef    | for customized           |
+----------+------------------+--------------------------+
| reserved | 0x1f0 ~ 0x1f7    | future extension         |
+----------+------------------+--------------------------+
| wp       | 0x1f8 ~ 0x1ff    | write protection for oem |
+----------+------------------+--------------------------+

+-----+    +------------------+
| wp  | -- | wp for oem range |
+-----+    +------------------+
| 1f8 |    | 0x100 ~ 0x11f    |
+-----+    +------------------+
| 1f9 |    | 0x120 ~ 0x13f    |
+-----+    +------------------+
| 1fa |    | 0x140 ~ 0x15f    |
+-----+    +------------------+
| 1fb |    | 0x160 ~ 0x17f    |
+-----+    +------------------+
| 1fc |    | 0x180 ~ 0x19f    |
+-----+    +------------------+
| 1fd |    | 0x1a0 ~ 0x1bf    |
+-----+    +------------------+
| 1fe |    | 0x1c0 ~ 0x1df    |
+-----+    +------------------+
| 1ff |    | 0x1e0 ~ 0x1ef    |
+-----+    +------------------+

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: If23bb8d77d684a3bff5797e35914c1f897c69fb0
2020-10-15 19:42:14 +08:00
Sugar Zhang
fd2a7f4f91 nvmem: rockchip-otp: Add magic-number for enable otp write func
This patch add magic for enable otp write func to avoid unexpected written.

e.g.:

echo 1380926283 > /sys/module/nvmem_rockchip_otp/parameters/rockchip_otp_wr_magic

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0d2d5fe97de4f69f2a30142d62a21e17d818d98f
2020-10-15 19:34:13 +08:00
Yiqing Zeng
2a30e12977 media: i2c: imx335 fix comile error
Fixes: a9b8a1ef99 ("media: i2c: imx335 add hdr_mode in enum frame interval")
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I6e6f143b75784dcc8dffbbfe1e4a6945b0699ccb
2020-10-15 18:44:57 +08:00
Yao Xiao
efdfe27e17 ARM: dts: rv1126-bat-ipc-v10: add nodes for wifi keepalive
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: Id59d95230691a98193abcf1e3f4c7dc4c5d0930c
2020-10-15 17:27:41 +08:00
Yao Xiao
36a2d0b595 net: rfkill-wlan: support chip alive and add wifi power node
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: I481e415f29840db332381750ad266067f15dbac7
2020-10-15 17:05:34 +08:00
Yao Xiao
2447df1bef mmc: support logic_card and alive_card for sdio
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: Ic51f0dfb3bb2de2e1f52ab5e24dbeaebc729ec99
2020-10-15 16:58:36 +08:00
Jianqun Xu
7517c89360 arm64: dts: rockchip: rk3568 add io-domain for evb
The io-domain node should be matched to hardware power tree, lookup to
IO Power Domain Map on EVB Schematics For RK3568 file.

Change-Id: I03a0a66b3b21de055912624b893322fa4880a262
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-10-15 16:32:31 +08:00
Jianqun Xu
8b375d3429 arm64: dts: rockchip: rk3568 add io-domain node
Change-Id: Ib5b4b32faa114d227f463bcb5e0c95d4ccf197a0
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-10-15 15:54:40 +08:00
Huang zhibao
e6684b5e75 input: remotectl: fix PWM_CH1_INT_ENABLE definition error
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Ib27d5ee7d25004f28978bfd797fa92f045ffb54f
2020-10-15 14:33:49 +08:00
Cai YiWei
9ebe3e376b media: rockchip: isp and ispp sync to power off
Change-Id: Iaaa74ccdc6956458e700fdcf430eba804707c200
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-15 14:32:43 +08:00
Shawn Lin
e963ad7f78 arm64: dts: rockchip: Add sdmmc nodes for RK3568 Soc
Change-Id: I79689eb666a467b12d1e6109f6fbf08399544637
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-14 20:20:24 +08:00
Shawn Lin
5bc85371a3 arm64: dts: rockchip: Add emmc node for RK3568 Soc
Change-Id: Ie7773e81bc3102379bf4aa30505c6c5cbcfadee3
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-14 20:20:19 +08:00
Zhenke Fan
d53fb08fae media: i2c: add sc200ai driver
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I25d53efa9c620c51407529414f7eebfdb315cfd6
2020-10-14 16:33:19 +08:00
XiaoDong Huang
60005ae6b0 ARM: configs: rv1126_defconfig: enable ROCKCHIP_BUS_DEVFREQ
Change-Id: Ibdb404f80fda3b3bcdcb3966b4a54b953569bcf1
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-10-14 15:23:59 +08:00
XiaoDong Huang
35ff20973c ARM: dts: rv1126: disable soc-bus11
Change-Id: I4e0fd38ca3b20c48834a9f679a1922054a97fff5
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-10-14 15:11:25 +08:00
Yao Xiao
ef0479c9ed net: rockchip_wlan: ap6xxx: support keepalive during host shutdown
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: Icf524f45da79a73134dc46e64f08a23fcab908cf
2020-10-14 14:14:41 +08:00
Weiwen Chen
d5467b9bdc ARM: dts: rockchip: rv1126: reboot-mode: add panic and watchdog
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I1068bf4cd7ac33073655cc9dfdd56d88bd5a900a
2020-10-14 14:12:02 +08:00
Wang Jie
5928c52b49 phy: phy-rockchip-usb: support to force otg mode for rk3288 soc
usage:
(1) force host mode
    echo 1 > /sys/devices/platform/ff770000.syscon/ff770000.syscon:usbphy/phy/phy-ff770000.syscon:usbphy.2/otg_mode

(2) force device mode
    echo 2 > /sys/devices/platform/ff770000.syscon/ff770000.syscon:usbphy/phy/phy-ff770000.syscon:usbphy.2/otg_mode

Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I44fa1461076e6c0cd8aba1e2e444004cfb3f5271
2020-10-14 09:54:14 +08:00