Commit Graph

860039 Commits

Author SHA1 Message Date
Shawn Lin
7bee69666c mmc: sdhci-of-dwcmshc: Fix wrong definition of DWCMSHC_EMMC_DLL_STATUS0
Acorrding to the latest TRM, the offset of DWCMSHC_EMMC_DLL_STATUS0
is 0x840. So fix it.

Change-Id: I85e4b04b0d68654c988df26f29f03cfe4301831b
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-11-08 22:07:15 +08:00
Elaine Zhang
ce75a5ff22 arm64: dts: rockchip: rk3568: fix up the dmac clk get failed
ERROR: could not get clock /dmac@fe550000:apb_pclk(0)

Change-Id: Id1852b5c74009ae3b3d0db6889465214ba9cffd5
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-11-08 21:49:13 +08:00
Jianqun Xu
4dd353d979 pinctrl: rockchip: add support for rk3568 pull set
Change-Id: Icbd6baab7459db6488babcee1f594e0668c43cab
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-11-08 21:43:31 +08:00
Elaine Zhang
d5110f70d8 soc: rockchip: pm-domain: rk3568: fix up the idle bits error for rkvenc/rkvdec
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I4ec8018e0e15d43c778912ad50757b56838d5d9e
2020-11-08 21:09:38 +08:00
Wu Liangqing
b34f7a3543 arm64: dts: rockchip: set sdmmc0 power add det for rk3566-rk817-tablet
Change-Id: I463dd79c9c23cdbf8135579d1e71fe3544bd32e2
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-11-08 19:22:02 +08:00
William Wu
2f07a1986d usb: gadget: f_uac: add volume and mute feature unit
This patch adds feature unit descriptor for f_uac1 and f_uac2,
and supports volume control and mute control for capture and
playback.

By default, the volume and mute feature unit descriptors are NOT
add in the UAC descriptor. The user can define whether the UAC1/
UAC2 shall support volume and mute functionality via the attributes
c_feature_unit/p_feature_unit in the UAC function directory.

For example, user can add the volume and mute feature unit descriptors
for UAC1 capture and playback:

echo 1 > /config/usb-gadget/gadget/functions/uac1.name/c_feature_unit
echo 1 > /config/usb-gadget/gadget/functions/uac1.name/p_feature_unit

This patch also adds uevents for volume and mute functionality. The
user can complete the real volume and mute control functionality in
the user space depends on these new uevents (like the uac_app in the
RV1126/RV1109 SDK).

Change-Id: I76d447a19fd69e038851040cd73e6c7d420f467d
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
2020-11-08 19:19:07 +08:00
Li Huang
46e6032422 arm64: dts: rockchip: add rga node for rk356x
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I72e583e03ca84f5f71b64a6edac13c95b98c2021
2020-11-08 17:54:19 +08:00
Tao Huang
54889436af drm/rockchip: vop2: Fix smatch warning
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:3499
vop2_plane_create_name_property() warn: should '1 << (win->win_id)'
be a 64 bit type?

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If4d46563519dabb18792c27bf4069f037de20879
2020-11-08 14:41:48 +08:00
Frank Liu
dcfb4756f6 media: i2c: sc2310 fix setting exposure error
Signed-off-by: Frank Liu <frank.liu@rock-chips.com>
Change-Id: I4c9560ce319e75cb6e5d5ff0ae68d09b2447023c
2020-11-08 14:37:23 +08:00
Weixin Zhou
9d4d220422 arm64: dts: rockchip: rk3568-evb6-ddr3-v10: add external regulator node
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I296fdf85a34c1f4db6840e7f7eb8f2e0dc0ae122
2020-11-08 14:03:55 +08:00
Wu Liangqing
f00a92f963 arm64: dts: rockchip: fix gpio error for rk3568 evb
Change-Id: Ib3ed7239da190845b43e861b2f564a9ba02d5d75
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-11-08 14:03:43 +08:00
Yu Qiaowei
95280b2287 video/rockchip: rga2: Update to support rotation mode.
1. Add x mirror + y mirror mode.
2. Support rotation and mirror configuration at the
   same time.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: If958e620633e17101495631acf3751a67953b19f
