Commit Graph

847698 Commits

Author SHA1 Message Date
Wu Liangqing
30e757b4c4 arm64: dts: rockchip: add adc_keys node for rk3399 board
Change-Id: I0fde323d5924df5389e51abc584cc6eccbcb6166
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-19 08:45:37 +08:00
Wu Liangqing
addd52e777 arm64: dts: rockchip: rk3399-tve1030g add rk_headset support
Change-Id: I4db0f8caa5011c5d2f4697fe6405316f1974c0f4
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-18 18:44:50 +08:00
Jianqun Xu
a25827902c arm64: dts: rockchip: remove adc-keys from rk3399-android.dtsi
Change-Id: I4a01cfcc4dfe69cab164836d4b2ecc893d463356
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-12-18 17:46:08 +08:00
Tao Huang
e8c812380f thermal: rk_virtual_thermal: select POWER_SUPPLY when RK_VIRTUAL_THERMAL enabled
Fix build error without POWER_SUPPLY.

Change-Id: I259f914e6e9a945ffdd8676639916a7e07f92d40
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-12-18 17:26:55 +08:00
Tao Huang
c93527b2a3 ARM: configs: remove unused rockchip_sec_defconfig
Rockchip Android/Linux all support TEE now.

Change-Id: I4816ab4e863ab8f859936432438259bd72080713
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-12-18 15:51:13 +08:00
William Wu
df6155fa81 ARM: dts: rockchip: remove unused nodes for rk3288 usb otg
The legacy node "dwc_control_usb" and related properties
is used for dwc_otg_310 driver which has been deprecated,
so remove these unused nodes and properties for rk3288 usb.

Change-Id: I38004b84fb03e879d8910bc125090c3f8197afd1
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-12-18 15:45:25 +08:00
William Wu
5f5ab4607a arm64: dts: rockchip: rk3368-px5-evb-android: remove unused property for rk3368 usb
Change-Id: I97f2f442d52d7d29add64815581b7bf7e41554fb
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-12-18 15:44:51 +08:00
William Wu
be61f93d65 dt-bindings: usb: dwc2: remove legacy document for rockchip usb
Change-Id: I5afc660fdc77cc882ce083ccbc763ef137d95f41
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-12-18 15:43:28 +08:00
William Wu
8b1f7a3b68 usb: dwc2: drop the legacy dwc_otg_310 drivers
This patch removes the legacy dwc_otg_310 drivers which are
used for RK3288/RK3368 SoCs, and use dwc2 drivers instead
of it.

Change-Id: I281a02f335fe64fd20d3cdb301d41eda74ea1b63
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-12-18 15:42:48 +08:00
Tao Huang
1846820d40 ARM: configs: remove unused rockchip_chromium_defconfig
Change-Id: Ida10ce43b89c88161d93030de22a154332e8f1ad
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-12-18 15:39:11 +08:00
William Wu
99809f9f9a phy: rockchip-typec: set usb3 to usb2 only for dp 4 lanes
If the Type-C PHY works as DP 4 lanes, the Tx/Rx lanes
of Type-C USB 3.0 PHY is used for DP lanes, so it needs
to force the USB 3.0 to USB 2.0 only, and make sure USB
3.0 xHCI controller doesn't support USB 3.0 port.

With this patch, an ASUS Type-C to HDMI dongle which
supports DP 4 lanes and USB 2.0 simultaneously can
suspend/resume successfully.

Change-Id: I77049702c768bd56d638d11c29aae07eeb608282
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-12-18 15:36:37 +08:00
Tao Huang
08235d93f9 soc: rockchip: sdmmc_vendor_storage: Add g_vendor free
Free g_vendor when init failed or module exit.
Alloc g_vendor once because g_vendor size is large.

Change-Id: Ia4909ba86f010c59fc2821dd0732b698b188bbcc
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-12-18 09:19:13 +08:00
Tao Huang
5f235a6cc2 soc: rockchip: flash_vendor_storage: free g_vendor when module exit
Avoid memory leak.

Change-Id: I391ed111ad49abeb7156441ab7cc0d2ba6cb6927
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-12-18 09:14:57 +08:00
Sandy Huang
f17edd2d3b drm/rockchip: gem: add dma buffer map to iommu
for some scene we need to alloc continue buffer from dma buffer,
but vop iommu is still enable, so we add iommu map for dma buffer.

