Commit Graph

854792 Commits

Author SHA1 Message Date
Xing Zheng
63e3b9fe89 ARM: configs: rv1126-battery.config: enable es8311 codec
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I391dddcffc6477881c3f1b7eaeb55b975227b8ca
2020-09-03 14:56:01 +08:00
Xing Zheng
ab638e72a5 ARM: dts: rockchip: add i2s0-sound with es8311 codec for rv1126-bat-ipc-v10
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I613cf79d7133e5f71b0a4713266b769a9d8c6630
2020-09-03 14:55:11 +08:00
William Wu
c0c1270789 usb: dwc3: gadget: clear HWO when move req to pending list
Clear the HWO of TRB belongs to the current req which will
be moved to the pending list, rather than clear the HWO
of previous TRB in the ring.

Fixes: 05c86e9eef ("usb: dwc3: gadget: fix bug of clac_trbs_left at isoc in transfer")
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: If11c296db902631587cf36731242d12ddb5c4c28
2020-09-03 10:00:58 +08:00
Xing Zheng
3b13f64c6d ASoC: es8311: add support es8311 codec driver
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Iae35145535664754f3babf4245c9682077c1fc00
2020-09-03 09:17:13 +08:00
Xing Zheng
a0aa4a48fd dt-bindings: sound: es8311: Add bindings documentation for es8311 audio codec
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I96d5f780c907257f9b39e1ca879f2234e7623644
2020-09-03 09:17:13 +08:00
Jianqun Xu
9f2a89dd26 pinctrl: rockchip: enable pclk before access gpio controller
Change-Id: I9b47cfeb41546ec4c4925ed01a0c232c383a332c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-09-02 14:48:29 +08:00
Jianqun Xu
dca21fc335 Revert "power/avs: rockchip-io-domain: rv1126 support to control vccio1"
This reverts commit df8465ab9d.

Change-Id: I62eb3f42bd4e4ada3ec16471ca8a9c4f5c3efc9d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-09-02 14:04:36 +08:00
Sugar Zhang
686fae6782 Revert "ARM: dts: rockchip: rv1126 io-domain node add VCCIO1"
This reverts commit fae0c499d0.

VCCIO1 is controlled by pin GPIO0B3/FLASH_VOL_SEL:

* pullup for 1.8v
* float for 3.3v

so, we should not reconfigure it by software.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0bc119cbb0355e9d8fd7ba3457bf436eba3d6e7a
2020-09-02 14:02:43 +08:00
Zhenke Fan
b12f031895 media: i2c: imx378 support mirror and flip
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I664244bdf74a8a371784bfe45c35dee232aa550c
2020-09-01 17:41:36 +08:00
Zefa Chen
92fb989963 ARM: dts: rv1126: 38x38 board: modify label of flash-ir
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I5dab6fc23a9c48d48b3883fb984cc0899db847fe
2020-09-01 10:40:37 +08:00
Zefa Chen
81f2d6e688 leds: leds-rgb13h: Fix the bug that when pwm is disabled, the light cannot be turned off
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I0d6367045dad5ff6a7a2d1ee38c5dc41498f6013
2020-09-01 10:40:26 +08:00
Jon Lin
a63bb72f90 drivers: rkflash: Support GD5F1GQ5UEYIG
Change-Id: I8fd961f02a1155e1c4f7579f665a55fe754ad210
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-09-01 08:59:04 +08:00
Zhenke Fan
11831ab0de ARM: configs: rv1126_defconfig: enable imx378 camera
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I89748d0e4fc07735d917add282efb495a49a16c0
2020-08-31 17:44:07 +08:00
Tao Huang
b14e281230 media: i2c: imx378: select V4L2_FWNODE
Building imx378 fails now unless V4L2_FWNODE is selected:

drivers/media/i2c/imx378.o: In function `imx378_probe':
imx378.c:(.text+0x1074): undefined reference to `v4l2_async_register_subdev_sensor_common'

