Commit Graph

854146 Commits

Author SHA1 Message Date
Wang Panzhenzhuan
6459ce336d drivers: media: platform: rockchip: cif: fix pingpong mode issue
fix following problem when using pingpong mode
rkcif: Bad frame, pp irq:0x20b frmst:0xda900000 size:1600x600

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Iaf9222d5465a966047c26b7a7518bbc419cd5748
2020-06-09 11:40:53 +08:00
Shawn Lin
bc28e06c42 mmc: add thunder boot support
Remove unnecessary initialization process from core as possible, such
as remove some idle process, shorten delay, remove parsing ext_csd,
remove post-delay for power and so on. All these stuffs are enabled
by CONFIG_ROCKCHIP_THUNDER_BOOT.

Change-Id: I0e2326dd79d938eb82c8cfac9db09e34d6c08987
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-06-09 09:50:24 +08:00
Xinhuang Li
b5ef4f0d72 ARM: configs: rv1126_defconfig: enable uac1 and uac2
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
Change-Id: I53dd70a682a5327d60ae9064e46e0b5b8f96c68b
2020-06-09 09:48:55 +08:00
YouMin Chen
58cc992652 clk: rockchip: clk-ddr: fix return value in rockchip_ddrclk_sip_set_rate
Returns success (0) or negative errno in rockchip_ddrclk_sip_set_rate call.

Change-Id: I9c424d8625a465c235ac5f6b0795f51848e65283
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-06-08 20:16:41 +08:00
Finley Xiao
a840e227a0 ARM: dts: rockchip: rv11xx-evb-v10: enable otp
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Icc749f647424778fdec55bb8250d8823c3541e14
2020-06-08 19:52:07 +08:00
Sugar Zhang
b844dae719 dmaengine: pl330: Add quirk 'arm,pl330-periph-burst'
This patch adds the qurik to use busrt transfers only
for pl330 controller, even for request with a length of 1.

Although, the correct way should be: if the peripheral request
length is 1, the peripheral should use SINGLE request, and then
notify the dmac using SINGLE mode by src/dst_maxburst with 1.

For example, on the Rockchip SoCs, all the peripherals can use
SINGLE or BURST request by setting GRF registers. it is possible
that if these peripheral drivers are used only for Rockchip SoCs.
Unfortunately, it's not, such as dw uart, which is used so widely,
and we can't set src/dst_maxburst according to the SoCs' specific
to compatible with all the other SoCs.

So, for convenience, all the peripherals are set as BURST request
by default on the Rockchip SoCs. even for request with a length of 1.
the current pl330 driver will perform SINGLE transfer if the client's
maxburst is 1, which still should be working according to chapter 2.6.6
of datasheet which describe how DMAC performs SINGLE transfers for
a BURST request. unfortunately, it's broken on the Rockchip SoCs,
which support only matching transfers, such as BURST transfer for
BURST request, SINGLE transfer for SINGLE request.

Finaly, we add the quirk to specify pl330 to use burst transfers only.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I91c295a0854515131fb9a76757fbd85e5c7b0c15
2020-06-05 18:47:24 +08:00
Sugar Zhang
34d2e5f52c arm64: dts: rockchip: Add 'arm,pl330-periph-burst' for dmac
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ied0b51a3cf02dc22803c1c49448baffbdce6e1aa
2020-06-05 18:47:23 +08:00
Sugar Zhang
0c3933bfa7 ARM: dts: rockchip: Add 'arm,pl330-periph-burst' for dmac
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I291f78605b15db9ff669ff2a815bf3fd299fb7ec
2020-06-05 18:47:23 +08:00
Andy Yan
a5ab034e69 ARM: dts: rockchip: Add logo-memory-region for rv1126
logo-memory-region is used for passing framebuffer
from bootloader, which store kernel logo image data.

Change-Id: I24ba97be5abdbb8a8760861f7460120eef9ff744
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-06-05 10:31:27 +08:00
Jon Lin
781684d716 drivers: rkflash: should not return EIO for ecc corrected case
Change-Id: I637c48f27a4329715ec032a349c0ba56741504be
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-04 21:37:24 +08:00
Jon Lin
0435b850fa drivers: rkflash: Add BBT-in-flash management strategy
Change-Id: Ib825c08d60a1c56a78e0799f0acdc1f445d0ed88
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-04 21:37:24 +08:00
Jon Lin
e701096a22 drivers: rkflash: Add BBT framework for sfc_nand_mtd
It's a copy of mtd open source code bbt.c