2020-11-06 18:03:12 +08:00
Cai YiWei
6539ac29c6 media: rockchip: isp: fix size no update for multi sensor switch
Change-Id: I69860b0a6bf2b23160ff8c25c00267e7ca274b33
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-11-06 18:00:37 +08:00
Cai YiWei
d760ab0140 media: rockchip: isp: fix normal merge enable config
RKISP_NORMAL_MERGE_EN default 1 to enable this function

Change-Id: Iccb33ba372baa90306329998fd64f872063b7609
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-11-06 18:00:37 +08:00
Elaine Zhang
a9a31fbbc5 arm: dts: rk3288: remove regulator-xxx-microvolt for SWITCH pmic node
Switch is just a function of switching. There is no voltage setting
function. Voltage getting is the supply voltage.

Fixes: 3fc99e38fd ("regulator: resolve supply after creating
regulator")

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I22ff04b59b9b051052348420f25999dae424d4ac
2020-11-06 18:00:09 +08:00
Elaine Zhang
001fe23319 arm64: dts: rockchip: rk3368: remove regulator-xxx-microvolt for SWITCH pmic node
Switch is just a function of switching. There is no voltage setting
function. Voltage getting is the supply voltage.

Fixes: 3fc99e38fd ("regulator: resolve supply after creating
regulator")

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Iee08b78b0f4361b7f8b18bea5b851050edb636fa
2020-11-06 18:00:09 +08:00
Elaine Zhang
c82731710c arm64: dts: rockchip: rk3399pro-evb: remove regulator-xxx-microvolt for SWITCH pmic node
Switch is just a function of switching. There is no voltage setting
function. Voltage getting is the supply voltage.

Fixes: 3fc99e38fd ("regulator: resolve supply after creating
regulator")

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I83f487908931f40bbeb4323ad671d3a446247377
2020-11-06 18:00:09 +08:00
Jon Lin
4e7b84e10a drivers: rkflash: Support new devices
MT29F2G1ABA, F50L2G41XA, W25Q128JVSIM, ZB25LQ128, FM25Q64-SOB-T-G

Change-Id: Ia6db8e1f853dbcad3662f1206e461ddd86c33026
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-11-06 17:59:18 +08:00
Ziyuan Xu
cb1e7516e7 ARM: dts: rv1126-bat-ipc-v10: use the correct IRCUT driver
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ic7b05568ebd972e7b47cec2d6a95ab4657f3b761
2020-11-06 14:34:40 +08:00
Ziyuan Xu
481f37137d media: i2c: rk_ircut: add AP1511A IR filter switch support
The AP1511A is different from the BA6208.

ENB: low-active enable
FBC: Forward/Backward control

ENB     FBC     OUT1    OUT2
H       X       L       L
L       H       H       L
H       L       L       H

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ieba00ed509b8d886dc22d8f0018a8282f3c73040
2020-11-06 14:34:40 +08:00
Andy Yan
924cd5bb04 drm/rockchip: vop2: Fix some compile warning
Fix warning:

drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:542: warning: Function
parameter or member 'phys_id' not described in
'vop2_find_win_by_phys_id'
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:542: warning: Function
parameter or member 'vop2' not described in 'vop2_find_win_by_phys_id'

drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:3503
vop2_plane_create_name_property() warn: should '1 << (win->win_id)' be a
64 bit type?
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:3509
vop2_plane_create_name_property() warn: should '1 << (win->win_id)' be a
64 bit type?

Fixes: efe0578ec8 ("drm/rockchip: Add support for vop2")
Change-Id: Ia52eac3fcf2ddeff825b5fdaa26adcf26c71a7af
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-06 10:50:13 +08:00
Weiguo Hu
9c6de47581 net: rockchip_wlan: rtl8822bs: solve WARNING on nl80211_send_chandef
WARNING: CPU: 3 PID: 516 at net/wireless/nl80211.c:2880 nl80211_send_chandef+0x16c/0x180
Call trace:
  nl80211_send_chandef
  nl80211_ch_switch_notify
  cfg80211_ch_switch_started_notify
  rtw_cfg80211_ch_switch_notify
  rtw_chk_start_clnt_join
  join_cmd_hdl
  rtw_cmd_thread
  kthread

Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
Change-Id: I922c8bd3af5de802dd7f2ee46738ff3fe07ca2af
2020-11-06 09:52:26 +08:00
Zhangbin Tong
925dbb9edc ARM: dts: rv1126: Add shared dma memory pool inactive optional property
The ISP and CMA need the operating system must not active the region.

Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
Change-Id: Id27f453f8f1734d992d0e5ae9c38a01b0f7686fe
2020-11-06 08:57:36 +08:00
Andy Yan
d837fdcdab drm/rockchip: register vop2 platform driver
Change-Id: Id34b88f47b785bf8372d1710a280d294347d6693
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-05 19:38:15 +08:00
Andy Yan
efe0578ec8 drm/rockchip: Add support for vop2
Rockchip vop2 build on a unified architecture with
multi video output ports support.

For RK3568:
* 3 Video Port, every video port can drive a display timing independently.
* 6 graphic window: Cluster win x 2, Esmart win x 2, Smart wind x 2.
* 6 windows can be divided into 3 groups for independent overlay for
  3 Video Ports.
* RGB/eDP/HDMI/MIPI get display timing from 1 of the 3 Video Ports.

+----------+   +-------------+
|  Cluster |   | Sel 1 from 6|   +--------------------+
|  window0 |   |    Layer0   |   |n from 6|           |
+----------+   +-------------+   |        |Video Port0|
+----------+   +-------------+   |Overlay |           |
|  Cluster |   | Sel 1 from 6|   +--------+-----------+
|  window1 |   |    Layer1   |
+----------+   +-------------+
+----------+   +-------------+
|  Esmart  |   | Sel 1 from 6|
|  window0 |   |   Layer2    |   +--------------------+
+----------+   +-------------+   |n from 6|           |
+----------+   +-------------+   |        |Video Port1|
|  Esmart  |   | Sel 1 from 6|   |Overlay |           |
|  Window1 |   |   Layer3    |   +--------+-----------+
+----------+   +-------------+
+----------+   +-------------+
|  Smart   |   | Sel 1 from 6|
|  Window0 |   |    Layer4   |   +--------------------+
+----------+   +-------------+   |n from 6|           |
+----------+   +-------------+   |        |Video Port2|
|  Smart   |   | Sel 1 from 6|   |Overlay |           |
|  Window1 |   |    Layer5   |   +--------+-----------+
+----------+   +-------------+

Change-Id: I4c42d655f75903066888b6aea92e926192b000c2
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-05 19:32:42 +08:00
Sean Paul
8d7cdbbea2 UPSTREAM: drm: Describe pixel_blend_mode in drm_plane_state
Adds docs for pixel_blend_mode in drm_plane_state. Fixes the warning
found by kbuild test robot:

htmldocs: include/drm/drm_plane.h:189: warning: Function parameter or member 'pixel_blend_mode' not described in 'drm_plane_state'

Change-Id: Ife448dca43ae262ecfccf312fe94142f0eaac5e0
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Lowry Li <lowry.li@arm.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180831150934.202332-1-sean@poorly.run
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit b972cece94)
2020-11-05 18:55:12 +08:00
Lowry Li
e254a8b9df BACKPORT: drm: Add per-plane pixel blend mode property
Pixel blend modes represent the alpha blending equation
selection, describing how the pixels from the current
plane are composited with the background.

Adds a pixel_blend_mode to drm_plane_state and a
blend_mode_property to drm_plane, and related support
functions.

Defines three blend modes in drm_blend.h.

Changes since v1:
 - Moves the blending equation into the DOC comment
 - Refines the comments of drm_plane_create_blend_mode_property to not
   enumerate the #defines, but instead the string values
 - Uses fg.* instead of pixel.* and plane_alpha instead of plane.alpha
Changes since v2:
 - Refines the comments of drm_plane_create_blend_mode_property:
      1) Puts the descriptions (after the ":") on a new line
      2) Adds explaining why @supported_modes need PREMUL as default
