Commit Graph

860805 Commits

Author SHA1 Message Date
Allon Huang
2f31e5fcc3 media: i2c: ov02k10: support rk3566 evb1
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I46bbef1506bc8ecb8eb288582d88093b5b6f9589
2020-12-24 16:27:59 +08:00
Allon Huang
15594c3311 media: i2c: gc5025: support rk3566 evb1
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ib1e89ae63756660651803180b53c6fb2827857d4
2020-12-24 16:27:37 +08:00
Allon Huang
9cb5128ee0 phy: rockchip: mipi-rx: support rk3568 mipi dphy rx
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I47dd414b518f8b79f60c36fe47223cc636ed774d
2020-12-24 16:15:39 +08:00
Jason Song
1a4a5312b2 arm64: dts: rockchip: rk3566-rk817-tablet-rkg11: update dts file.
fix hp speaker camera sleep lcd config.

Signed-off-by: Jason Song <sxj@rock-chips.com>
Change-Id: I2cbf73f3d39b3416989bd68ccec8d35fbb4fe188
2020-12-24 16:10:52 +08:00
Jason Song
0c18a2d9d1 input: touchscreen: focaltech: fix bootup and suspend i2c transfer error
Lcd and touch use same power, so we must open uboot logo, turn on power
before touch init. When device enter suspend, power will be hold until
touch suspend.

Signed-off-by: Jason Song <sxj@rock-chips.com>
Change-Id: Ifae24073e982bec9d8cd1f1150c2e18c395930e4
2020-12-24 16:10:37 +08:00
Wu Liangqing
f33ac42bfe arm64: dts: rockchip: enable dsi uboot logo display for rk356x evb
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Iac2bc0eef65262798dd3c6b61ffc9711bee58597
2020-12-24 14:59:26 +08:00
Sandy Huang
187e0965d1 arm64: dts: rockchip: rk356x: move uboot logo config position
Change-Id: Icf43c0bbb8da3c8e20406557ef9d2d5f5025af47
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-24 14:57:12 +08:00
Cai YiWei
8d5c287ddb media: rockchip: isp/ispp to version v1.3.0
Change-Id: I27d24dcdea7eeefba4287ffa71c7ca509fd2e194
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-24 11:48:51 +08:00
Ding Wei
909b0f0559 video: rockchip: mpp: rkvdec2: add perf sel val
Tips: The sel val read via VAL0_BASE VAL1_BASE VAL2_BASE.

Change-Id: Ida4eee44f4e4cd6a51ca81eeb28e39091433edf2
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-12-24 11:43:16 +08:00
Cai YiWei
0be314b390 media: rockchip: isp: config dmatx to valid buf addr
Change-Id: I6e74e3a8e7d298c5620f6e4fab47c615f0b6b30c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-24 10:10:08 +08:00
Yiqing Zeng
1290aeebda media: i2c: sc200ai: fix set hflip/vflip failed bug
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I07f140b403076063f91b3b8fb976363ab689aa0b
2020-12-24 09:26:51 +08:00
Finley Xiao
279021a5f1 arm64: configs: rockchip_linux_defconfig: enable CONFIG_COMMON_CLK_SCMI
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I4d142133125a1ebafe4f946afc5b3f239d97ab70
2020-12-23 20:36:29 +08:00
Finley Xiao
059ef88dd2 arm64: configs: rockchip_linux_defconfig: enable CONFIG_ARM_SCMI_PROTOCOL
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I89f736d105ac4119d26e243f66e31711de5b6adf
2020-12-23 20:36:23 +08:00
Shunqing Chen
3a7686e976 power: rk817-battery: fix dsoc falling slowly
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I412bfc93a7645a6b0faf1b0128bdeefa848142ab
2020-12-23 20:19:20 +08:00
Sandy Huang
3c2317b25b arm64: dts: rockchip: enable dsi uboot logo display for rk3566-rk817-tablet
Change-Id: I3e643fc34569244931d18e25ab8d97af2a0ae302
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-23 20:10:24 +08:00
William Wu
bc10ef2673 arm64: dts: rockchip: add dis_u2_susphy_quirk for RK3566 OTG
The RK3566 OTG port supports USB 2.0 only, and make the internal
2.0 utmi clock to be routed as the 3.0 (pipe) clock. We find
that if the ACLK_PIPE is set to 400MHz, the DWC3 controller may
suspend the USB 2.0 PHY due to some unknown reason during usb
enumeration, and the utmi clock will be gated off, it makes the
DWC3 controller to work abnormally.