Change-Id: I782b69345ef321938c76b13d6d68dfdd48265b9f
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-04 21:37:24 +08:00
Jon Lin
861a739c6b drivers: rkflash: Support mtd sfc nand read/write oob area
Change-Id: I3907dd7ff01b9e925ca9c5eaa0ffa53e9e65bddb
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-04 21:37:21 +08:00
Jon Lin
da77c1a5dc drivers: rkflash: Extern sfc nand raw read/write apis
Change-Id: Ib1e8f8cc49eba3a24c4ed85e34d0873ed3c84686
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-04 14:42:19 +08:00
Jon Lin
f630cce007 drivers: rkflash: Simplify soft output presetting
Change-Id: Iec38a552aaa3c6dce598787c864fa490da21820b
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-04 14:42:04 +08:00
Simon Xue
fb06d38cdb soc: rockchip: decompress: update driver
1. add soft reset
2. dump register when decompress failed
3. add start callback

Change-Id: Ie7d02892a5531f6510cd18ff938817a5352896dd
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-06-04 10:45:22 +08:00
Shawn Lin
c97fd957bb ARM: dts: rockchip: Add ext_csd parsing from loader for rv1126-evb-ddr3-v10-tb
Change-Id: I799fd30df951a86ec97eaee2a2dd7b91984558a6
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-06-04 10:40:15 +08:00
Sugar Zhang
449c372450 dmaengine: pl330: Make sure the debug is idle before doing DMAGO
According to the datasheet of pl330:

Example 2-1 Using DMAGO with the debug instruction registers

1. Create a program for the DMA channel
2. Store the program in a region of system memory
3. Poll the DBGSTATUS Register to ensure that the debug is idle
4. Write to the DBGINST0 Register
5. Write to the DBGINST1 Register
6. Write zero to the DBGCMD Register

so, we should make sure the debug is idle before step 4/5/6, not
only step 6. if not, there maybe a risk that fail to write DBGINST0/1.

Change-Id: I22253cc5d7cbd68f1c641fbef38617dc9a053c48
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-06-04 09:07:49 +08:00
Alpha Lin
1367ce868e ARM: dts: rockchip: rv1126 add node for iep2 devices.
Add dts node for iep2 devices.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
Change-Id: I91cc0e078684ecf3dbbd168a0e0862e4c212c371
2020-06-03 15:58:51 +08:00
Alpha Lin
791349dc3b ARM: enable mpp iep2 driver for rv1126_defconfig
Build iep2 driver for rv1126_defconfig by default.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
Change-Id: I048c3de46492134eac06190c8f25e3a5a5c19175
2020-06-03 15:58:20 +08:00
Ding Wei
ae12596959 video: rockchip: mpp: add iep2 device driver
IEP2 is a hardware ip upgrade from IEP, improving deinterlacing
processing perform, but no other post processing functions
for this version.

Change-Id: Id7f58c3f35c0c033aaa4c104a3f98849e1778f94
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2020-06-03 15:52:06 +08:00
Sugar Zhang
3e1acca6b6 dmaengine: pl330: Fix dmac register write error
This is a workaround for dmac register write error by
read once before write to make paddr is stable, which
was caused by asynchronous between dmac_aclk and pclk.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I32e03204d6399db4fe4f40479050cc45e04ddb1f
2020-06-03 15:34:13 +08:00
Simon Xue
c50583e2af ARM: dts: rockchip: rv1126: add soft reset for decompress
Change-Id: Ie02994d08e0b9eb72abcf1b6cd0eb68583b5b23a
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-06-03 15:19:02 +08:00
Li Huang
aa638c0dc6 video/rockchip: rga2: Fixup wrong swap uv on YCrCb_420_P
Change-Id: I907c8687c5736fb489a21d16e87addf1f67e07c1
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2020-06-03 11:27:42 +08:00
William Wu
d50829cb7f arm64: dts: rockchip: add xhci-warm-reset-on-suspend-quirk for rk3399
This patch adds property "xhci-warm-reset-on-suspend-quirk"
for rk3399 DWC3 xHC to do a warm port reset for USB3 port
upon PM suspend.

This patch also deletes the unused property:
snps,usb3-warm-reset-on-resume-quirk

Change-Id: I0d50e1c603a3114f6bc5f822334546c6e1668b0e
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-06-03 11:26:30 +08:00
William Wu
77632b0961 usb: xhci: support warm port reset quirk
The RK3399 Type-C PHY requires that it must hold the PIPE
power state in P2 before initializing the PHY. The current
code reset the whole USB3.0 OTG controller in the DWC3
PM suspend/resume to set the PIPE in P2 if the link_state
is RxDetect, and then power on/off the Type-C PHY safely
during PM suspend/resume.

In this case, we assumed that the RxDetect state meant no
USB device connected. But actually, if an USB 1.0/1.1/2.0
device connected, the link is in the RxDetect State too.
So reset the USB controller will cause the USB 1.0/1.1/2.0
device to be reenumerated upon PM resume.

This patch uses xHC warm port reset instead of controller
reset to set the PIPE in P2. It can avoid reseting the USB
1.0/1.1/2.0 device upon PM resume.