Changes since v3:
 - Refines drm_plane_create_blend_mode_property(). drm_property_add_enum()
   can calculate the index itself just fine, so no point in having the
   caller pass it in.
 - Since the current DRM assumption is that alpha is premultiplied
   as default, define DRM_MODE_BLEND_PREMULTI as 0 will be better.
 - Refines some comments.
Changes since v4:
 - Adds comments in drm_blend.h.
 - Removes setting default value in drm_plane_create_blend_mode_property()
   as it is already in __drm_atomic_helper_plane_reset().
 - Fixes to use state->pixel_blend_mode instead of using
   plane->state->pixel_blend_mode in reset function.
 - Rebases on drm-misc-next.

Change-Id: I021908dc42aef01e4b7c70f99904ccabffa4adfe
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Lowry Li <lowry.li@arm.com>
Signed-off-by: Ayan Kumar Halder <ayan.halder@arm.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/245734/
(cherry picked from commit a5ec8332d4)
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-05 18:54:32 +08:00
Ding Wei
538613c26c video: rockchip: mpp: add missing element in translate table for vp8e
Change-Id: I5160dd95fb1fb4d0a6e630d44ee1a82828bdfc0a
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-11-05 18:45:43 +08:00
Andy Yan
d79af335fb drm/rockchip: rgb: Add support for rk3568 rgb interface
RK3568 has one rgb output interface.