This patch adds dis_u2_susphy_quirk for RK3566 OTG to avoid USB
2.0 PHY enter suspend mode if the suspend conditions of DWC3
controller are valid. And the USB 2.0 PHY suspend mode can be
controlled in the PHY driver.

Change-Id: I5b00e8da8e5865d78cd706fe00476773aef8f8d5
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-12-23 19:46:07 +08:00
Sandy Huang
fd2ad3366c arm64: dts: rockchip: rk3568-android: add support uboot logo
Change-Id: Iec6c6e9dce55f959aae9c013bf46a1b5bc77ded3
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-23 19:45:39 +08:00
Wang Panzhenzhuan
b72893bf2d media: i2c: add soi jx_h62 sensor driver
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I9d66babd0be2a5564f2bf158dda3e954ec8abda8
2020-12-23 18:08:26 +08:00
Allon Huang
324e202bc0 media: rockchip: cif: extend line to fix merge bypass bug for isp20
sync with isp commit:Ia1ed6a885cffd55859dcec5ad35f22b99d506336

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I62660a8a7f8a69e9d89b884bf17f0a489c051117
2020-12-23 16:02:04 +08:00
Allon Huang
dc2948f279 media: rockchip: cif: add dvp sof
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ibda8e3de56baaa32cb74fa179c3706c5d3a87d96
2020-12-23 16:02:04 +08:00
Andy Yan
ae112b461e drm/rockchip: vop2: Update hdr10 register
Change-Id: Iffcd3d07ab29ddac6c48ff250880daf4db39a9ab
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-12-23 15:47:22 +08:00
YouMin Chen
e057a8cecb arm64: dts: rockchip: add rk3568 ddr relate node
Change-Id: I56ea14c5356ace1a2a479c0c0dac3b9d885b7c6c
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-12-23 12:54:27 +08:00
YouMin Chen
47a2ca382c clk: rockchip: rk3568: add sclk_ddrc for dmc
Change-Id: I900cb986ce1ee3e8e212636e621c29e73c437217
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-12-23 12:53:59 +08:00
YouMin Chen
19f9ea4b8e dt-bindings: clock: rk3568-cru: add clock ID SCLK_DDRCLK
Change-Id: Ie029065bda4de0fb764acf328c058c545c4176d6
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-12-23 12:53:49 +08:00
Cai YiWei
2679d1c2f5 media: rockchip: cif: vb2 dma sg for iommu enable
Change-Id: I06049142d51f4137683a6e871d42cf1b0e3c3fc5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-23 12:46:26 +08:00
Cai YiWei
0d8540d244 media: rockchip: ispp: vb2 dma sg for iommu enable
Change-Id: If54554daf86b481bbadca636427ffb52c3ca4e67
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-23 12:46:21 +08:00
Cai YiWei
fd37c931a3 media: rockchip: isp: vb2 dma sg for iommu enable
Change-Id: I50199da38b31a7d9b29673626ed9a0c07be5a94f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-23 12:46:16 +08:00
William Wu
265c90374d usb: dwc3: gadget: set in eps maxpacket limit to 1024 if en fifo resize
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Icd8a56f49895690b8aaa6eefa212656ca070b566
2020-12-23 12:43:41 +08:00
XiaoDong Huang
3df1a47a05 arm64: dts: rockchip: add scmi node for rk3568
Change-Id: I7e07abbec0d75d45ed693c82c7f16e7aaa1fa41b
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-12-23 11:31:13 +08:00
Algea Cao
8fa1516479 drm/bridge: synopsys: dw-hdmi: Support dw-hdmi does not serve as a connector
If dw-hdmi is not used as the final output port, it is
only used as a bridge but not a connector.

