Commit Graph

1072766 Commits

Author SHA1 Message Date
Shunhua Lan
a8de4e09e2 media: rockchip: hdmirx: Add extcon support
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: Ia19b8f7230af515b8dbc7bb953d03e8e5dbb1f7a
2022-10-15 15:03:09 +08:00
Ziyuan Xu
9e2a65010b media: rockchip: isp: improve thunder boot process
1. pm_get until rtos was done
2. wait rtos with 200ms timeout
3. disable clks until the rtos *really* EOF

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Id8a31a848e6784cfd9f25375d6f255daa0a6e524
2022-10-15 14:53:34 +08:00
Algea Cao
828908d4a6 drm/rockchip: dw_hdmi: Add old vp id
HDMI should get old vp id when disable dclk.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I01073902d7be88642a599c29f2596bdb92f402cc
2022-10-15 14:51:20 +08:00
Jon Lin
70680c754e drivers: rkflash: Using kmap_atomic to build page address mapping
The virtual address of allocated __GFP_HIGHMEM pages is not mapped,
Using kmap_atomic to build it, or it will failed like:

    Unable to handle kernel NULL pointer dereference at virtual address 00000000
    pgd = 50ec00c8
    [00000000] *pgd=00000000
    Internal error: Oops: 817 [#1] PREEMPT SMP ARM
    Modules linked in:
    CPU: 3 PID: 67 Comm: rkflash Not tainted 4.19.111 #67
    Hardware name: Generic DT based system
    PC is at memcpy+0x50/0x330
    LR is at 0x61640a68

Change-Id: I0cde9012d29e49d9ba751cb019ccfa784c01b7c7
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-10-13 19:10:35 +08:00
Weiwen Chen
0e1556a339 ARM: rv1106-evb.config: enable CONFIG_NVMEM_SYSFS
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I83ecba98d3d31424e479db46f428cd4bba799ad8
2022-10-13 17:44:39 +08:00
Yandong Lin
494310d199 video: rockchip: mpp: fix the decoding buf is released issue
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I66906651dc3e80470d0873cae7fce8ee1e662b0a
2022-10-13 11:28:36 +08:00
Cai YiWei
7d56606706 media: rockchip: isp: make sure to free buf after isp stop
Change-Id: Ie9dd6fa1c482103d5961ff5acda07461773cf735
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-12 17:04:50 +08:00
Yongzhen
d6835708d6 media: i2c: sc200ai fix rk_cam_fps mistake
Fixes: 266443eda9 ("media: i2c: sc200ai support get config from cmdline for thunderboot")
Signed-off-by: Yongzhen <yuyz@rock-chips.com>
Change-Id: I9624bd9f36795e1fd6802990b17173c68be63bb7
2022-10-12 17:02:50 +08:00
Cai YiWei
6cfa171d7f media: rockchip: isp: fix hdr config for unite multi sensor
Change-Id: Ia164e14291b6be0e48ab5cd02c40fbaf9bb75ff8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-12 15:26:29 +08:00
William Wu
d8db0c1fa4 phy: rockchip: inno-usb2: fix phy reset during power on for rk3588
The RK3588 USB2 PHY provides CLK12MOHCI and CLK48MOHCI to
OHCI controllers, and the two clocks are turned off upon
PHY reset, therefore it shouldn't access OHCI Controller
if USB2 PHY in reset. However, during the system PM resume,
the current USB2 PHY power on sequence with PHY reset
operation has potential risk that reset PHY accidentally
when OHCI platform resume access OHCI Controller, and
cause system hung.

The reason is EHCI/OHCI controllers resume ordering on
RK3588. In outline form, the hcd_bus_resume() of EHCI
and the ohci_resume() of OHCI operating concurrently on
different CPUs perform the following actions:

CPU 0                                   CPU 1
----------------------------            ---------------------------------
async_resume()
  usb_resume()
    hcd_bus_resume() -- EHCI
      usb_phy_roothub_resume()
        phy_power_on()
          rockchip_usb2phy_power_on()   ohci_platform_resume()
            rockchip_usb2phy_reset()      ohci_resume()
              assert phy reset              ...
                udelay(10);                 ohci_readl or ohci_writel

This patch fixes USB2 PHY reset during power on for RK3588,
only do USB2 PHY reset for RK3588 USB OTG0 and OTG1, because
their 'common_on_n' bit can be set to 1'b1 (aka REFCLK_LOGIC,
Bias, and PLL blocks are powered down) in PM runtime process.
And keep the 'common_on_n' to 1'b0 for RK3588 USB2 HOST0 and
HOST1, thus we don't need to do PHY reset during power on for
them.