Change-Id: I17a14681f3e0b872ea129de9e9f80a0527863911
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-05 18:41:19 +08:00
Ziyuan Xu
8f48866b4e ARM: configs: rv1126-battery.config: enable Aschip PIR Sensor support
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: If6bf90de03495c40bd94f5b004570ce593c2ef41
2020-11-05 16:57:06 +08:00
Ziyuan Xu
a84fb5e9b3 ARM: dts: rv1126-bat-ipc-v10: add pir device to adjust sensibility
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I2ed3fbc9dc73321164a03314255b86ee58bc4acd
2020-11-05 16:57:06 +08:00
Ziyuan Xu
633fa7b962 misc: add Aschip PIR Sensor drivers
We can adjust the sensibility of the Aschip's PIR sensor via pulse gpio,
and the timing should be precise.

For example:
    min: echo 4 > /proc/pir/sensibility
    max: echo 100 > /proc/pir/sensibility

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Id3e644fc38d9be24f97351df665e27fc4ff9d545
2020-11-05 16:57:02 +08:00
Wu Liangqing
8f27813ae3 arm64: dts: rockchip: enable mipi_dphy0 for rk3566-rk817-tablet
Change-Id: Ib313ea6cf07f9f818d76ab3a93f1b8af129fbb8c
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-11-05 15:19:05 +08:00
Wu Liangqing
c1a1dce150 arm64: dts: rockchip: rk3568 init board for evb
Change-Id: Ie77bbb4bc64c4720bd752b51b4629d4ae5c7d880
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-11-05 15:03:32 +08:00
Sugar Zhang
9c07a12f01 ASoC: rockchip: i2s-tdm: Add support for frame inversion
Change-Id: I4d6d626018b1555f65684cc6a3c16045894bd868
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-05 14:36:16 +08:00
Sugar Zhang
baddcc7c35 ASoC: rockchip: i2s-tdm: Clean code
Change-Id: Ib4af14213873dac609d195976bd639bd6270e419
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-05 14:36:16 +08:00
Ziyuan Xu
bd60226a17 ARM: dts: rv1126-bat-ipc-v10: tune suitable memory for isp/ispp
For SC210IOT (1080p normal raw10) sensor:
isp_reserved size = 5 * dmatx_buffer + 5 * isp_ispp_buffer + 3*1024*1024
dmatx_buffer = ALIGN(width * bpp / 8, 256) * height = 2560 *1080
isp_ispp_buffer =
    ALIGN(width, 16) * ALIGN(height, 16) * (1/16 + ((is_yuv422) ? 2 : 1.5)) +
    ALIGN(width, 64) * ALIGN(height, 128) / 16
    = 1920*1088 * 1.5625 + 1920 * 1088 * 0.0625

