Commit Graph

1061426 Commits

Author SHA1 Message Date
Tao Huang
1e50aec536 Revert "FROMLIST: usb: gadget: f_uac*: Support multiple sampling rates"
This reverts commit 37ed8f4607.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id61128a4036dbc8384bc60da8f8a586b9b697800
2021-12-14 15:23:34 +08:00
Tao Huang
1b310c9a83 Revert "usb: gadget: u_audio: add uevent for set_alt and set_srate"
This reverts commit ac1ed698c3.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I55f6981af82caa899d0029d177586d1172cc7d26
2021-12-14 15:23:34 +08:00
Tao Huang
b257b2f8eb Revert "usb: gadget: f_uac: add volume and mute feature unit"
This reverts commit c55a0ab282.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I95029eaf2894edaa63f03ac59d41a4bd1173581f
2021-12-14 15:23:34 +08:00
Tao Huang
a657331532 Revert "usb: gadget: f_uac: add pktsize calculating at setting playback srate"
This reverts commit be3429e9b2.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If5b42dc3390f919306b7f3aeb9d2f93125d09c2c
2021-12-14 15:23:34 +08:00
Tao Huang
7303e5112d Revert "usb: gadget: u_audio: add uevent for ppm compensation"
This reverts commit be7c4cf14b.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I0516a0b4c36b4808e86adf152d7faa44af60c077
2021-12-14 15:23:34 +08:00
Tao Huang
eeb4eec9a5 Revert "usb: gadget: f_uac1: finalize wMaxPacketSize according to bandwidth"
This reverts commit 71a43ff15c.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Idf2a548afd303d97a14310792492d93931259a79
2021-12-14 15:23:34 +08:00
Tao Huang
f2795d3dcf Revert "UPSTREAM: usb: f_uac2: adds support for SS and SSP"
This reverts commit c3fa37174e.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I565f8a0120ef89adb906ea1556f2668b89d58710
2021-12-14 15:23:34 +08:00
Tao Huang
6ddbc288b9 Revert "usb: gadget: f_uac2: make compatible for windows os"
This reverts commit e360c65d23.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic9643aba5addbc8cd83d205825fa19e51f3770d9
2021-12-14 15:23:34 +08:00
Tao Huang
cb7c9a7464 Revert "usb: gadget: f_uac1: adds support for SS and SSP"
This reverts commit 306637c8e1.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4850614d227c8be0f8cac4e3364317e14cb4cf53
2021-12-14 15:23:34 +08:00
William Wu
9aa2f569c9 arm64: dts: rockchip: rk3588-evb: Only add u2 phy node for hs boards
The rk3588-evb5-lp4 and rk3588s-evb2-lp5 only support Type-C
usb 2.0 high speed device, and their usb 3.0 phys are disabled
by default. So these boards can only use usb 2.0 phy node.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I7f76774001445d0c5470c10f65995be489b62db6
2021-12-14 15:17:05 +08:00
William Wu
308ccc03e3 phy: rockchip: inno-usb2: Improve the functions for rk3588
This patch aims to improve the functions of rk3588 usb2
phys for otg0 and otg1 port.

1. Add bvalid and id configuration registers to support
   switch device/host mode by phy.

2. Add charger detection function for otg1.

3. Fix charger detection fail on DCD stage.

Change-Id: I3922123ad0c75f88ab3c9be117b9c92c3ea7dfaf
Signed-off-by: William Wu <william.wu@rock-chips.com>
2021-12-14 15:16:24 +08:00
William Wu
2cbfa1f019 usb: dwc3: debugfs: Fix mode switch for rockchip
When switch dwc3 mode to device on rockchip platform,
it may fails to connect to usb host because the auto
suspend delay is only 100ms. This patch sets the switch
mode to desired_role_sw_mode, and it can avoid to enter
runtime suspend.

Fixes: 5ac62b80f7 ("usb: dwc3: fix runtime pm for rockchip")
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: If3f7faee1e9550322a80f297136b8faf1ebed301
2021-12-14 15:16:12 +08:00
Shawn Lin
e6ae079436 phy: rockchip: naneng-combphy: Force detect Rx for RK356X and RK3588 SoCs
Follow internal design requirement.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I1b304cfab4a65c88cfdab6f59922f297fa35e742
2021-12-14 15:13:01 +08:00
Algea Cao
6767e3819f drm/rockchip: dw_hdmi: Don't create hdmi property hdmi_quant_range
RK3588 does not currently support this property.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Iddb898bc044a3f2aa07b27506593b2c56f096e16
2021-12-14 14:59:09 +08:00
Wyon Bi
fd70e6d353 drm/rockchip: dw-dp: Fix connectors changed in clone mode
When a new connector is added to current routing in clone mode,
the new connector doesn't have mode_changed=true set. This
incorrect programming sequence causes .mode_set call mismatches
to occur in the new stream.