This patch doesn't increase the USB2 PHY power consumption,
because the USB2 HOST0 and HOST1 don't support PM runtime
management, so actually the PHY PLL blocks of USB2 HOST0 and
HOST1 are always powered on.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ia0121a7c49bef4f0f3a1fb11a810e4ef95b29982
2022-10-12 14:10:15 +08:00
Weiwen Chen
9af1805a1b ARM: dts: rockchip: add rv1103g-battery-ipc-v11.dts
diff rv1103g_bat_ipc_demo_v11 with rv1103g_bat_ipc_demo_v10
1. camera sensor use SC3338
2. remove WiFi's PA
3. control lux_en(GPIO3_A2) inversely

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I57b9dd35a7cddc5869d385412d47112c3b9a6222
2022-10-11 21:10:05 +08:00
William Wu
7a616cbc2f usb: host: ehci-platform: fix companion-device leak for rockchip
Make sure do drop the reference taken to the companion device
during probe/remove/resume.

Fixes: 68850661b5 ("usb: host: ehci-platform: Add device_link between the ehci and companion")
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I0bbfe77987a1c11bfaa5006d98a56480ff16224f
2022-10-11 16:38:35 +08:00
Andy Yan
f727d3ad8e drm/fourcc: Add definitions for Rockchip vendor and VPU tiled format
This introduces specific definitions for vendor Rockchip and its
associated tiled format modifier. This modifier is used for the
output format of the Video/JPEG Decoder, that can be imported
directly with the VOP2.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I03c1a51af5fd8bc0702209ae216c4706b4101c49
2022-10-11 16:38:27 +08:00
Cai YiWei
50d0d25b96 media: rockchip: isp: fix stream no output for multi sensor
Change-Id: I1eac20635753120bcd45bf3b04d45b64a6f35f0a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-11 10:23:30 +08:00
Cai YiWei
f97dd008a3 media: rockchip: isp: no wait if shutdown
Change-Id: I76d161cb6b1a4b22d41d3a4a2be4d604049ed3af
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-11 10:23:26 +08:00
Alex Zhao
67e4e92e23 net: wireless: rockchip_wlan: bcmdhd: enable WL_SCHED_SCAN
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I687794f636bd2f5c0f3629f293620e893e5a6f6e
2022-10-11 09:58:59 +08:00
Sandy Huang
9802fa376f drm/rockchip: vop2: update dsc_hsync and dly num config according IC suggest
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I47fcc5d143b10bc1d636691a138312b1b109006d
2022-10-11 09:55:37 +08:00
Simon Xue
91e883deed iommu/rockchip: rename rk_iommu_[un]mask_irq() to rockchip_iommu_[un]mask_irq()
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I66d8248357039ff049002b8204dc99eab90d3666
2022-10-10 16:00:09 +08:00
Simon Xue
8e32089501 iommu/rockchip: fix rockchip private interface dependence
Fixes: fae620b2b6 ("iommu/rockchip: add irq mask cb")
Change-Id: I9783a64d866d7919ade89a48e004b9c51b38dde6
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2022-10-10 15:58:00 +08:00
Algea Cao
4512ef481e drm/rockchip: dw_hdmi_qp: Support rk3588 switch HDMI/DVI mode
Add property output_hdmi_dvi:
enums: auto=0 force_hdmi=1 force_dvi=2

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I395644ebf1b8eea6a41f80e1282fbc3373144503
2022-10-10 15:46:55 +08:00
Wang Xiaobin
e2bf2eaab8 ARM: dts: rockchip: rv1103g-rmsl311: remove meta node and use erofs
The layout about meta has been changed and defined in
rv1106-thunder-boot.dtsi.

Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com>
Change-Id: Ia05c9020dd52b5c6a0e9c94b1e7d799fd65d9d76
2022-10-10 14:20:22 +08:00
Wyon Bi
50bc70c3f6 drm/bridge: analogix_dp: Fix stream valid control
Add DT property 'analogix,force-stream-valid' to DTS node
if want to support vrr.

Fixes: 2abd3af02c ("drm/bridge: analogix_dp: Use video format information from register")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ic4624e4ca3a03322f1d9520a7e3cee0d054c36ee
2022-10-10 11:01:14 +08:00
Zefa Chen
6ab995ba97 media: i2c: SmartSens sensor driver fixed modify fps error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Idd09bfac19006e47340660f3f7c0c774240caf42
2022-10-10 11:00:57 +08:00
Jon Lin
a366f684c2 arm64: dts: rockchip: rk3588s: Fix spi driver strength
Except spi2m2 which is used for pmic. all spi change from 33ohm to 40ohm
to avoid overcharge.