Fixes: 797d705c90 ("media: i2c: add imx378 sensor driver")
Change-Id: Ie89333159f76d435dc253d9b025bc83c949066ec
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-08-31 17:44:07 +08:00
Yu YongZhen
e429b46eac ARM: dts: rv1126: 38x38 board: add adc key
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
Change-Id: If5db303eccd4cfe1a318b1b8f86a5536a36c89e8
2020-08-31 14:06:05 +08:00
Jon Lin
dd12329e06 drivers: rkflash: Add more information for SPI Nand MTD debug
1.Add more information for SPI Nand MTD debug
2.Return program result

Change-Id: I3fc7d63955355ad88adfbd02f0b67fc16c9d76d5
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-08-31 10:53:09 +08:00
Ding Wei
d7ed7b4cbd video: rockchip: mpp: refactoring code for reg_offset_info
combine the same code into one function

Change-Id: I9c5102c59b8dd0a4e9f8213dac4d9ad400ac4a40
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-08-31 10:47:56 +08:00
XiaoTan Luo
51b01e089a arm64: dts: rockchip: add i2s_2ch_0 clk-trcm=<1> for rk3308
rk3308 i2s_2ch_0 only have the tx_lrck pin, so must set
only tx_lrck is used as synchronous signal for TX and RX.

Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: Ic1a843f96950162ca10ad625dae4e238c9aabfd8
2020-08-31 10:47:38 +08:00
Cai YiWei
5959cb856d media: rockchip: isp and ispp version to v0.1.4
Change-Id: Ie11ba53aeb11cba104f42a40e6d70c783298ce4f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-31 10:37:45 +08:00
Zefa Chen
068a567af4 media: i2c: imx415 fixed 10bit linear/hdr3 quick switch bug
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I07fbd2b9e60809b73c63b2500f22c7acc0ef677b
2020-08-29 17:05:57 +08:00
Cai YiWei
10232a98b0 media: rockchip: isp: switch hdr frame mode for read back
Change-Id: I4077f35579023b30e42952dd2c2ac917b49cbfbf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-28 19:04:56 +08:00
Cai YiWei
af20c0f5f6 media: rockchip: ispp: ignore UVNR_MONITOR_ERR
Change-Id: I9897f4e0e0fb0e8d2ebd97112dbffdb595db4098
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-28 19:04:56 +08:00
Cai YiWei
16ade9f6e6 media: rockchip: ispp: tnr skip input buf if no output buf
Change-Id: I4e03604c819a8931d8c8e90f3eed9b997271ecbd
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-28 19:04:56 +08:00
Cai YiWei
4e93f38d05 media: rockchip: ispp: safe to enable shp/fec output
Change-Id: I7a05c561a909718125edc972b88f1de73d5f014d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-28 19:04:56 +08:00
Ding Wei
0206e47f0f video: rockchip: mpp: rewrite procfs instead of debugfs
debugfs might be disabled in some simple system.
location:
    /sys/kernel/debug/mpp_service/
to -->
    /proc/mpp_service/