Change-Id: I4749eac53609f865d0d4230364b1cbaf39ee095a
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-12-17 14:10:56 +08:00
Xinhuang Li
ec250395a3 drm: bridge: dw-hdmi: no need update i2s_select when hdmi audio shutdown
the previous practice will set the reg of i2s_select to select spdif when
audio shutdown and playing spdif at this point will cause the audio to
come out of hdmi as well

Change-Id: I8f9f53ea71ce83b33e32b575bacd2249da3b7d8f
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
2019-12-16 18:07:16 +08:00
Sugar Zhang
3e0cf8c18e drm: bridge/dw-hdmi: add support for hdmi bitstream audio
Change-Id: Ib1f6c5dba6451f3fbb029b5472dbfbf5694cff68
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2019-12-16 18:06:57 +08:00
Jianqun Xu
8580b08fb9 arm64: dts: rockchip: rk3368: fix to ACLK_ISP for isp node
Change-Id: If7c67469c6b1c00b7976a073a44764bea7d0ec7c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-12-16 17:52:53 +08:00
Jianqun Xu
bdd7c60ffc clk: rockchip: rk3368: remove the gate bit CRU_CLOCKGATE_CON16[0]
Change-Id: I17d0a9d13a1814e9d0d0676c6b7730bcf78925dc
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-12-16 17:52:36 +08:00
Wu Liangqing
e62af425ec arm64: configs: rockchip_defconfig: add CONFIG_VIDEO_GC2355
support camera gc2355 default for rk3399_tve1030g board

Change-Id: Ib90711a7ade38228ad5d3e6568777b39cfd932a2
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-16 16:27:50 +08:00
Wu Liangqing
b8eb221c97 arm64: dts: rockchip: rk3399-tve1030g: support Android10.0
Change-Id: Ibfb895b658d1053c774c21925da7367d3bb8b3cb
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-16 16:27:00 +08:00
Shunqing Chen
cf05417063 drm: rockchip: dw-hdmi: fix the issue of hdmi unbind error
Change-Id: Ida30cf7f38209ee730ca87589e22f9cdbaef4953
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2019-12-16 15:52:57 +08:00
Jianqun Xu
3e49cc2bff Revert "drm: bridge: synopsys: dw-hdmi: Set dw-hdmi driver data"
This reverts commit db79b1540c.

Change-Id: I75a5ada2b6e6f8cfc7959221af1c85483d7a1a1f
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-12-16 15:52:57 +08:00
Wu Liangqing
f428402880 arm64: dts: rockchip: rk3399-android: changed adc_keys add power_keys node name
Change-Id: I6d7560ba712190582bd2ecca57b85b807f8781cb
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-16 15:25:52 +08:00
Yifeng Zhao
1aea7d3866 drivers: rk_nand: use BLK_STS_x instead of -EIO to fix bug
bug:
[   91.053943] WARNING: CPU: 0 PID: 1606 at block/blk-core.c:247 blk_status_to_errno+0x20/0x30
[   91.167875] Call trace:
[   91.168109]  blk_status_to_errno+0x20/0x30
[   91.168485]  dec_pending+0x108/0x228
[   91.168814]  clone_endio+0xa4/0x160
[   91.169134]  bio_endio+0xe0/0x190
[   91.169441]  blk_update_request+0xa4/0x370
[   91.169816]  blk_update_bidi_request+0x24/0x90

Change-Id: I703c1707cae442c99482a2a39f3b09d6585d06c5
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2019-12-16 15:18:49 +08:00
Wu Liangqing
20d9407ed4 Revert "arm64: dts: rockchip: rk3399-evb-ind disabled dmc"
This reverts commit e7862a4a5d.

Change-Id: Ifb69fea34f757bea25ca407b5b47e63be20719ef
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-16 15:06:32 +08:00
Wang Panzhenzhuan
fd2e7e7070 arm64: dts: rockchip: rk3326-evb-lp3-v10-avb: add camera configs
Change-Id: Ic2d61cbd8a30608c61652a08cd194588bd2251c7
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-12-16 14:13:56 +08:00
Jianqun Xu
911d2a2fe6 arm64: dts: rockchip: remove duplicated arm-pmu in rk3368 dtsi
The duplicated arm-pmu node is added by commit
d88bd40057