isp_reserved(CMA) size = 32.3 MB
CMA buffer should be aligned as 4MB, isp_reserved size should be 36MB
for SC210IOT.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I839c7ffd179f35f6d6b9b581eda0837e631420bd
2020-11-05 14:35:41 +08:00
Elaine Zhang
10d9a7d483 arm64: dts: rockchip: rk3399-evb-ind: remove regulator-xxx-microvolt for SWITCH pmic node
Switch is just a function of switching. There is no voltage setting
function. Voltage getting is the supply voltage.

Fixes: 3fc99e38fd ("regulator: resolve supply after creating regulator")
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ia45677a24fbfb831226563c56bcb26885bb17db1
2020-11-05 14:17:56 +08:00
Ziyuan Xu
798f90523f mmc: fixes vendor_storage initialization failure
The key parameter (this_card) is invalid if the mmc_host drivers were
built as module.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I250ce59591da542d7fc1e4afcd6d8442a82b1d17
2020-11-05 14:13:13 +08:00
Wu Liangqing
d47ae5dcbe arm64: dts: rockchip: add RK3566 tablet board devicetree
Change-Id: I592a71d68ff3f606a64c9a9c540d8b778042e987
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-11-05 11:24:33 +08:00
Sandy Huang
200cf09a01 drm/rockchip: rgb: add support interlace mode and output_if flag
BT656 typical output mode is 480i and 576i, so add connector interlace allowed.

Change-Id: I6c832a1e7fd8cca69da5f6cfdd9681d72696d67a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-05 11:12:59 +08:00
Zhenke Fan
863a31e8e0 ARM: dts: rv1126-rmsl-ddr3-v1: remove rk1608 pwren_gpio
rk1608 and ov02k10 use the same pwren gpio

Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I111897611f2094ea6919b20caffcdbe74714ac0a
2020-11-05 10:15:10 +08:00
Andy Yan
1c82b603e3 arm64: dts: rockchip: rk3568: Add display subsystem dt node
The data route from vop vp to interface is shown as bellow.

                                 +---------+
                        +------->+  HDMI   |
                        |        +---------+
+--------------+        |
|              |        |        +---------+
|     VP0      +------->-------->+   eDP   |
|              |        |        +---------+
+--------------+        |
                        |        +---------+
                        +------->+   DSI   |
                                 +---------+

                                 +---------+
                         +------>+  HDMI   |
                         |       +---------+
                         |
                         |       +---------+
+-------------+          +------>+   eDP   |
|             |          |       +---------+
|     VP1     +--------->+
|             |          |       +---------+
+-------------+          +------>+   DSI   |
                         |       +---------+
                         |
                         |       +---------+
                         +------>+   LVDS  |
                                 +---------+

                                 +---------+
                         +------>+   LVDS  |
                         |       +---------+
+------------+           |
|            |           |
|     VP2    +---------->-
|            |           |
+------------+           |
                         |       +---------------+
                         +------>+RGB/BT656/1120 |
                                 +---------------+

Change-Id: Ifd505a53303817b8f0785d5f0c5f22bcca590305
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-05 10:07:35 +08:00
Huang zhibao
9edc011523 ARM: dts: rockchip: add rv1126-ai-cam-plus
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I6599ee46bb9c23cebf3a66d4f07b70a4eebc8b5e
2020-11-04 18:24:32 +08:00
Sandy Huang
f64bc11207 phy/rockchip: inno-video-combo-phy: add support rk3568 lvds
Change-Id: I0021eec263aa6436f7e2055a3a361cc2728fd858
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-04 16:07:50 +08:00
Sugar Zhang
c4ad3526a2 ASoC: rockchip: i2s_tdm: Fix wrong reset id
Change-Id: I6960a341e05b7e46760964203579e72d078c3101
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-04 15:52:50 +08:00
Xing Zheng
6578e192ef ASoC: rockchip: i2s_tdm: add support handle 'io-multiplex' property
Some i2s bus GPIOs maybe designed multiplex, the default
is input, we need to configure IN/OUT dynamically.