Change-Id: I4e463d9be9ee1b0f229394ee61580a343ccc870c
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-08-28 17:47:25 +08:00
Shunqian Zheng
b40ed6453a ARM: configs: rv1126_robot_defconfig: enable CONFIG_VIDEO_ROCKCHIP_CIF
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Change-Id: I5907f294cfad8d3f5bbfe56ef8691032391dae37
2020-08-28 17:46:15 +08:00
Zefa Chen
f06f352425 media: i2c: imx415 support hdr change fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I847a1009c889d19727da31697dc2afd730e13174
2020-08-28 16:06:31 +08:00
Zhichao Yu
b44b8a6fe6 ARM: dts: rockchip: fix imx347 module name for rv1126-sphericalipc-ddr3-v10
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: I420624f51dbb1afe4c02fb3e599ff63e6fa80c30
2020-08-28 15:45:41 +08:00
Zefa Chen
cd8be25639 media: i2c: imx327 support lvds interface
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic7beb929717a01feef232b87361ebc1459c2e6c5
2020-08-28 15:42:07 +08:00
Weiwen Chen
abee91b4b6 ARM: configs: rv1126-spi-nor.config: add clk procfs
To dump clock summary:
cat /proc/clk/summary

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I83aafdec5530410218a5c1b5e8d0e47ce67867db
2020-08-28 15:31:13 +08:00
Finley Xiao
6f1a5962b2 ARM: dts: rv1126: assign clock rates for npu aclk
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I21612da9c8bd215a395b007ac2646fc8676574c4
2020-08-28 14:11:37 +08:00
Allon Huang
7f7e03f6bd media: rockchip: cif: support rk1808 mipi interface
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ibeab1d5edf860926ef08d40c31368ce2e52d55da
2020-08-28 11:10:51 +08:00
Zhenke Fan
88483a7923 media: i2c: add imx334 sensor driver
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I4bf51a8f1a907c892ae07bf2133061fc6bad570a
2020-08-28 09:48:29 +08:00
Yiqing Zeng
466c86fbf4 media: i2c: imx415 support 10bit by default
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I2ea0961b7a427981afc9d14f312cf57cca59018b
2020-08-27 19:55:17 +08:00
Simon Xue
c12c54fbb4 ARM: dts: rv1126: add rockchip,enable-cmd-retry for rkvenc_mmu
Change-Id: I33195d62255c83e9538e6c60bb3f0806e39b3d51
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-08-27 19:33:16 +08:00
Simon Xue
5de36c4da5 iommu: rockchip: rewrite command if failed for RV1109/RV1126
On RV1109/RV1126, there is a rare risk that command would not take effect
for rkvenc_mmu. Rewrite command no more than 10 times. Only consider
enable/disable paging, enable/disable stall these 4 commands
which result can be checked through register RK_MMU_STATUS.

Change-Id: I508783821f05513b28392d5a3d3a55953917f910
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-08-27 19:33:16 +08:00
Yiqing Zeng
1acfdb424f ARM: dts: rv1126-evb-v10.dtsi: os04a10 link to cif by default
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I13c2b0298077ea5c4cc789f207524216ce592a18
2020-08-27 19:24:57 +08:00
Yao Xiao
da16d5455c net: rockchip_wlan: support rtl8821cs to "v5.9.2_36984.20200615_COEX20200414-4e4e"
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: Icca033cad8c3add586360cf002b3a72d17e6a557
2020-08-27 19:24:04 +08:00
Zhichao Yu
9d213fd2a9 ARM: dts: rockchip: switch to thunder boot for rv1126-bat-ipc-v10
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: I018051e5f0c9a4a84167ccc1993dad943121fa01
2020-08-27 16:38:26 +08:00
Algea Cao
116ce33a4e Revert "drm: support atomic update flush for connector"
This reverts commit 5111545068.

For compatibility with GKI, connector atomic_begin/atomic_flush
should be removed.

Change-Id: I00b66338fd8a79230a71419ed476bf80e8496e2b
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-08-27 14:30:35 +08:00
Algea Cao
ea989a9d00 Revert "drm: introduce atomic_begin for connector"
This reverts commit 401fc0060c.

For compatibility with GKI, connector atomic_begin/atomic_flush
should be removed.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ibff527242a2938027e0f7871a84e549513d5c2ea
2020-08-27 14:30:17 +08:00
Algea Cao
327eddb701 drm: Remove global property HDR_PANEL_METADATA
HDR_PANEL_METADATA has been hdmi private property, so remove
HDR_PANEL_METADATA in mode_config.

Fixes: 97fd2e42b6 ("drm: Add HDR panel metadata property")
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia534d61d78edcdd2260b41d1c5a076f19034bf75
2020-08-27 14:23:18 +08:00
Algea Cao
0976d53030 drm: Remove hdr_metadata_changed
For compatibility with GKI, hdr_metadata_changed should be removed.