Change-Id: Ib1f613b19c1ca9f978c11a7d26422ff66b4b910c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-10-10 10:56:32 +08:00
Cai YiWei
a34aa766dc media: rockchip: isp: fix scl for unite mode
Change-Id: Ic224cfa5956ed1dea523e608ceed46be0c2dd49c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-10 10:07:59 +08:00
Wyon Bi
beaac7714a drm/bridge: analogix_dp: Check link status in loader_protect()
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I8816a0527eb7a1c1d3a2d7b7480057b888e375e0
2022-10-10 09:00:55 +08:00
Wyon Bi
379474682f drm/rockchip: Add return value to .loader_protect()
Callback loader_protect() maybe failed.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Icb9a25701929c79b94c9a63568a408913e49f87c
2022-10-10 09:00:55 +08:00
Liang Chen
bc2d913a39 soc: rockchip: opp_select: dump current opp state when panic for cpu/ddr
panic log:
cpu cpu6: cur_freq: 1008000000 Hz, volt_vdd: 675000 uV, volt_mem: 675000 uV
cpu cpu4: cur_freq: 408000000 Hz, volt_vdd: 675000 uV, volt_mem: 675000 uV
cpu cpu0: cur_freq: 816000000 Hz, volt_vdd: 675000 uV, volt_mem: 675000 uV
rockchip-dmc dmc: cur_freq: 528000000 Hz, volt_vdd: 675000 uV, volt_mem: 700000 uV

Change-Id: I29ea94cc9deaba0e1d285390312256567708d6ef
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-10-09 19:53:52 +08:00
David Wu
fda1cfae99 ARM: dts: rockchip: rk3288-evb: Change rgmii clock mode from input to output for gmac
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ia73346adb607744bd037c7b255ba1647678ad77c
2022-10-09 19:43:05 +08:00
Jon Lin
e3354602f7 spi: rockchip: Support rkspi-devN misc devices
Reach controller register in user space by mmap operation, And only do spi
transmission in user space.

Change-Id: I37e22ad04813c2cd10d97324339afc5a11da59bd
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-10-09 19:33:54 +08:00
Jon Lin
77a650e3d0 mtd: spinand: foresee: Support new device
F35SQA512M, F35UQA512M

Change-Id: Ica5e7e1bafd481d7b5c883fd9ab75b8f9599e003
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-10-09 19:30:47 +08:00
Zefa Chen
266443eda9 media: i2c: sc200ai support get config from cmdline for thunderboot
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I34f1339ebf033122663f0f24cf5b4725948b258e
2022-10-09 17:45:24 +08:00
Cai YiWei
4037c8a769 media: rockchip: isp: drop first output for fast case
Change-Id: I7e303b6307032187a70b5558f2a78ccd6b8f3ca5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-09 11:20:42 +08:00
Chen Shunqing
aa33064d9b drm/bridge: dw-hdmi-qp-cec: fix receive message error
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I741c45dceca7efba896c8892e1ac790b4dffc4e5
2022-10-08 16:16:10 +08:00
Jianwei Fan
9a94f8e080 media: i2c: ov13855: fix power on sequence to avoid i2c communication failed
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I8534e9512cc94bd1af30fa213653d0024900e7e2
2022-10-08 11:07:12 +08:00
Yu Qiaowei
482424b9aa video: rockchip: rga3: support rga2_iommu
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ic4d4ad1e4cd6490aa487b272003130eb0504219f
2022-10-08 11:06:52 +08:00
Jianqun Xu
8d29486a15 pinctrl/rockchip: fix rk3308 pinmux error
The GPIO2A2 GPIO2A3 GPIO2C0 GPIO3B2 GPIO3B3 have 3 bits for pinmux, and
have a extra bit to select 2bits or 3bits.

The Rockchip downstream has a soc_data_init to choice 3bits mode, but
the upstream uses 2bits mode.

This patch removes the soc_data_init/re_init and set the soc data init
directly during probe.