Change-Id: I2e0f0f972d6f9fa3fc8e8fc9f5dfd5d4e6deaee1
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2020-11-04 15:52:32 +08:00
Sugar Zhang
fe27c204eb ASoC: rockchip: i2s-tdm: Fix BUG scheduling while atomic
BUG: scheduling while atomic: mediaserver/664/0x00000002
CPU: 0 PID: 664 Comm: mediaserver Tainted: G O 4.19.111 #36
Hardware name: Generic DT based system
[<b010f408>] (unwind_backtrace) from [<b010b96c>] (show_stack+0x10/0x14)
[<b010b96c>] (show_stack) from [<b08157c4>] (dump_stack+0x90/0xa4)
[<b08157c4>] (dump_stack) from [<b0147bb0>] (_schedule_bug+0x64/0x84)
[<b0147bb0>] (_schedule_bug) from [<b082b93c>] (_schedule+0x4a4/0x580)
[<b082b93c>] (_schedule) from [<b082ba68>] (schedule+0x50/0xb4)
[<b082ba68>] (schedule) from [<b082bebc>] (schedule_preempt_disabled+0x28/0x40)
[<b082bebc>] (schedule_preempt_disabled) from [<b082d020>] (_mutex_lock.constprop.7+0x534/0x5c0)
[<b082d020>] (_mutex_lock.constprop.7) from [<b03e5ba4>] (clk_prepare_lock+0x50/0xf8)
[<b03e5ba4>] (clk_prepare_lock) from [<b03e9204>] (clk_set_rate+0x18/0x88)
[<b03e9204>] (clk_set_rate) from [<b068a0dc>] (rockchip_i2s_tdm_hw_params+0x88/0x798)
[<b068a0dc>] (rockchip_i2s_tdm_hw_params) from [<b0680758>] (soc_dai_hw_params+0x58/0xa4)
[<b0680758>] (soc_dai_hw_params) from [<b0680914>] (soc_pcm_hw_params+0x170/0x55c)
[<b0680914>] (soc_pcm_hw_params) from [<b0668540>] (snd_pcm_hw_params+0x124/0x3ac)
[<b0668540>] (snd_pcm_hw_params) from [<b0669ae4>] (snd_pcm_ioctl+0x764/0xcbc)
[<b0669ae4>] (snd_pcm_ioctl) from [<b0220c38>] (do_vfs_ioctl+0xac/0x798)
[<b0220c38>] (do_vfs_ioctl) from [<b0221358>] (ksys_ioctl+0x34/0x58)
[<b0221358>] (ksys_ioctl) from [<b0101000>] (ret_fast_syscall+0x0/0x4c)
Exception stack(0xdbda3fa8 to 0xdbda3ff0)

Fixes: 61559b25ba ("ASoC: rockchip: i2s: Set clk rate when master mode")
Change-Id: I266efee0f9e5d99ff6d358c4f12e7b9dc7eb6bf8
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-04 15:16:53 +08:00
William Wu
a7e892c783 phy: rockchip: inno-combphy: remove redundant param_exped
The function param_read() and param_exped() do the same thing,
so this patch uses the more general param_read() instead of
the param_exped(), and delete the param_exped() directly.

Change-Id: Ic097069c28a717ff5f70ceaa36a22ea1bd26b76f
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-04 11:52:51 +08:00
Liang Chen
36f9645063 arm64: dts: rockchip: add cpu opp-table for RK3568
Change-Id: I287e4cc6658684e6a878fea399c2025bb3b985df
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-11-04 10:42:38 +08:00