Merge made by the 'ours' strategy.
* commit '5525a9cc48ab35c4fdb9905ee7c07137fb756078':
arm64: dts: rockchip: Remove unused quirk for usb dwc3 controller
Change-Id: I5c355249827459dd102ea6b27ad36db0f48b8900
This patch remove unused property "snps,xhci-trb-ent-quirk"
for rockchip platforms.
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I34212099c21764dfdd2e42d03f91dbf449e3b0c9
This patch remove unused property "snps,xhci-trb-ent-quirk"
for rockchip platforms.
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I34212099c21764dfdd2e42d03f91dbf449e3b0c9
This reverts commit fdc8aea2c0.
This patch remove unused property "snps,xhci-trb-ent-quirk"
for rockchip platforms.
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I849019919feecd1a35a26e5d668e53a8d8bcae2e
This patch remove unused property "snps,xhci-trb-ent-quirk"
for rv1126 usb controller.
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ic6a713261219cb75b7739f2db8ff5dddfafe67b1
The PCIe dbi base is accessible in userspace by mmap, then the
elbi_data and bar0 physical address is visible from dbi base mmap
space.
Change-Id: I5abd5921d2c7fd361e098ded568a470ff1b67ad2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
It's recommended to use internal pulldown, so we enable it via FW.
However commit 8b5c2b45b8 ("phy: rockchip: set pulldown for strobe line in dts")
disabled the pulldown settings if no dts property available. This
breaks all the existing RK3399 boards without external strobe pulldown
resistor. Fix is by adding rockchip,enable-strobe-pulldown to
rk3399.dtsi
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I510614e2029de293dfce48c78b1928244370b921
* commit '424557b2d34d9e876f0f1d36f3771e73ecfbdea8':
ARM: rockchip: rv1106: sleep: fix compile error
media: rockchip: vicap: fixes error of quick stream for AOV without rtt mcu
media: rockchip: vicap change stream suspend/resume early
media: rockchip: vicap support resume mode of oneframe without rtt
phy: rockchip: mipi csi2 dphy support set quick stream
phy: rockchip: csi2-dphy: fixes NULL of dphy node for dcphy
mfd: display-serdes: add split mode function support
dt-bindings: opp: Document rockchip opp bindings
arm64: dts: rockchip: rk3588: Change opp clock for gpu and npu opp table
Change-Id: I2570e20cda5e192e35b5d7476fcf5fc45b4787ec
Merge made by the 'ours' strategy.
* commit '7e80a3380a15d6f7b1ddc67e1c79411c33564903':
soc: rockchip: opp_select: Add support to parse rockchip,opp-clocks
Change-Id: I11f140b6d52263287091830174e83ec28e194417
The clocks property is used to get avs frequency and avs scale on some
platforms, add new property rockchip,opp-clocks for pvtpll and read
margin.
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ida795081e199b40a0bdfe3cb079ae8286d006057
This patch is used for compatible for old style mclk
reference which do not use the "mclkout_x".
Use property 'rockchip,clk-ignore-unused' instead the fixed one.
Suggest to drop this patch for totally new SDK or SoCs
in the future.
Ref: 1255f11b25 ("clk: rockchip: clk-out: Add CLK_IGNORE_UNUSED flag")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ifa5c0be7f2aad6fc6848b49f4612a160b04d7254
This patch is used for compatible for old style mclk
reference which do not use the "mclkout_x".
Use property 'rockchip,clk-ignore-unused' instead the fixed one.
Suggest to drop this patch for totally new SDK or SoCs
in the future.
Ref: 1255f11b25 ("clk: rockchip: clk-out: Add CLK_IGNORE_UNUSED flag")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I72797d9fa3f8367c48808489e24f544c34acab39
The clocks property is used to get avs frequency and avs scale on some
platforms, add new property rockchip,opp-clocks for pvtpll and read
margin.
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ida795081e199b40a0bdfe3cb079ae8286d006057
fix unexpected exit during execution of llp tasks, The 0th
bit of the work status register indicates whether the current
task in linked-list mode has successfully completed execution.
The 4th bit indicates all tasks has been processed done.
Change-Id: I099c55e2f00cc63e9f4ee0d3e2696ccec9a5ae9a
Signed-off-by: Jacob Chen <cc@rock-chips.com>
rv1106 dual_sensor will call rkisp_hw_enum_isp_size,
if memset isp_size to 0 will cause is_on be false,
when isp pm,isp reg_save/reg_store can't be called
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: If91e3feaf113fe8ca3d22fca92c2800c99f5b55d
Set dev->init_name = "dmc" to fixed the device name of rockchip_dmc.
Fixed the node path of rockchip_dmc to /sys/class/devfreq/dmc/.
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: I6633371fa92ee3f226e18568ad1758e9c48e69ec