Fixes: ae7b9050a3 ("UPSTREAM: pinctrl: rockchip: fix RK3308 pinmux bits")

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I57b88c776f86a37e34a38cd7b81e422e0cce2e03
2022-10-08 10:53:23 +08:00
Jianwei Fan
e08caf351a media: i2c: lt7911uxc: add 5K60 support for CPHY
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I223f4e8e87266c4b75d201f4b23e853cfca05964
2022-10-01 16:43:46 +08:00
Elaine Zhang
af14a79ae3 clk: rockchip: rk3588: support aclk_vop_sub_src set parent to aclk_vop_div2_src
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: If493c3918bd8022accf089d69cce4cb93326d9e5
2022-09-30 16:29:15 +08:00
Xing Zheng
98ec188833 ASoC: codecs: rv1106_codec: To clarify the steps of enabling ADC
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I66921b120dc2a7d197c984369ecb261b50d037a0
2022-09-30 16:20:02 +08:00
Zefa Chen
f6886f6606 media: i2c: sc200ai change short exposure max to 404 half-line (3ms)
Change-Id: I3149273398b5fe4e66e90f74a883234d8531f4e7
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2022-09-30 16:12:56 +08:00
Xu Hongfei
d711b7f541 media: rockchip: isp: remove the judgment that gain turn off if ldch is enabled
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: I3dd7679f7052a6c0c76a41b9466a8235053afd5b
2022-09-30 16:07:41 +08:00
Elaine Zhang
c282cc82a1 arm64: dts: rockchip: rk3568: Fixed compatible for the CAN node
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I19b64e7c7fd1a663d3a41479a66cf95eb6ff3f05
2022-09-30 14:45:07 +08:00
Elaine Zhang
aed0776380 net: can: rockchip: canfd: Support extended frames transmit for rk3568
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I097fd66d34b56d9e6104f21da40e5b41bf2b4109
2022-09-30 14:45:07 +08:00
Zefa Chen
ce59362f58 media: rockchip: vicap fixed sof error for rv1126/rk356x in HDR mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I78dd84b17ebbbcde166b3557a80bcfb132065c23
2022-09-30 14:43:57 +08:00
Jon Lin
fa919e9611 pcie: rockchip: dw: Support dmatest
Change-Id: I14bd31839bfb3fe70d8b12b7e3e6efca535028a1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-09-30 14:43:41 +08:00
Jon Lin
533492f3b5 PCI: rockchip: dw: Add dmatest
Test code of embedded DMA design based on dwc controller.

Show the controller registered with dmatest, and you can assigned the
correspond test_dev for test:
	echo show > ./sys/module/pcie_dw_dmatest/parameters/dmatest

Check the value of the current parameter:
	grep -H . /sys/module/pcie_dw_dmatest/parameters/*

Fix parameter and run the dmatest:
	echo 0 > ./sys/module/pcie_dw_dmatest/parameters/test_dev
	echo 1 > ./sys/module/pcie_dw_dmatest/parameters/chn_en
	echo 1 > ./sys/module/pcie_dw_dmatest/parameters/rw_test
	echo 0x100 > ./sys/module/pcie_dw_dmatest/parameters/size
	echo 0x1 > ./sys/module/pcie_dw_dmatest/parameters/cycles_count
	echo 0x3c000000 > ./sys/module/pcie_dw_dmatest/parameters/local_addr
	echo 0x3c000000 > ./sys/module/pcie_dw_dmatest/parameters/bus_addr
	echo run > ./sys/module/pcie_dw_dmatest/parameters/dmatest

Change-Id: I1b48f849e5e37baec27bc62d2a8cf4945fb40cbc
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-09-30 14:43:41 +08:00
Jon Lin
73635093a1 pcie-dma-trx: update to version 0x4
1.Optimize DMA hook to support multiple independent DMA channels
2.Add interrupt callback to support multiple independent DMA channels

Change-Id: I42a638a4cb9fa61ebc1cd51d4e9f6d6942715fd1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-09-30 14:43:41 +08:00
Liang Chen
0d01ed0d12 arm64: dts: rockchip: rk3588: set pcfg_pull_up for touch int pin
This patch can save 0.6mA for PMUIO2(3V3).
Tested on RK3588_EVB1_LP4_V10 platform.

Change-Id: If9298b7de5859e8bfd28baf3e1022b71efd78218
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-09-30 10:33:55 +08:00
Andy Yan
d8b6c8e1f7 drm/rockchip: delay destroy logo fb
Some NVR product want skip-ref-fb, destroy logo
fb after some delay to make sure the plane is
disabled.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ia257a510ea2382b5ee6aa4f65b2fef856687b0bc
2022-09-30 09:25:57 +08:00