So move the mode_set code to other callback.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I90f50882057c63f702cf390fb7bfeed088575324
2021-12-14 14:50:21 +08:00
David Wu
aada4c37d2 net: stmmac: Add GFP_DMA32 for rx buffers if no 64 capability
Use page_pool_alloc_pages instead of page_pool_dev_alloc_pages, which
can give the gfp parameter, in the case of not supporting 64-bit width,
using 32-bit address memory can reduce a copy from swiotlb.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Change-Id: I62bff35850cf62db1be7067f3050b27039ae5d75
2021-12-14 14:47:00 +08:00
Jianwei Fan
a72739e96e media: i2c: tc35874x: fix driver probe level
It will cause this sensor to fail to link to the vicap controller if
used late_initcall_sync. Because the probe level of vicap controller is
late_initcall.

Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I74a4606f0af16d860d7b28ba311b14efeda0c225
2021-12-14 11:01:47 +08:00
Wu Liangqing
42aecd6060 arm64: dts: rockchip: rk3588s-evb1: enabled sdmmc
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Ica4ae16241aa7b57848940043d55fb7b624bdfca
2021-12-14 09:59:06 +08:00
Damon Ding
56102c8698 drm/bridge: sii902x: modify the check of bus-format
Use the definition of MEDIA_BUS_FMT_XXX instead of the
definition of sii902x_bus_format.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I72b4d92a1704f98f437a80d2a8afe16d9f6b003f
2021-12-14 09:58:24 +08:00
Herman Chen
e026e105c8 video: rockchip: mpp: rkvdec2: fix pagefault on start
Fix pagefault on decoder first task.

[  151.797045][    C0] rk_iommu fdc38700.iommu: Page fault at 0x00000000fefc0000 of type write
[  151.797071][    C0] rk_iommu fdc38700.iommu: iova = 0x00000000fefc0000: dte_index: 0x3fb pte_index: 0x3c0 page_offset: 0x0
[  151.797080][    C0] rk_iommu fdc38700.iommu: mmu_dte_addr: 0x0000000000305000 dte@0x0000000000305fec: 0x34f001 valid: 1 pte@0x000000000034ff00: 0x77aec407 valid: 1 page@0x0000000477aec000 flags: 0x6
[  151.797088][    C0] mpp_rkvdec2 fdc38100.rkvdec: fault addr 0xfefc0000 status 6b
[  151.797094][    C0] rk_vcodec: mpp_task_dump_mem_region:1654: --- dump mem region ---

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I991d86c931cdd07df85a6458cf1351c68ce87007
2021-12-14 09:54:27 +08:00
Herman Chen
99582ba73a video: rockchip: mpp: rkvenc2: Fix dual core issue
The rkvenc2 dual core mode will split one large frame into two tile as
task 0 and 1. The task 0 must be started before task 1 otherwise
hardware will generate error.

So we need some changes:

1. Bind two core into one taskqueue. If each core is binded to one
thread then the real hardware config and start timing is not certain.
NOTE: current mode still has case that one extra task is insert between
task 0 and 1.

2. Record core info and core id when multi-core is attached to the same
taskqueue.

3. Add prepare stage to decide which core is used to run the task and
set the struce mpp_dev *mpp in struct mpp_task.

4. Correspondingly the free task should use the mpp_task->mpp if it is a
multi-core mode task.