Change-Id: Ie730f47d6075db74c0c54374849fd938c13f5ba8
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2020-12-23 11:28:11 +08:00
Algea Cao
6d1fbe5b3d drm: rockchip: rk628: post_process: Enable y2r when input mode clk is 594Mhz
Because hdmirx phy only support yuv420 when input mode is 4K-60Hz,
y2r should be enabled.

Change-Id: I1eca2c6783c63e07cb13b617bb32ff81f2229c7d
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2020-12-23 11:28:11 +08:00
Algea Cao
c0a543e874 drm: rockchip: rk628: Add rk628 hdmirx driver
Change-Id: If4d9fefeada220430f9b6a5b3a35a20239461d3e
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2020-12-23 11:28:11 +08:00
Algea Cao
92ae0beb2b drm: rockchip: rk628: Add rk628 combrx-phy driver
Change-Id: I0fbcca09e05c9876ae7e87000d1fa5b72a061077
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2020-12-23 11:28:11 +08:00
Tao Huang
c48c2b8d2d arm64: dts: rockchip: add sram node for rk3568
Only 48KB system sram reserved for Linux.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I08aef6ce1ceacca41f774dad9fc9badd77107a5e
2020-12-23 11:22:03 +08:00
Tao Huang
9440625ac2 arm64: dts: rockchip: rk3568: Fix typo in gmac1_clkin
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ice14c54c4c7025fb9527a3cae3bfdae237f09287
2020-12-23 10:12:26 +08:00
zhangqing
f4974c9108 clk: rockchip: rk3568: add CLK_IGNORE_UNUSED flag for pvtpll
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
Change-Id: I24cdcdf4a22cf256dc4139eb6d1e1da878a17c2d
2020-12-23 10:11:07 +08:00
Sudeep Holla
e80884e89e BACKPORT: firmware: smccc: Drop smccc_version enum and use ARM_SMCCC_VERSION_1_x instead
Instead of maintaining 2 sets of enums/macros for tracking SMCCC version,
let us drop smccc_version enum and use ARM_SMCCC_VERSION_1_x directly
instead.

This is in preparation to drop smccc_version here and move it separately
under drivers/firmware/smccc.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Tested-by: Etienne Carriere <etienne.carriere@st.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Etienne Carriere <etienne.carriere@st.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20200518091222.27467-5-sudeep.holla@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
(cherry picked from commit ad5a57dfe4)

Change-Id: I8b3625d3adbaea003c1dadcbc028c62a2f4f59ba
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-12-23 09:55:29 +08:00
Mark Rutland
79f41c9c36 UPSTREAM: arm64: errata: use arm_smccc_1_1_get_conduit()
Now that we have arm_smccc_1_1_get_conduit(), we can hide the PSCI
implementation details from the arm64 cpu errata code, so let's do so.

As arm_smccc_1_1_get_conduit() implicitly checks that the SMCCC version
is at least SMCCC_VERSION_1_1, we no longer need to check this
explicitly where switch statements have a default case, e.g. in
has_ssbd_mitigation().

There should be no functional change as a result of this patch.

Change-Id: I2cfbe314cdcd59da923ff845015c8852acf92a3f
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit c98bd29917)
2020-12-23 09:46:11 +08:00
Mark Rutland
d3d417da2c UPSTREAM: arm: spectre-v2: use arm_smccc_1_1_get_conduit()
Now that we have arm_smccc_1_1_get_conduit(), we can hide the PSCI
implementation details from the arm spectre-v2 code, so let's do so.

As arm_smccc_1_1_get_conduit() implicitly checks that the SMCCC version
is at least SMCCC_VERSION_1_1, we no longer need to check this
explicitly where switch statements have a default case.