Fixes: d88bd40057 ("arm64: dts: rockchip: rk3368 add more ip nodes to core dts")
Change-Id: I6583345b5903ae4a3f7383b7f43399ed0cbafc0d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-12-13 19:15:46 +08:00
Alex Zhao
2b8a795846 net: wireless: update bcmdhd driver to 1.579.77.41.22
Change-Id: Ib5df542df130214999a3c2d4361c265fa8bcc39f
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
2019-12-13 11:12:58 +08:00
Wang Jie
a18ff36155 arm64: dts: rockchip: add new rk3368 evb dts
This device tree is available for the new rk3368 evb board.

116f65166cfa arm64: dts: rockchip: rename 4G-Modem to rk_modem for rk3368-808
c4bbda67d371 arm64: dts: rockchip: add vcc_lcd for rk3368 808 evb.
2d6441c9c6fe arm64: dts: rockchip: add hdmi sound card for rk3368 808 evb.
24157837b3b1 arm64: dts: rockchip: add 4g modem for rk3368-808
97793844bcf4 arm64: dts: rockchip: modify rk3368-808 dts.
efa647d019bb arm64: dts: rockchip: add new rk3368 evb dts

Change-Id: Iadb9fd012b297092d54d1be96129e7b70f6b2b83
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-12-13 09:37:25 +08:00
Algea Cao
d26602b9be drm: rockchip: dw-hdmi: Replace hdr_static_metadata with hdr_output_metadata
hdr_static_metadata is no longer used for HDR configuration,
used only as store the hdr info after edid parsing.

Change-Id: Ib2c5e3e739267433176181aa9a0611a50a847125
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-12-12 18:51:32 +08:00
Jianing Ren
16e46e0fc1 phy: phy-rockchip-inno-usb2: add EXTCON_USB_HOST working as peripheral
We previously registered two extcon notifier in dwc3/dwc3_rockchip.c in
kernel-4.4, EXTCON_USB and EXTCON_USB_HOST respectively, so we only need to
send EXTCON_USB notifications when acting as a peripheral. In the new
kernel 4.19 code, only EXTCON_USB_HOST is registered in dwc3/drd.c. In
order to be notified to dwc3 controller as a peripheral, we need to send a
EXTCON_USB_HOST notification at the same time.

Change-Id: I7507b90c94d35877ce704222a49e8e673a49a162
Signed-off-by: Jianing Ren <jianing.ren@rock-chips.com>
2019-12-12 18:42:24 +08:00
Jianing Ren
24db9031d0 phy: phy-rockchip-inno-usb2: add iddig_output/en regs for rk3399
In order to switch the drd mode of the dwc3 controller by software, we
add these registers in the driver.

Change-Id: Ice5009631f491915ca78b5310cc9c623269bff41
Signed-off-by: Jianing Ren <jianing.ren@rock-chips.com>
2019-12-12 18:41:23 +08:00
Ding Wei
d31787415c video: rockchip: mpp: add function that trans info can set by user space
priority order:
1. MPP_CMD_SET_REG_ADDR_OFFSET define the trans table each task.
2. MPP_CMD_INIT_TRANS_TABLE define once when open session.
3. use default trans table define in each device.

Change-Id: I13409fb67d58dfa53295aabe7952d044dc1637d4
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-12-12 15:32:46 +08:00
Tao Huang
4a448336e4 video: rockchip: mpp: fix compile warning if !DEBUG_FS
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I181025ef7324c704a7f745d790f59e1780a3c0cb
2019-12-11 15:09:11 +08:00
Jianing Ren
f070ac5526 usb: dwc3: core: adjust the order of probe
In the original probe process, firstly check if it is a dwc3 core, then
get the clock and deassert the reset. This sequence will cause probe
breaking when the relevant register values is zero when the reset is
asserted. To avoid this problem, I adjust the order of probe, firstly
deassert the reset, and then check whether it is a dwc3 core.