Fixes: c9b15ba1eb ("usb: dwc3: core: prevent re-enumeration in host mode")
Change-Id: I4f02f429019771699993358059731f949140eb08
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-06-03 11:25:45 +08:00
William Wu
89d01c470d dt-bindings: usb: dwc3: add a property to do warm port reset quirk
This patch adds a new property "snps,xhci-warm-reset-on-suspend-quirk"
to do a warm port reset for xHC USB3 port upon suspend if needed.

Change-Id: Id26ab9ecd933f16a491b6fc13c45346459f78109
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-06-03 11:24:56 +08:00
Nickey Yang
a77a960706 ARM: dts: rockchip: rv11xx-evb-v10: fix vcc18_lcd regulator
vcc18_lcd is the power enable pin of dsi panel board, and it
also provides the rst signal of panel through RC circuit.
When we power on and change the pin directly, the rst will not
power down completely, resulting in the probability that the
screen cannot display after reboot.
so fix it.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Ifb47ea23a4bd2d9e41fd317d3c7777e158e54dec
2020-06-03 11:14:31 +08:00
Tao Huang
594b68feba rk: scripts: update mkbootimg/repack-bootimg/unpack_bootimg
AOSP 9f28439ba714 ("fix size of v3 boot header")
Revert 7261bb083a97 ("Check DTB image size for boot image header version 2 and above")
which failed to repack image without dtb.

Change-Id: I591c0c548229e16482352c94651740de3e0e8b76
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-03 10:54:15 +08:00
Tao Huang
76ada3f00a Revert "rk: add .checkpatch.conf to enable strict check"
This reverts commit 539930eb1c.

Change-Id: I399df04be7619fb05cdb78b00405ffd195b1b671
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-03 10:49:24 +08:00
Cai YiWei
eebf9acd6d media: rockchip: isp: fix link setup error
Change-Id: Ie357ae811627f861ba002d1de82adfe61d45b42f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-02 21:37:02 +08:00
Finley Xiao
5dedb0163a clk: rockchip: rv1126: Change parent clock for hclk and pclk pdbus
As dmac aclk comes from hclk pdbus, dmac pclk comes frome pclk pdbus,
dmac aclk should be an integer multiple of dmac pclk and the same
parent with dmac pclk. so let hclk pdbus and pclk pdbus only come from gpll.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia75c3613573f4a6818cbc18668a66736f011c695
2020-06-02 16:17:28 +08:00
Finley Xiao
9713c36a41 ARM: dts: rv1126: set dummy_cpll as fixed clk
If the parent of one clock is cpll and we set it as dummy clock, the
clock will be a orphan clock and the clk provider will register abortively,
as follows.

[    0.000000] rockchip_clk_of_add_provider: could not register clk provider

The cause of the error:
struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id,
                             const char *con_id, bool with_orphans)
{
        /* This is to allow this function to be chained to others */
        if (!hw || IS_ERR(hw))
                return (struct clk *) hw;

        if (hw->core->orphan && !with_orphans)
                return ERR_PTR(-EPROBE_DEFER);

        return clk_hw_create_clk(hw, dev_id, con_id);
}

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7053cd4e0a028a1556c774601d5c01578ee5b1ac
2020-06-02 16:17:28 +08:00
Guochun Huang
5f31e9caba Revert "drm/rockchip: calculate lanes and rate for Main Link Lanes"
This reverts commit 7dd63e4010.

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: If587600bc616c841cd2ce2be94e5aee289170149
2020-06-02 16:15:22 +08:00
Sugar Zhang
79e0f95365 dmaengine: pl330: Remove the burst limit for quirk 'NO-FLUSHP'
There is no reason to limit the performance on the 'NO-FLUSHP' SoCs,
cuz these platforms are just that the 'FLUSHP' instruction is broken.
so, remove the limit to improve the efficiency.

Change-Id: I6a975f48fedcf4a693d093f91294d33724ef5745
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-06-02 14:52:19 +08:00
Huang zhibao
ab63e41354 ARM: dts: rockchip: rv1126-ai-cam-ddr3-v1: add gpio led support
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I1ab82dbf23b90fa11e62176cd47313fa0a50ffdd
2020-06-02 10:40:05 +08:00
Elaine Zhang
71962a7660 clk: rockchip: rk3036: fix up the sclk_sfc parent error
Change-Id: I0903161f34de8f309392bec6926348ffe37ba2f6
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-06-02 09:23:32 +08:00
Cai YiWei
39ac365aec media: rockchip: isp1: fix compile error
Change-Id: I9b814e784c71d85ac870169adef5cbfc683d12b3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-02 09:18:10 +08:00
Huang zhibao
1e0a25a657 ARM: configs: rv1126_defconfig: enable LEDS_TRIGGER_TIMER
For RV1126 AI Camera Demo Board

Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Id99a019a377eb1d436a183c0c81e974cba36d955
2020-06-02 09:15:03 +08:00
Tao Huang
766ae3eacd sysfs: symlink: export sysfs_delete_link()
Used by extcon.