5. Remove mpp_iommu_attach in mpp_task_run. The mpp_iommu_attach is for
switching different devices which has shared resource like vpu and
rkhevc in rk3568 and rk312x. These chipsets are not supported on 5.10
kernel.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Ide52d59cca3adec44e05ab4bfc5bac7d713ad628
2021-12-14 09:31:06 +08:00
XiaoTan Luo
76c84e0979 ASoC: dt-bindings: rockchip: Document: add headset/headphone jack && keys detect for multicodecs
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I4f31d009b3890a886d225eab8aa8717e76333ad9
2021-12-13 15:51:53 +08:00
XiaoTan Luo
524cac67f9 arm64: dts: rockchip: rk3588-evb1-lp4: add headset play/pause key
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: Iaf7f179f19175d2956de2975b8893993ed9c30ba
2021-12-13 15:51:45 +08:00
XiaoTan Luo
f08221c208 ASoC: rockchip: multicodecs: add headset key button detect
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I320546bbb0c9c47695e9614aba4e222ce305299e
2021-12-13 15:51:45 +08:00
Zefa Chen
0e4ca9abc1 media: rockchip: cif support config compact mode during the frame end
in the case of dma capture enable by vicap

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I675580350005fba9567a19666843452c523f9773
2021-12-13 15:22:04 +08:00
Zefa Chen
4ab7d291f9 arm64: dts: rockchip: rk3588 mipi_csi2 remove power-domains
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I71b36f15e4c2583097d3a13c15d8274c7ba0065b
2021-12-13 15:21:08 +08:00
Zefa Chen
7b9b409079 media: rockchip: cif: add pm ctrl in video node open function
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ide54139fabfe7a70d33b14b56b6524ca639a41de
2021-12-13 15:20:58 +08:00
shengfei Xu
52d9400791 mfd: rk806: update rk806 IRQ table
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ib00435e710946c6b510c76122ed43ce0b134fe32
2021-12-13 15:02:53 +08:00
Wyon Bi
29bdeacb4b drm/rockchip: dw-dp: Fix bus format for split mode
Fixes: f9e002e86f ("drm/rockchip: dw-dp: Add full output bus format support")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ib644ce28a5963082989e5345f046aca591c63166
2021-12-13 15:01:12 +08:00
Li Huang
b4874f0b2b video: rockchip: rga3: relax the limit of input resolution
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I667d73da2f2de20dc58e84ebc5aa89e06720ff2f
2021-12-13 14:38:41 +08:00
William Wu
c75c894db6 phy: rockchip: inno-usb2: adjust pre-emphasis and DC volt for rk3588
This patch aims to tuning the high speed Tx signal for
4 independent USB2.0 PHYs of RK3588.

1. Adjust the HS DC level voltage from design default
   4'b0110:0 to 4'b1001:+5.89%.

2. Adjust the HS Transmitter pre-emphasis current control
   from design default 2'b00 disabled pre-emphasis to
   2'b10 2x pre-emphasis current.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: If212a606113fd4409d9a33a25a04f8416336f6e4
2021-12-13 14:37:02 +08:00
Zhang Yubing
935c0455fd phy: rockchip: usbdp: fix the aux communication issue
The default aux tx amplitude level can't satisfied some
device, which will cause the aux communication failed.
Enhance the aux tx amplitude to a high level to be
compatible with different devices.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Idcb5cf2fcf91dda5985744acb4ad3e62c99ffba4
2021-12-13 10:55:52 +08:00
Finley Xiao
606e61abb0 arm64: dts: rockchip: rk3588s: Add dus clk for pd npu
The dus clk shouled be enabled before restore qos.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ic981fc6d680a9be4c441c946715bf709c4e83e7b
2021-12-10 21:50:50 +08:00
Huang zhibao
5a6b46c1a2 arm64: rockchip_defconfig: Enable RK860X
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I8fc14b02fbb371e20a486d06d0344081466d4e79
2021-12-10 14:31:28 +08:00
Herman Chen
b4c63fdbc2 video: rockchip: mpp: rkvdec2: change irq print
The rkvdec2 link mode irq print should print both link status and core
status.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I2fffc0935260e6f3dcb788dffc1a467e6be5a7cb
2021-12-10 14:22:49 +08:00
Algea Cao
5989ac192f drm/rockchip: dw_hdmi: Correct incorrect color format configuration
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Id3267a80c0893acbfdbbd64ed06bf4c24fec57ae
2021-12-10 14:20:44 +08:00
Algea Cao
1157a1b1a2 phy: rockchip-samsung-hdptx-hdmi: Support 4K60 tmds mode yuv420 output
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia3f83bd77b7c7608e785edce9de81097ae7532ae
2021-12-10 14:20:35 +08:00
Wu Liangqing
1ed5987acc arm64: dts: rockchip: rk3588s-evb3: fix vbus5v0_typec gpio error
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I80b773441378b06943e2864fc8a576fe279d9fb6
2021-12-10 14:09:56 +08:00
Andy Yan
ae488c03ab drm: Not mark crtc state as connectors_changed when a writeback connector attatch to a crtc
The drm core will disable than enable a crtc when is marked as
connectors_changed.