Fixes: 2beb3925b7 ("drm: bridge: dw-hdmi: support Dynamic Range and Mastering Infoframe")
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia1981a44507bbd58e5677a9ebfc0053afd228d19
2020-08-27 14:23:10 +08:00
Algea Cao
38e112d31c drm/bridge: synopsys: dw-hdmi: Check whether color has changed in connector atomic_check
For compatibility with GKI, connector atomic_begin/atomic_flush should
be removed. If hdmi color format has changed, set flag mode_changed
true and start a modeset to config hdmi.

We check whether color format has changed in
dw_hdmi_connector_atomic_check(), but color format variable update in
dw_hdmi_rockchip_encoder_atomic_check(), It runs after
dw_hdmi_connector_atomic_check(). That will lead to misjudgments when
determining whether color format has changed.

To solve this problem, we introduce get_color_changed(). When color
properties are set and color format is changed, get_color_changed()
return true.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Id1fbe80171856f91efa5ae40a0e0608a92ebcbf7
2020-08-27 14:22:49 +08:00
Algea Cao
8f146c3559 drm: rockchip: dw-hdmi: Change HDR_PANEL_METADATA to private property
For compatibility with GKI, HDR_PANEL_METADATA can't be a global
property. So change HDR_PANEL_METADATA to Rockchip private property.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I7926683a5dc6274e6cab2151e476344fa897b66c
2020-08-27 14:22:49 +08:00
Algea Cao
94db4743ea drm/bridge: synopsys: dw-hdmi: Check if hdr output metadata has changed in atomic_check
For compatibility with GKI, remove hdr_metadata_changed. Check
if hdr output metadata has changed in dw_hdmi_connector_atomic_check.
If hdr output metadata has changed, modeset will begin.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I160bd64eabbc6fc827e61e85ede771484d967626
2020-08-27 14:22:49 +08:00
Sean Paul
1251fc7ab0 UPSTREAM: drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state
Everyone who implements connector_helper_funcs->atomic_check reaches
into the connector state to get the atomic state. Instead of continuing
this pattern, change the callback signature to just give atomic state
and let the driver determine what it does and does not need from it.

Eventually all atomic functions should do this, but that's just too much
busy work for me.

Changes in v3:
- Added to the set
Changes in v4:
- None
Changes in v5:
- intel_digital_connector_atomic_check declaration moved to i915_atomic.h

Link to v3: https://patchwork.freedesktop.org/patch/msgid/20190502194956.218441-5-sean@poorly.run
Link to v4: https://patchwork.freedesktop.org/patch/msgid/20190508160920.144739-5-sean@poorly.run

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: Eric Anholt <eric@anholt.net>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> [for rcar lvds]
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190611160844.257498-5-sean@poorly.run
(cherry picked from commit 6f3b62781b)
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: If3349ad733f31acb28b8f31260592342564e17f8
2020-08-27 14:22:49 +08:00
Algea Cao
655029432a drm: rockchip: dw-hdmi: Fix switch from 4K-60/50Hz to lower resolution failed
The resolution below 4K-60/50Hz don't support YUV420. If switch from
4K-60/50Hz in YUV420 to lower resolution may cause display err.
So if resolution below 4K-60/50Hz, color format should be
RGB/YUV444/YUV422.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ib96303f3bef1a1b269a9ac8845951b6a895ec5b8
2020-08-27 14:22:49 +08:00
Hu Kejun
b729a0215e media: rockchip: isp: support hal to control hdrtmo on/off
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ib637029333c426385a4d8f7b6da491ab3dfc4a34
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-27 11:59:57 +08:00
Weiwen Chen
1b969b78ea ARM: dts: rockchip: rv1126-evb-ddr3-v12-spi-nand: modify rootfs to mtd:2
The UBIFS file system does not need misc partition,
So modify the mtd of rootfs to 2.

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ibc0dc84357daf6e917f1989205af5674f4ddeb25
2020-08-27 08:54:03 +08:00