Fixes: 513c60a1ba ("extcon: Add named extcon link")
Change-Id: I5e0e5ab18ecd0e967797a3a8fb52c5f283468643
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-01 15:49:29 +08:00
Tao Huang
7d1e90baf2 net: wireless: rockchip_wlan: rtl8822bs: Fix gcc warning
Change-Id: I6ddc96c8fc3b376e9b3aac541c9398e1dee771d3
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-01 15:49:29 +08:00
Tao Huang
9d81c25455 net: wireless: rockchip_wlan: rtl8821cs: Fix gcc warning
Change-Id: I2652111b1c6329405c86a2bcdabf6e2900d47400
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-01 15:49:29 +08:00
Tao Huang
1d4274d5a5 net: wireless: rockchip_wlan: rtl8723cs: Fix gcc warning
Change-Id: Ie430d798bee86111079f3d9248e445aac2de69a2
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-01 15:49:29 +08:00
Tao Huang
6ee070a357 rk: gcc-wrapper.py ignore km_apphint.c:230
trigger by gcc 9

Change-Id: I1e6718fba642b010eecbd7e9107dbb44e36bd9a4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-06-01 15:49:28 +08:00
Cai YiWei
c46c287f56 media: rockchip: ispp: stream link enable default
Stream link enable all and async output default.
Setting following to enable stream sync output,
user need to on/off stream link.
echo Y > /sys/module/video_rkispp/parameters/stream_sync

Change-Id: Ib8be75862e8770c7c5dd368dfd7c4879f45a807e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-01 14:51:35 +08:00
Cai YiWei
ccc9c32708 media: rockchip: sync frame id and timestamp for isp and ispp read back mode
Change-Id: I0c7c8dc9ce574680332936f83e034ae8787aa687
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-01 14:51:03 +08:00
Cai YiWei
7b01e68c33 media: rockchip: isp: using long frame id to sync
For read back mode, sof id is refer to long frame id,
so image frame id should using long frame id.

Change-Id: I725f047ebdc8939efd1921dac5a568bfb91b0a9a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-01 14:49:10 +08:00
Cai YiWei
f7f571cf6c Revert "media: rockchip: isp: rkisp1 rename to rkisp"
This reverts commit 87184fa353
Reason for old platform, so isp1 version alone

Change-Id: Ib7fa24d080f31084262d401ef3308879d0ffc99c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-06-01 14:48:23 +08:00
Alan Stern
c492b822ca UPSTREAM: USB: hub: Fix handling of connect changes during sleep
Commit 8099f58f1e ("USB: hub: Don't record a connect-change event
during reset-resume") wasn't very well conceived.  The problem it
tried to fix was that if a connect-change event occurred while the
system was asleep (such as a device disconnecting itself from the bus
when it is suspended and then reconnecting when it resumes)
requiring a reset-resume during the system wakeup transition, the hub
port's change_bit entry would remain set afterward.  This would cause
the hub driver to believe another connect-change event had occurred
after the reset-resume, which was wrong and would lead the driver to
send unnecessary requests to the device (which could interfere with a
firmware update).

The commit tried to fix this by not setting the change_bit during the
wakeup.  But this was the wrong thing to do; it means that when a
device is unplugged while the system is asleep, the hub driver doesn't
realize anything has happened: The change_bit flag which would tell it
to handle the disconnect event is clear.

The commit needs to be reverted and the problem fixed in a different
way.  Fortunately an alternative solution was noted in the commit's
Changelog: We can continue to set the change_bit entry in
hub_activate() but then clear it when a reset-resume occurs.  That way
the the hub driver will see the change_bit when a device is
disconnected but won't see it when the device is still present.

That's what this patch does.

Reported-and-tested-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Fixes: 8099f58f1e ("USB: hub: Don't record a connect-change event during reset-resume")
Tested-by: Paul Zimmerman <pauldzim@gmail.com>
CC: <stable@vger.kernel.org>

Link: https://lore.kernel.org/r/Pine.LNX.4.44L0.2004221602480.11262-100000@iolanthe.rowland.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
Change-Id: I046ff3904f4f56388a992eaa9049d3ab6d53c8a5
(cherry picked from commit 9f952e2629)
2020-06-01 14:27:31 +08:00
Wu Liangqing
d04aa4137d arm64: dts: rockchip: rk3399-evb-ind-lpddr4-android-avb and rk3399-sapphire-excavator-edp add route_hdmi for hdmi boot logo
Change-Id: I8de8846b6c35247850c9480219bc94c2d0ec3c89
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-06-01 10:17:18 +08:00