Change-Id: Ib5783e450b45dad7ded82fc9c6cd0492bc788d11
Signed-off-by: Jianing Ren <jianing.ren@rock-chips.com>
2019-12-11 14:48:23 +08:00
Ding Wei
29c272c498 video: rockchip: mpp: add control to query hw_id
Change-Id: I246f9484e5f6a9d8ed65bd4962d1472e717c3aa3
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2019-12-11 14:41:36 +08:00
Wu Liangqing
e7862a4a5d arm64: dts: rockchip: rk3399-evb-ind disabled dmc
Change-Id: I3f5010c67e11fd416ec03cca44cf4358763b97b9
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2019-12-11 14:41:18 +08:00
Xiao Ya peng
79fbd388d3 ARM: dts: rk3229-evb: Enable the integrated PHY for gmac
This patch enables the integrated PHY for rk3229 evb board
by default.
To use the external 1000M PHY on evb board, need to make
some switch of evb board to be on.

Change-Id: I31f2ca6293eeac8a70aca20160f325abdf7509b6
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
2019-12-11 14:39:59 +08:00
Wang Panzhenzhuan
74a1b24387 media: i2c: ov5695: fix mistake
Commit b7526773a3 ("media: i2c: add enum_frame_interval
function for iq tool 2.2 and hal3") add enum_frame_interval
function, but forget to use in struct v4l2_subdev_pad_ops, fix it.

Fixes: b7526773a3 ("media: i2c: add enum_frame_interval function for iq tool 2.2 and hal3")
Change-Id: I8383a7a409ca5f2fa3a8f8d98c38b94062c2bb36
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-12-11 14:35:06 +08:00
Grey Li
4bb14215a2 ARM: dts: rockchip: rk322x: add reset group for video codec
Change-Id: I875bb150095c6f68856896ea903296bf2f7a65ee
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2019-12-11 14:21:37 +08:00
Grey Li
39a98f7f51 ARM: dts: rockchip: rk312x: add reset group for video codec
Change-Id: I92da8f6bd1b8c6c5c773a8742a9577e9b99111fa
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2019-12-11 14:21:20 +08:00
Grey Li
6e2adf69ad arm64: dts: rockchip: rk3399: add reset group for video codec
Change-Id: I234cf68cc335c59837d1c771d264604b55812a37
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2019-12-11 14:21:02 +08:00
Grey Li
8652ad19af arm64: dts: rockchip: rk3328: add reset group for video codec
Change-Id: I4e3e524a3e994c12675dc8b54a7c11f80f263d6b
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2019-12-11 14:20:44 +08:00
Grey Li
d49b03a75f arm64: dts: rockchip: px30: add reset group for video codec
Change-Id: Iccb78ec6dbcefc410282b6adc92aa3709ece9729
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2019-12-11 14:20:14 +08:00
Grey Li
39944a035f dt-bindings: video: mpp: add reset group
Change-Id: Ibffc586265f2cfc390d9fe4941d7cb91bc46bec4
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2019-12-11 14:19:19 +08:00
Grey Li
4e985204d0 video: rockchip: mpp: add reset group for shared reset clk
1. Put the same reset clk in same group to make sure these clk can only
   use devm_reset_control_get get once. Otherwise, devm_reset_control_get
   will be fail.

2. Add rw_semaphore to avoid shared clk reset when other running.

Change-Id: Ifd0f1137ac82fdfef9e99bc3501c8dc8c1e1b7dd
Signed-off-by: Grey Li <grey.li@rock-chips.com>
2019-12-11 14:19:06 +08:00
Tao Huang
f6bab64d54 ARM: rockchip_defconfig: enable CONFIG_PGTABLE_MAPPING
47 cycles/map vs 220 cycles/map

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4d340c8ddf95213872b451672cdb9e3369d46f50
2019-12-11 11:49:30 +08:00
Tao Huang
e10ef9006c ARM: rockchip_defconfig: disable CONFIG_NAMESPACES
Save memory for Android.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7d99b001d6201cc21f820b3301fde4c86399f295
2019-12-11 11:49:30 +08:00
Tao Huang
2d093278ad ARM: rockchip_defconfig: disable CONFIG_RUNTIME_TESTING_MENU
Change-Id: Ib9fa509aa666c8371fd0befd57f7ed302dc8592e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-12-11 11:49:30 +08:00
Tao Huang
dcbed7ddb6 ARM: rockchip_defconfig: disable CONFIG_KSM
Save memory and cpu usage for Android.
Base on android-recommended.config.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id4ecfafab836df8a7a8ba382fa5f32e516176368
2019-12-11 11:49:30 +08:00