Commit Graph

852111 Commits

Author SHA1 Message Date
WeiYong Bi
f8090e57cc phy: Add support for INNO MIPI D-PHY
The INNO MIPI D-PHY is built in witch a standard digital interface
to talk to any third part Host controller.That is part of Rockchip SoCs,
like rk3368.

Change-Id: I9806882e0e3fb6b20348015d0f34923d1bc46b89
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2020-03-05 19:37:05 +08:00
Ziyuan Xu
90b0a9600d Revert "clk: rockchip: fix wrong mmc phase shift for rk3328"
This reverts commit 4ef2449889.

The description for CRU_EMMC/SDMMC/SDIO_CON[0/1] is jumble on
chapters, make it clear that the correct shift is 1 that from
IC engineer.

Change-Id: I48dce293ec6ef82a5c78db38efc083227776ea99
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2020-03-05 19:35:44 +08:00
Jianhui Wang
2cfeb140f4 arm: dts: rk3288-evb-android-rk808-edp: fix sensor layout
Change-Id: Ie4d19e6e0e39c2fceb8bae99b8c72199a4410a46
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
2020-03-05 19:32:44 +08:00
Jianqun Xu
ac76d80e1d arm64: dts: rockchip: add rk3399-sapphire-excavator-edp-avb.dtb
Change-Id: I43be2a2bb9fee1fe2c9c60397d8daeadfa044e8f
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-03-05 19:31:12 +08:00
Li Huang
d9a506de89 ARM: dts: rockchip: 3288-android enable rga
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ibb97bc1147c1b6c8f5bd3722265546950258eb9f
2020-03-05 14:08:18 +08:00
Bian Jin chen
07b65d7918 ARM: dts: rockchip: enable rng for rk3288-android
Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I22f2c683f5a1cbc34c0636cc95709b69ccc08c63
2020-03-04 19:01:01 +08:00
Wang Panzhenzhuan
5c46471281 arm: dts: rk3288-evb-android-rk808-edp: add camera configs
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: If6b2fac5efdbdfaa530fd1f69e967bc252670ac0
2020-03-04 11:35:31 +08:00
Jacob Chen
a5ab7a2f7b FROMLIST: ARM: dts: rockchip: add rx0 mipi-phy for rk3288
It's a Designware MIPI D-PHY, used by ISP in rk3288.

