Commit Graph

859315 Commits

Author SHA1 Message Date
Wang Panzhenzhuan
dafa0a433c media: i2c: add sc4238 driver
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I049d127f3b9ce6df88ba235997167f9d0b658075
2020-10-20 14:06:47 +08:00
Jianqun Xu
b4b8e03c0a pinctrl: rockchip: add rk3568 support
Change-Id: I857882a985f10fdd8551bbacb632fe206052f40c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-10-19 17:09:49 +08:00
Yao Xiao
cc3b8684e5 net: rockchip_wlan: bcmdhd_indep_power
1. add ENABLE_INSMOD_NO_FW_LOAD for init stability
2. reduce print level
3. modify module name for keepalive

Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: I1be21817e53558945a35389ee02d8229e2b1a58a
2020-10-19 16:59:13 +08:00
Cai YiWei
1ae7b73267 media: rockchip: ispp: fix error status of stream off
Change-Id: I9cc099035889e325d225f9252c2283629214b922
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-19 16:39:36 +08:00
Sugar Zhang
bbb2cf8b90 arm64: dts: rockchip: rk3568: Add i2s/pdm/spdif/audpwm/dig_acodec
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id4d5f8ce0c63d3424e776e4b100d981bec64967d
2020-10-19 16:37:58 +08:00
Sugar Zhang
f5f629f9be ASoC: rockchip: Add support for rk3568 codec digital
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Idaab1cbe0228d48d51e505c7e5e924f02c165e93
2020-10-19 16:33:41 +08:00
Sugar Zhang
1ce1d8b44e dt-bindings: sound: rockchip: Add binding for rk3568 codec digital
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I738bdd2f47f76cab6a01ea26189217942f8c1cbb
2020-10-19 16:33:41 +08:00
Sugar Zhang
051faf3a86 ASoC: rockchip: spdif: Add support for rk3568 spdif
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ib6e80389b90396f0397a86b61fbfb2e55c8e1adf
2020-10-19 16:33:41 +08:00
Sugar Zhang
43b82f9379 dt-bindings: sound: rockchip: Add binding for rk3568 spdif
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ia3edda132bd30edf8fa80ec6ee4f25f279c5d3a9
2020-10-19 16:33:41 +08:00
Sugar Zhang
b08d29a90f ASoC: rockchip: pdm: Add support for rk3568 pdm
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I41b6c2a443e118f3a125ce7376fa349d61d78b6b
2020-10-19 16:33:41 +08:00
Sugar Zhang
a062e0df1f dt-bindings: sound: rockchip: Add binding for rk3568 pdm
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ifcaafe8b0f38748e30f1db470acca7119a496b25
2020-10-19 16:33:41 +08:00
Sugar Zhang
0ac3329e47 clk: rockchip: rk3568: Fix HCLK_ACDCDIG
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ifaf30bbdf88f24b330c0caa6861313070c5d2784
2020-10-19 16:31:19 +08:00
Sugar Zhang
c66ee6a770 ASoC: rockchip: Add support for rk3568 i2s
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I5d4abfd94e627417258bc937b58eec6deee04d3c
2020-10-19 16:19:27 +08:00
Sugar Zhang
b1cd892609 dt-bindings: sound: rockchip: Add binding for rk3568 i2s
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I5656f0cd7a04fcd0595fa255b9d30bf47325f0e2
2020-10-19 16:19:02 +08:00
Sugar Zhang
d11a687bd0 ASoC: rockchip: i2s-tdm: Make reset property as optional
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9707e8c763450f3a78f0fb419d90d9992cecfe59
2020-10-19 16:04:19 +08:00
Sugar Zhang
d9f47a7b9c ASoC: rockchip: i2s-tdm: Fix configs init failed
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I25b4971a1e7b0c7a740f195791238d5e74d4cc9c
2020-10-19 16:03:18 +08:00
Simon Xue
c4026e63aa ANDROID: GKI: iommu/rockchip: Add .map_sg callback for V2
Fixes: e24979f0e7 ("ANDROID: GKI: iommu: Snapshot of vendor changes")
Change-Id: I3929a7b47a1523a01b64190031fee3b001f3e676
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-10-19 16:02:05 +08:00
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