But when we attach a writeback connector to a running
crtc, we really don't need this disable/enable, which
will black a running screen.

Change-Id: I636615f27424bc60496ffc487c218f60fb95d719
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-12-10 10:55:24 +08:00
Nickey Yang
356f8cb365 arm64: rockchip_linux_defconfig: Enable CONFIG_CHARGER_BQ25700
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I5a97ac5dfb97a94965c16cea750bde958d242643
2021-12-09 21:07:41 +08:00
Hongming Zou
20a6024495 arm64: rockchip_linux_defconfig: Enable CONFIG_BATTERY_CW2017
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I99acbe287ad2e8accb99160f611e2d2d8c8c8da7
2021-12-09 21:07:41 +08:00
Shawn Lin
17dda312c3 phy: phy-rockchip-snps-pcie3: Move phy mode settings to probe
Calling it from rockchip_p3phy_rk3588_init() will cause a timing
problem that PCIe3 enum and PCIe2 accessing combophy at the same
time which would cause problems. Changing PHY mux and enum devices
at the same time doesn't meet design purpose. So we also need to
move phy mode settings to probe as what comphy driver did.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I8689ed52db002a6eb0429bf528e2303fbf3cc449
2021-12-09 20:25:22 +08:00
Shawn Lin
8a60fab5f1 phy: rockchip: naneng-combphy: Fix pcie1ln-sel setting error
value[3] is the value need to set, but the offset is value[1]
or value[2]. We need offset here.

Fixes: e984bc2a96 ("phy: rockchip: naneng-combphy: Add config option for pcie1ln-sel")
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ia5fca2bd4563e9618c52d601a47a28dc44fb48cc
2021-12-09 20:25:13 +08:00
Shawn Lin
0b2688736d Revert "phy: rockchip: naneng-combphy: Fix PCIe system PM"
This reverts commit 33d95b67b3.

As the probe of PCIe controller is threaded. So rockchip_combphy_pcie_init
may change PHY mux settings just between another controller's
signal accessing PHY. This doesn't meet design purpose. We should
keep mux settings ready before everything starts.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Iba59bd39741b97442b5f7fe91314aea3f1d0c533
2021-12-09 20:24:48 +08:00
Xing Zheng
a7878cec55 arm64: configs: rockchip_linux_defconfig: enable ES8326 codec
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I81df184ab2ee8f622b5b2ad738c29deb8fdf144e
2021-12-09 20:23:32 +08:00
Nickey Yang
ce731352ff arm64: dts: rockchip: add rk3588 pc demo board
V2:
  key: remove Non existent key
  panel: use simple-panel driver
  regulator: correct usb gpio
  gpio: add hub_en,camera_en
  fix some typo

V3:
  WIFI/BT: add support

V4:
 remove Makefile for easy rebase

V5:
 fixed wifi_pwren issue
 support pcie ssd
 increase Sdio Driver Strength Selection

V6:
 support es8326/es7243e/pdm sound
 Supports DP dual display
 fixed PINCtrl conflict

V7:
 support sc8886
 disabled pcie now for some board can not boot
 Add the hardware mouse layer

V8:
 support cw2017

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Ia516536751ac645b704b5cae9bb275bd48b5aba8
2021-12-09 20:22:49 +08:00
Zain Wang
3a963f10e7 arm64: dts: rockchip: rk3588-evb1-lp4-v10-ipc-6x-linux: remove something useless for ipc
Signed-off-by: Zain Wang <wzz@rock-chips.com>
Change-Id: Ief4fed08cc1945392502d13dafd61afd8ee4b32f
2021-12-09 20:21:02 +08:00
Shawn Lin
274a74d9ea PCI: rockchip: dw: Exit phy if failed to probe
Call phy_power_off and phy_exit if failed, so phy will
be reset and gated.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: If82b86704317e3a27217ab0c6a827af30463e7ba
2021-12-09 16:06:39 +08:00
Guochun Huang
52439761bf phy: rockchip: mipi-dcphy: fix PLL VCO restrictions
Frequency of VCO's output: 2600MHz ≤ Fvco ≤ 6600MHz

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Iace886293b9d30d0cedcae4ad56582109c5ee716
2021-12-09 16:04:02 +08:00
Guochun Huang
3278e8cadf phy: rockchip: mipi-dcphy: add init/exit helper
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ib045d0882c9ad6a446f104878b76acc7ff11243f
2021-12-09 16:02:06 +08:00