(am from https://patchwork.kernel.org/patch/10119093/)
Change-Id: Ib3386c9c8b58242a2a09bcd3bc7bd66589053a9b
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2020-03-04 11:35:15 +08:00
Wang Panzhenzhuan
3ad93913eb ARM: rockchip_defconfig: rk3288 evb board: enable ov13850 & vcm149c & sgm3784
ov13850 camera module used by rk3288 evb board

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I23ad3dcb06a9f5c748a9399f5d4e9e9b1936ca52
2020-03-04 11:34:52 +08:00
Wang Panzhenzhuan
55481078e5 media: i2c: ov13850 add power gpio support
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ic7e707ab75e55843a348f51480a4964a888f7c55
2020-03-04 11:34:41 +08:00
Bian Jin chen
4a6058b7e5 ARM: config: rockchip_defconfig: enable CONFIG_OVERLAY_FS.
Android 10 use overlayfs to update logical partitions,
enabling this config to support adb debugging.

Test: adb root; adb remount; adb push some_file /somewhere.

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: Ic6d90915a88208b82f771db203521e628a74fc2d
2020-03-04 11:29:50 +08:00
Jianhui Wang
b1c20f0a91 drivers: input: sensor: add mpu6050 sensor support
Change-Id: Ieb3644db6b80f7ca241fe47fa7c1966cc490dce6
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
2020-03-03 15:26:31 +08:00
Jianhui Wang
751d452440 ARM: dts: rockchip: rk3288-evb-android-rk808-edp add mpu6050 sensor support
Change-Id: I3dc9c9e867a7cef1527af01e845019da85ff9e46
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
2020-03-03 15:13:13 +08:00
Ding Wei
75d777258b video: rockchip: mpp: add rkvenc driver
Change-Id: I9c0b4ad597a482e48b3b0d80b098d08e246b0c66
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-03-03 09:32:30 +08:00
Binyuan Lan
4ef18fc8e5 ARM: dts: rockchip: rk3288-evb add sound card support
Change-Id: Ida802e511506d99591bb8e04cab571426c231786
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2020-03-02 18:54:27 +08:00
Shunqing Chen
c26871fa42 ARM: dts: rockchip: remove ddc-i2c-bus from hdmi for rk3288-evb
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I2810cd3d20d391f641dc412b8f1b6e048bb27fbd
2020-03-02 18:52:06 +08:00
Jianing Ren
353b583e0e Revert "arm64: dts: rockchip: Add HCLK_USB_PERI for rk3368 otg"
We have removed the driver dwc3-rockchip-inno, and the hclk_usb_peri
is controlled by clock system framework instead of USB driver.

This reverts commit 24992130f2.

Change-Id: I947342389a0f85bb7f322c3481349a3ee2d56298
Signed-off-by: Jianing Ren <jianing.ren@rock-chips.com>
2020-03-02 18:50:55 +08:00
Jianing Ren
221f01aa26 clk: rockchip: add CLK_IGNORE_UNUSED for hclk_usb_peri in rk3368
We have removed the driver dwc3-rockchip-inno, and the hclk_usb_peri
is controlled by clock system framework instead of USB driver.

This reverts commit 00c75f4839.

Change-Id: I4184b074f1946f4ee8bd68c4dac5ff725272dfe7
Signed-off-by: Jianing Ren <jianing.ren@rock-chips.com>
2020-03-02 18:50:55 +08:00
Li Huang
4b7f245f00 RK3368 GPU: Fixup some bug
1.Fixup memleak on pvr_create_pt_fence
	2.Fixup crash on pvr_sync_has_signal

Change-Id: I999c8e96d0cab2814f5fdfbd8ea57ae6c30cd961
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2020-03-02 18:49:44 +08:00
Li Huang
b681951ea2 RK3368 GPU: fix the bad processing for return value of calling dma_fence_add_callback()
Change-Id: I98c9cfe4ab9a9c2c2bcc7d555f8848cb36207de1
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2020-03-02 18:49:44 +08:00
Li Huang
69b8d30757 RK3368 GPU: CacheOpSetTimeline(): realize sw_sync_timeline_inc() on 4.19
Change-Id: I43bdae99426dd0cb4e2d03a5c8278a1da6b6834f
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2020-03-02 18:49:44 +08:00
Li Huang
1ee20f30af RK3368 GPU: Rogue Q Init for 4.19.
1、Change Android sync to sync_file
2、Fixup compile error on 4.19
3、Fixup some crash on 4.19
4、Fixup some clang waring
5、Fixup clang warning

Change-Id: Ie59a9252116f6e7cc97f5f9b9a25ae6d5d5f82b1
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2020-03-02 18:49:44 +08:00
Finley Xiao
4067f719f2 dt-bindings: nvmem: rockchip-otp: Make resets as optional property
Change-Id: Icd2e130548e101a41b3030e90cbec9eca43d408e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-02 18:47:14 +08:00
Finley Xiao
8b9f568f6e nvmem: rockchip-otp: Update driver to use reset array API
This patch also makes resets as optional.

Change-Id: I25c0be3e811fafad824dd9096a6b89b3fc7d4b47
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-02 18:47:14 +08:00
Finley Xiao
6ee23e43c9 nvmem: rockchip-otp: Update driver to use clk_bulk APIs
Change-Id: I684d95c617e87474843dff166e288602df9d10ad
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-02 18:47:14 +08:00
William Wu
d22ee08595 usb: gadget: configfs: make sure to reactivate function on unbind
If a configs function sets bind_deactivated flag, upon removal it will be
left with an unbalanced deactivation. Let's make sure that we conditionally
call usb_function_activate() from purge_configs_funcs() and make sure
purge_configs_funcs() is called from configfs_composite_unbind().

Change-Id: Ibe91837fdb7754f8af343a18138556901a0e089f
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-03-02 14:57:19 +08:00
William Wu
2686202448 usb: gadget: configfs: fix defined but not used build warnings
Fix the following build warnings in configfs driver instead of
scripts/gcc-wrapper.py.

"configfs.c:1488", # drivers/usb/gadget/configfs.c:1488:12: warning: 'configfs_composite_setup' defined but not used
"configfs.c:1513", # drivers/usb/gadget/configfs.c:1513:13: warning: 'configfs_composite_disconnect' defined but not used

Fixes: a77196fc01 ("ANDROID: usb: gadget: configfs: Add Uevent to notify userspace")
Change-Id: I58ef495d6e84af8000d0bd7a3ce3a2ed7947b71f
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-03-02 14:57:09 +08:00
Wang Jie
87ee4bbe5d arm64: dts: rockchip: rk3368: modify vcc_lcd configure for rk3368 808 evb
1.When the system starts, enable vcc_lcd.
2.when the System sleep, disable vcc_lcd.

Change-Id: I29afc3e98a8cbe7ded65a8b9de1990fa2ea26b53
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2020-03-02 14:46:04 +08:00
Ding Wei
3f291e5ffb video: rockchip: mpp: update dev_command
merge cmd:
    MPP_CMD_SET_REG              -->
    MPP_CMD_SET_VEPU22_CFG       -->
    MPP_CMD_SET_RKVENC_OSD_PLT   -->  MPP_CMD_SET_REG_WRITE
    MPP_CMD_SET_RKVENC_L2_REG    -->
change cmd:
    MPP_CMD_GET_REG              -->  MPP_CMD_SET_REG_READ

tips:
    1. the xx_WRITE cmd is to write register, while xx_READ cmd is to
        read register.
    2. move MPP_CMD_GET_REG to MPP_CMD_SET_REG_READ, then it can set
        output when input.

Change-Id: Iee1d5c6aafdfea5e0d02d1865cd06079ef5f716b
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-02-28 17:18:30 +08:00
Alex Zhao
e4f54461e6 ARM: dts: rockchip: enable sdio0 for rk3288-evb
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I621bdd9b4e42be40bc303448e46516648f22aed8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-02-28 16:40:18 +08:00
Jianing Ren
f1b53c2ed2 usb: dwc3: gadget: fixed crash when unplugged usb cable
If the USB cable is unplugged when powered on or connected to PC,
it will cause the system to freeze. The final log is as follows:

[    5.109122] read descriptors
[    5.109180] read strings
[    5.113205] udc fe800000.dwc3: registering UDC driver [g1]

The crash is caused by visit registers of dwc3 when PD is off. the
function dwc3_gadget_set_speed is added in udc_bind_to_driver in
kernel 4.19 update. We need jump of this function when dwc3 is
suspended.

Change-Id: Ie0337aaf225543b4e9e05ee57a5eb7416797d56e
Signed-off-by: Jianing Ren <jianing.ren@rock-chips.com>
2020-02-28 14:51:35 +08:00
Guochun Huang
404c1b21e0 drm/rockchip: upgrade initcall level of protect loader clocks
To avoid the potential parent PLL clock of display being
closed when PD is shutdown, excute protect loader clocks
earlier.

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I5125590aac51b423e7e9fdc0032da9185c450be1
2020-02-28 14:34:35 +08:00
Simon Xue
7636d59e28 drm/rockchip: gem: add IOMMU_TLB_SHOT_ENTIRE when call iommu_map_sg
Add IOMMU_TLB_SHOT_ENTIRE prot for iommu_map_sg, this shoot down entire
iommu tlb one time after iommu_map_sg.This may save about 5ms when DRM
mapping 12MB buffer.

Change-Id: I618aff1b3928bd1ec1dd3d896db746e09e96acdc
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-02-28 14:25:36 +08:00
Simon Xue
5bb0884f84 iommu: rockchip: Introduce flush_iotlb_all to shoot entire tlb once
Change-Id: I1ef476fcde1b6d323dd2653dc01e27f9990cc6f5
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-02-28 14:25:26 +08:00
Wu Liangqing
18e0c32625 arm: rockchip_defconfig: enable CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Ibdb149548d315ab924cca0d8ad89626d4617c86d
2020-02-27 15:04:45 +08:00
Wu Liangqing
c0f60bc7de arm64: rockchip_defconfig: enable CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER
Change-Id: Ia0329e9e7f3d22bb8799da87152f32ddc77f4605
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-02-27 15:04:45 +08:00
Mark Yao
09d07c8016 drm/drm-prime: cache dma_buf import context
This patch is used by android 8+ system on RK3368 SoCs.

When drm to free object, it needs map sg again when alloc it next
time. For RK3368 SoCs' system, one dma buffer may used by ion and
drm devices together, it spend time to map sg, this patch remove
the destroy object and do it after final dma_buf_put.

Change-Id: Ia39a3d4691f0b545039efb880c999a35886178a0
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-02-27 14:54:19 +08:00
Mark Yao
3841912481 dma-buf: add release callback support
This patch is required by system on RK3368 SoCs.

Since its system used ion and drm drivers together, one dma-buf
may used by two devices, if one device deattached buffer, then
the other one need to map sg again, that takes time several ms.

The patch fix it by set buffer release operation in a list, and
do release after final dma_buf_put.

Change-Id: Ibfb4ffe3d97fae0a27f20032fdfbc3cc561aa375
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-02-27 14:46:53 +08:00
Cai YiWei
758a5b4ecb leds: add rgb13h led flash
Change-Id: Iafd7db5aa53ea70d9a6aa45f8270a3d3fd43bf4e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-02-27 14:41:33 +08:00
Cai YiWei
b88174b49a dt-bindings: leds: add leds-rgb13h
Change-Id: I0a32ba516ad8dab6fa6e72a81b6328c31ef61d0b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-02-27 14:41:33 +08:00
Cai YiWei
e697e47ae1 media: i2c: add sgm3784 flash driver
Change-Id: I7ba480f5e76d98dcdd801c7ea7ab13173427f3ca
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-02-27 14:41:33 +08:00
Cai YiWei
e7debfa127 dt-bindings: media: i2c: add sgm3784
Change-Id: Ia7332e4737b104ef450aca572d642f0522fb5dd8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-02-27 14:41:33 +08:00
Cai YiWei
b2a218ec91 media: rockchip: add led flash header
Change-Id: Ia7833a62b7b04f2f282f88b9bb2b79886f1e4c18
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-02-27 14:41:33 +08:00
Wyon Bi
ecd47ba5f3 drm/rockchip: lvds: Add missing configuration for rockchip_crtc_state
Change-Id: Id844c89db0623213c5751d438ff494130d604bab
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-02-27 14:40:50 +08:00
Wyon Bi
590bf4c3f4 drm/rockchip: dsi: Add missing configuration for rockchip_crtc_state
Change-Id: I8c5b4911f0f8832771f91a189a9e9ceea041c233
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-02-27 14:40:50 +08:00
Huang Jiachai
f894dd834d dma-buf/sw_sync: sw_sync register as misc devices
Because the kernel debug fs will removed from android 11, so we move
sw_sync to misc devices, as android lib sync has done the compatibility
work, so after this commit, the hwc there is no need to update.

Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Change-Id: I799b66b1ba98c9370893b9554095664010b635df
2020-02-27 10:54:49 +08:00
Jianqun Xu
a3abe77603 ARM: dts: rockchip: fix rk3288-evb dtsi file
Change-Id: I042ee6c425eaf82c4d73e5a5c911011a9cd1d4d5
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-02-27 09:35:18 +08:00
Wu Liangqing
b20b529fc1 arm64: rockchip: px30: remove firmware_android and support ddr4 board
Change-Id: I3b73f79f47fc2b3f73cb04ddf76af4e7c055c12a
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-02-27 09:29:18 +08:00
Grey Li
d37bac146e video: rockchip: mpp: add lock when traverse mpp_dma_buffer list
Change-Id: I3002dfce5415b8aebd54bcf3e9617f428e7a196f
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2020-02-26 17:52:59 +08:00
Wang Jie
3efe290bbf arm64: dts: rockchip: otg-port and vbus configure for rk3368 808 evb
Change-Id: I234ba606558ee247c8253705d87df9f37b15fc6e
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2020-02-25 17:58:58 +08:00