There should be no functional change as a result of this patch.

Change-Id: I61ad42fbdc1d2d684846e8eef54609889b101be3
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 6848253dde)
2020-12-23 09:41:54 +08:00
Wu Liangqing
b14e969b5e Revert "Revert "arm64: dts: rockchip: Temporarily disable its for rk3568""
This reverts commit f818feceb5.

TF-A do not support resume its right now.

Change-Id: Ibfd120242406feeae9171aa9d657b9cb6366e154
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-12-23 09:32:09 +08:00
William Wu
bd28ce36dd usb: dwc3: gadget: rework the tx fifos resize
The current code does the whole tx fifos resize in the function
dwc3_gadget_ep_enable() only when the ep-in is isoc type and the
maxpacket >= 1024, for example, if the usb gadget is configured
as UAC + RNDIS + UVC + ADB, then the tx fifos resize is done when
uvc streaming on, there maybe a risk that the in endpoints of the
uac/rndis/adb are using their tx fifos to transfer data while do
the whole tx fifos resize, if this case occurs, the dwc3 controller
will run into abnormal and unrecoverable state.

To fix this issue, we must make sure that there are not any in
endpoints using tx fifos to transfer data while do the whole tx
fifos resize. The patch does the tx fifos resize when the connect
done event occurs during usb gadget enumeration phase.

Change-Id: Ia793fd7895b36e771ad654e583fa3fd7bf29aac6
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-12-22 18:44:44 +08:00
William Wu
924ae9b9ea usb: gadget: add transfer_type in struct usb_ep for rockchip
The usb gadget core set the chosen endpoint descriptor for
each endpoints in config_ep_by_speed(), however, we want
to get the transfer type of the endpoints earlier on the
rockchip platforms for usb controller initialization
(e.g. do tx fifos resize for rockchip usb dwc3 controller),
so this patch add transfer_type in the struct usb_ep, and
set the transfer_type in the usb_ep_autoconfig_ss().

Change-Id: Ia2added218e180dda7a7ca5da09ee18d63be1ff0
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-12-22 18:44:44 +08:00
Wenping Zhang
b2fd919bec drivers: input: touch: fix bug system hang when cyttsp5 is not connected.
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: I7fd72a30b77ae3396c2220588794b03d78ed8642
2020-12-22 18:17:53 +08:00
Cai YiWei
d8fa472205 media: rockchip: ispp: dummy buf map to one page if iommu enable
Change-Id: Id55ff67679ffb80195bdb97478d0581cb106dab1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-22 18:14:33 +08:00
Cai YiWei
d82eda7389 media: rockchip: ispp: reduce buf count
Change-Id: Ie719d3cee9c638335af0edf45aa4b59e6c601f7b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-22 18:14:33 +08:00
Cai YiWei
4ff60a36b2 media: rockchip: isp: extend line to fix merge bypass bug for isp20
Change-Id: Ia1ed6a885cffd55859dcec5ad35f22b99d506336
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-22 18:13:34 +08:00
XiaoDong Huang
8ff4c4166c arm64: configs: rockchip_defconfig: enable CONFIG_COMMON_CLK_SCMI
Change-Id: Ie45297e5ba969de758957ef2086f53d28ac08ffd
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-12-22 17:36:16 +08:00
XiaoDong Huang
9c697da828 arm64: configs: rockchip_defconfig: enable CONFIG_ARM_SCMI_PROTOCOL
Change-Id: I05818555cd5f796750922be7d57d4653c3f362f9
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-12-22 17:36:10 +08:00
Jianqun Xu
8086d8dbbe android: ion: add vmap/vunmap operations
Change-Id: I90e2bcdd4526409194917609deb791e7badaf4f4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-12-22 17:34:35 +08:00
Elaine Zhang
85adafe7d8 arm64: dts: rockchip: set ACLK_PIPE to 400M for rk3568
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I4b9e01f05b8f0782bbd35b6265eb2fbf8dd0359e
2020-12-22 17:30:32 +08:00