Commit Graph

619507 Commits

Author SHA1 Message Date
Weixin Zhou
fff810ec29 PCI: rockchip: DW PCIe controller support reset-gpio undefined case
Change-Id: Ib1e641633b09af9ddea3dc4b0e93a93668a723b2
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2019-06-24 15:52:18 +08:00
Rimon Xu
639cc5284a video: rockchip: vpu: buffer list max nums up to 50.
If the number of buffers in Import exceeds the original set of 30,
it will result in each import buffer kicking out the original stored
buffers, and all subsequent buffers need attachments.

Change-Id: I6e547e1f8943d54995077827ae0d1019e659d797
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
2019-06-24 14:20:55 +08:00
Weixin Zhou
bdde6c77bb arm64: dts: rockchip: rk3399pro-evb-v13-multi-cam: for multi camera board
Change-Id: I82bd22191a61523bfeec11218fd36a856e9265dc
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2019-06-24 14:19:34 +08:00
Xing Zheng
b45124d888 dt-bindings: sound: rk3308_codec: add 'rockchip,hp-jack-reversed;' property
Change-Id: I90ded394e8351a8cddd5703268529871f21dfac7
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-06-24 14:17:14 +08:00
Xing Zheng
484463f342 ASoC: rk3308_codec: add support reversed headphone jack
Change-Id: I4752c935684e3b745185cc43b826cad06ff429c5
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-06-24 14:17:14 +08:00
Cliff Chen
12992228b6 f2fs: Fix recovery is too slow when power fail on much fsync
By default fsync option, if fsync is called frequently, and suddenly
lost power, the POR will consume too much memory at mounting, this
process may be very slow due to a large number of swapping.

Change-Id: I8235098cca062d7ab58af4ebed414aed9aba6c75
Signed-off-by: Cliff Chen <cliff.chen@rock-chips.com>
2019-06-24 14:11:46 +08:00
Tao Huang
a1a13306a4 input: touchscreen: gt9xx: avoid clang warning
drivers/input/touchscreen/gt9xx/gt9xx_update.c:2744:19: warning: equality comparison with extraneous parentheses [-Wparentheses-equality]
 while ((ready == 0)) //Wait for measurement complete
         ~~~~~~^~~~

Change-Id: I6954c7cd8867e1d85d435a23ee857cd4e3c58b4b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-06-24 11:06:47 +08:00
Tao Huang
586f045a76 drivers: rk_nand: include seq_file.h for rk_nand_blk.c
Change-Id: I2736a432c071fae0ff47f7015a87c39a39e07095
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-06-21 18:57:08 +08:00
Weixin Zhou
4b3a2fba5e arm64: dts: rockchip: rk3399pro-npu-evb-v10-multi-cam: dma address needs to match the host
Change-Id: If541d9d3343abb6090026aa1bae1c842e17b601b
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2019-06-20 17:22:26 +08:00
Yifeng Zhao
e4c8c984c8 Revert "drivers: mtd: nand: fix cs configuration error during nand initialization"
This reverts commit 362a761161.

Change-Id: I492d2e15b0d948921613a56e61b920d0885d6699
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2019-06-20 14:51:08 +08:00
Wyon Bi
3060dc302c drm/rockchip: dsi: do turnaround request manually is only required for rk3288 dsi1
Test on RK3399

Fixes: f324dff252 ("drm/rockchip: dsi: Send turnaround request after a read request for dsi1")
Change-Id: Id1fad1e8c7c742291bdbd77082dd872093ad549e
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-06-20 14:50:17 +08:00
Finley Xiao
892eacb3b5 cpufreq: dt: Fix memory leak when cpu on/off
Fixes: e51ed31ccd ("cpufreq: dt: Add support to get static power")
Change-Id: I613a14a061490fb69e913b8c2cf6677757c73ced
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-06-20 14:44:31 +08:00
Finley Xiao
408ea389fb soc: rockchip: ipa: Get leakage when ipa power model init
Change-Id: Ib0f7855c6faa54fa5ca28010d1c05da8ba478d7e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-06-20 14:43:54 +08:00
William Wu
5e7bba8159 usb: gadget: rndis: fix class definitions for windows
The RNDIS gadget function has USB class of 2 and subclass
of 2, which matches "USB\Class_02&SubClass_02" in the
usbser.inf file in the Windows system, so the device is
initially detected as a COM port instead of RNDIS. This
is why we need to install RNDIS manually.

Refer to Defined Class Codes [1] and rndis_host of Linux [2],
this patch sets the RNDIS gadget with base class of 0xE0h
(Wireless Controller) and subclass of 0x01h and protocol
of 0x03h.

[1] https://www.usb.org/defined-class-codes
[2] http://www.embedded-os.de/en/proto-rndis_host.shtml

Change-Id: Ida366749f378a0ce770d707b4ba56b87f9e188cf
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-06-20 14:42:26 +08:00
Xing Zheng
cb63e4cc13 arm64: dts: rk3399pro: using multicodec sound for rt5651 codec
We need to export Headphone Jack snd ctl to userspace
on linux platform via multicodec machine driver.

Change-Id: I5664a0b29dfda2ed8cc450a5f0fd388d32dfdd48
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-06-20 14:17:41 +08:00
Xing Zheng
bb94c30573 arm64: dts: rk3399: using multicodec sound for rt5651 codec
We need to export Headphone Jack snd ctl to userspace
on linux platform via multicodec machine driver.

Change-Id: I1d042b080ab45f303f7c1a4100a2dd8014d923bc
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-06-20 14:17:41 +08:00
Xing Zheng
150909a9b3 ASoC: rockchip: multicodecs: update headphone jack
We need to specify a pin description to create a
new soc jack kctl and report to userspace.

Change-Id: I46f665bd4009c0779a5c9cc3f6b9d43123b54883
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-06-20 14:17:41 +08:00
Xing Zheng
480771a97d ASoC: rockchip: multicodecs: add rk_headset_set_jack_detect
For the legacy issues, we still need to call rk_headset
on some linux platform.

Change-Id: I395de2b8c1300b1cd7cb429dce852ef12bfe2f4c
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-06-20 14:17:41 +08:00
Xing Zheng
e8949686cb rk_headset: add support jack report
This patch supports Jack's event report switching Audio
paths on public platforms.

Change-Id: I83e395f81fb60a2b446a309fae820d26d7df4661
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-06-20 14:17:41 +08:00
Xing Zheng
48a7471142 arm64: rockchip_linux_defconfig: enable rockchip multicodec machine driver
Change-Id: Ib0bfe4cd980ca983ef32ee8cb2267b27f7505161
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-06-20 14:17:41 +08:00
Xing Zheng
1f50b7dbea arm64: rockchip_linux_defconfig: enable rkheadset and switch
Some legacy hardware reference designs are based on the
driver configuration of rk_headset, we need to open it
by default.

Change-Id: I15758e15da3a6c76f8cc021749ce9fee1905f72a
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-06-20 14:17:41 +08:00
Weixin Zhou
51632dfbbe arm64: dts: rockchip: rk3399pro-npu-evb-v10-multi-cam: enable pcie
Change-Id: I4bfd9ff8ca44956641e94ce977c0a338f3347b1e
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2019-06-20 11:39:50 +08:00
Allon Huang
82a27d2c88 media: i2c: gc2145: Fix code style issue
Change-Id: Iba67ab5db9589983e8f3bf544f8fb6d5ce6d2fb2
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
2019-06-19 19:28:22 +08:00
Allon Huang
48eade26ad media: rockchip: cif: support mipi channel and work mode switching
rk3288 cif can work with mipi channel and switch work mode

Change-Id: Ie8a49cf787617ff5d98ef84cdac761c3ece761c9
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
2019-06-19 19:28:02 +08:00
Allon Huang
8fb5906e02 phy: rockchip: mipi-rx: distinguish control object for txrx
txrx can be linked with isp or csi-host, so separate it

Change-Id: I41d81770c53008bdf9703f92834cc41d9724a563
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
2019-06-19 19:28:02 +08:00
Allon Huang
e4ab186bd4 media: rockchip: cif: csi-host compatible with rk3288
Change-Id: I59abdf5088622ba6e556912f5fef39ad75893b11
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
2019-06-19 19:28:02 +08:00
Allon Huang
49af652f8d ARM: dts: rk3288: combine mipi with cif to work
Link mipi with cif to work.
Meanwhile,replace isp node with rkisp1 node to use
rkisp driver and remove edp-panel enable pin due to
it conflicts with dvp pwdn pin on rk3288-evb-v11.

Change-Id: If8125d2173c7340d7d702294ab55ee2f0c433663
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
2019-06-19 19:28:02 +08:00
Allon Huang
27f3f830a9 ARM: dts: rk3288: add csi_host and cif_pin
Change-Id: I43f289d3de897ef16098639a57b140c9554de3cd
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
2019-06-19 19:28:02 +08:00
Tao Huang
f4cd5c18fe video/rockchip: rga2: coding style rm ^M
Change-Id: I6e571211f8fee9f66c3b97b620f13606fc3604ac
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2019-06-18 15:20:55 +08:00
José Roberto de Souza
3e12c17be4 UPSTREAM: drm: Do not call drm_dp_cec_set_edid() while registering DP connectors
drm_dp_cec_register_connector() is called when registering each DP
connector in DRM, while sounds a good idea register CEC adapters as
earlier as possible, it causes some driver initialization delay
trying to do DPCD transactions in disconnected connectors.

This change will cause no regressions as drm_dp_cec_set_edid() will
still be called in further detection of connected connectors with a
valid edid parameter.

This change reduced the module load of i915 by average 0.5sec in a
machine with just one DP port disconnected while reducing more than
3sec in a machine with 4 DP ports disconnected.

Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20181011004439.4482-1-jose.souza@intel.com
(cherry picked from commit 7323001549)

Change-Id: I815948f733719705bbc576fc1ca723fb5a59fe6b
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Hans Verkuil
349e07ffdf UPSTREAM: drm_dp_cec: add note about good MegaChips 2900 CEC support
A big problem with DP CEC-Tunneling-over-AUX is that it is tricky
to find adapters with a chipset that supports this AND where the
manufacturer actually connected the HDMI CEC line to the chipset.

Add a mention of the MegaChips 2900 chipset which seems to support
this feature well.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180827075820.41109-3-hverkuil@xs4all.nl
(cherry picked from commit 9bcf6d9868)

Change-Id: Idd9a225357a5b3bbb14287cc1f5b13630d0bd449
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Hans Verkuil
51b3852a7f UPSTREAM: drm_dp_cec: check that aux has a transfer function
If aux->transfer == NULL, then just return without doing
anything. In that case the function is likely called for
a non-(e)DP connector.

This never happened for the i915 driver, but the nouveau and amdgpu
drivers need this check.

The alternative would be to add this check in those drivers before
every drm_dp_cec call, but it makes sense to check it in the
drm_dp_cec functions to prevent a kernel oops.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180827075820.41109-2-hverkuil@xs4all.nl
(cherry picked from commit 5ce70c799a)

Change-Id: I8a56122cc777e17c2b303120372f7087a94c5083
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Hans Verkuil
d18dae4b02 UPSTREAM: drm_dp_cec.c: fix formatting typo: %pdH -> %phD
This caused a kernel oops since %pdH interpreted the pointer
as a struct file.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f3720ddf-ec0f-cd22-46b6-720a5e2098f2@xs4all.nl
(cherry picked from commit ea5569ecd6)

Change-Id: I9780212b39185e8b87b74d0216538378f16baf58
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Hans Verkuil
883524f8fb UPSTREAM: drm: add support for DisplayPort CEC-Tunneling-over-AUX
This adds support for the DisplayPort CEC-Tunneling-over-AUX
feature that is part of the DisplayPort 1.3 standard.

Unfortunately, not all DisplayPort/USB-C to HDMI adapters with a
chip that has this capability actually hook up the CEC pin, so
even though a CEC device is created, it may not actually work.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180711132909.25409-2-hverkuil@xs4all.nl
(cherry picked from commit 2c6d1fffa1)

Conflicts:
	drivers/gpu/drm/Makefile
	drivers/gpu/drm/drm_dp_helper.c
	include/drm/drm_dp_helper.h

Change-Id: I63df93f87cc521c148b6a999de9459577680a4f6
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Jani Nikula
4b24894a73 UPSTREAM: drm/dp: start a DPCD based DP sink/branch device quirk database
Face the fact, there are Display Port sink and branch devices out there
in the wild that don't follow the Display Port specifications, or they
have bugs, or just otherwise require special treatment. Start a common
quirk database the drivers can query based on the DP device
identification. At least for now, we leave the workarounds for the
drivers to implement as they see fit.

For starters, add a branch device that can't handle full 24-bit main
link Mdiv and Ndiv main link attributes properly. Naturally, the
workaround of reducing main link attributes for all devices ended up in
regressions for other devices. So here we are.

v2: Rebase on DRM DP desc read helpers

v3: Fix the OUI memcmp blunder (Clint)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Clint Taylor <clinton.a.taylor@intel.com>
Cc: Adam Jackson <ajax@redhat.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Tested-by: Clinton Taylor <clinton.a.taylor@intel.com>
Reviewed-by: Clinton Taylor <clinton.a.taylor@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> # v2
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/91ec198dd95258dbf3bee2f6be739e0da73b4fdd.1495105635.git.jani.nikula@intel.com
(cherry picked from commit 76fa998acd)

Conflicts:
	drivers/gpu/drm/drm_dp_helper.c

Change-Id: Ic51b5355c7bd1a8d81689755ebd8d14f74bb67ce
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Jani Nikula
dd630b568a UPSTREAM: drm/dp: add helper for reading DP sink/branch device desc from DPCD
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/acba54da7d80eafea9e59a893e27e3c31028c0ba.1495105635.git.jani.nikula@intel.com
(cherry picked from commit 118b90f3f1)

Conflicts:
	drivers/gpu/drm/drm_dp_helper.c
	include/drm/drm_dp_helper.h

Change-Id: I963d96c824c086035cdbdd6ffc0f2ca4d64967e1
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Hans Verkuil
224c96067d UPSTREAM: media: media/cec.h: add CEC_CAP_DEFAULTS
The CEC_CAP_LOG_ADDRS, CEC_CAP_TRANSMIT, CEC_CAP_PASSTHROUGH and
CEC_CAP_RC capabilities are normally always present.

Add a CEC_CAP_DEFAULTS define that ORs these four caps to simplify
drivers.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
(cherry picked from commit ee0c503eac)

Change-Id: Ic3221f5c676f2159dbe65115e38dfae5a8b6712e
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Hans Verkuil
a392ef306f UPSTREAM: [media] cec: add cec_phys_addr_invalidate() helper function
Simplifies setting the physical address to CEC_PHYS_ADDR_INVALID.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
(cherry picked from commit 135327899d)

Change-Id: I707856bd288cfc43c5f8f32e109586a7e790ba1c
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Clint Taylor
bf98f0d72c UPSTREAM: drm/cec: Add CEC over Aux register definitions
Adding DPCD register definitions from the DP 1.3 specification for CEC
over AUX support.

V2: Add DP_ prefix to all defines.
V3: missed prefixes from the ESI1 defines

Cc: Jani Nikula <jani.nikula@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1492703263-11494-1-git-send-email-clinton.a.taylor@intel.com
(cherry picked from commit d753e41d47)

Change-Id: I74173aeeda01c561cbb64834aaa0573289497ac8
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Tomeu Vizoso
ff2d12fa32 UPSTREAM: drm/dp: add crtc backpointer to drm_dp_aux
This backpointer allows DP helpers to access the crtc it's currently
being used for.

v6: Have the backpointer be to drm_crtc (Sean Paul)

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170303133936.14964-2-tomeu.vizoso@collabora.com
(cherry picked from commit 4bb310fd9e)

Change-Id: I61ac0aca125b5f5eea5f1c9471d63f7f94e86039
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2019-06-17 18:45:03 +08:00
Cai YiWei
4b00ec7c60 media: rockchip: isp1: fix isp iommu work after suspend
Change-Id: Ie89ec58c6f99a751bc1fdf681a85a6595716c649
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-17 18:34:44 +08:00
Terin Stock
8fe3b38102 UPSTREAM: usb: dwc2: host: use hrtimer for NAK retries
Modify the wait delay utilize the high resolution timer API to allow for
more precisely scheduled callbacks.

A previous commit added a 1ms retry delay after multiple consecutive
NAKed transactions using jiffies. On systems with a low timer interrupt
frequency, this delay may be significantly longer than specified,
resulting in misbehavior with some USB devices.

This scenario was reached on a Raspberry Pi 3B with a Macally FDD-USB
floppy drive (identified as 0424:0fdc Standard Microsystems Corp.
Floppy, based on the USB97CFDC USB FDC). With the relay delay, the drive
would be unable to mount a disk, replying with NAKs until the device was
reset.

Using ktime, the delta between starting the timer (in dwc2_hcd_qh_add)
and the callback function can be determined. With the original delay
implementation, this value was consistently approximately 12ms. (output
in us).

    <idle>-0     [000] ..s.  1600.559974: dwc2_wait_timer_fn: wait_timer delta: 11976
    <idle>-0     [000] ..s.  1600.571974: dwc2_wait_timer_fn: wait_timer delta: 11977
    <idle>-0     [000] ..s.  1600.583974: dwc2_wait_timer_fn: wait_timer delta: 11976
    <idle>-0     [000] ..s.  1600.595974: dwc2_wait_timer_fn: wait_timer delta: 11977

After converting the relay delay to using a higher resolution timer, the
delay was much closer to 1ms.

    <idle>-0     [000] d.h.  1956.553017: dwc2_wait_timer_fn: wait_timer delta: 1002
    <idle>-0     [000] d.h.  1956.554114: dwc2_wait_timer_fn: wait_timer delta: 1002
    <idle>-0     [000] d.h.  1957.542660: dwc2_wait_timer_fn: wait_timer delta: 1004
    <idle>-0     [000] d.h.  1957.543701: dwc2_wait_timer_fn: wait_timer delta: 1002

The floppy drive operates properly with delays up to approximately 5ms,
and sends NAKs for any delays that are longer.

Change-Id: I54987bfcab6d874b017bdcc8641e886ea4b626f7
Fixes: 38d2b5fb75 ("usb: dwc2: host: Don't retry NAKed transactions right away")
Cc: <stable@vger.kernel.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Acked-by: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Terin Stock <terin@terinstock.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit 6ed30a7d8e)
2019-06-17 15:30:44 +08:00
Dmitry Torokhov
f0f1140691 UPSTREAM: usb: dwc2: host: do not delay retries for CONTROL IN transfers
When handling split transactions we will try to delay retry after
getting a NAK from the device. This works well for BULK transfers that
can be polled for essentially forever. Unfortunately, on slower systems
at boot time, when the kernel is busy enumerating all the devices (USB
or not), we issue a bunch of control requests (reading device
descriptors, etc). If we get a NAK for the IN part of the control
request and delay retry for too long (because the system is busy), we
may confuse the device when we finally get to reissue SSPLIT/CSPLIT IN
and the device will respond with STALL. As a result we end up with
failure to get device descriptor and will fail to enumerate the device:

[    3.428801] usb 2-1.2.1: new full-speed USB device number 9 using dwc2
[    3.508576] usb 2-1.2.1: device descriptor read/8, error -32
[    3.699150] usb 2-1.2.1: device descriptor read/8, error -32
[    3.891653] usb 2-1.2.1: new full-speed USB device number 10 using dwc2
[    3.968859] usb 2-1.2.1: device descriptor read/8, error -32
...

Let's not delay retries of split CONTROL IN transfers, as this allows us
to reliably enumerate devices at boot time.

Change-Id: If24ce2df467cd07e11d28baa01cdbe334fd7b592
Fixes: 38d2b5fb75 ("usb: dwc2: host: Don't retry NAKed transactions right away")
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit b3eb981be7)
2019-06-17 15:30:44 +08:00
Yao Xiao
02d6972aff net: rockchip_wlan: cywdhd: add platform modifications for rockchip
Change-Id: I4c16f82ae6179054d852fad912caf1a71498d6e8
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
2019-06-17 09:42:52 +08:00
Caesar Wang
ca86b1b134 arm64/configs: support NTFS filesystem for rockchip_linux_defconfig
Change-Id: Id0b3bbdd5566a883c060e546c3f69f60b5ca40f4
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-06-17 09:09:50 +08:00
Jon Lin
196c3e8ab1 drivers: rkflash: adjust rkflash_debug print
unicom debug print of rkflash.

Change-Id: I59a04f6fdc9219f33fb37723851e87c55ace1f86
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-06-14 22:03:57 +08:00
Yifeng Zhao
6c0c028916 drivers: spi: rockchip: config spi rx dma burst size depend on xfer length
Change-Id: I54c855fc2ed4ccfbed6c011ae10bebc9829dc4d7
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2019-06-14 19:33:00 +08:00
Yifeng Zhao
362a761161 drivers: mtd: nand: fix cs configuration error during nand initialization
Change-Id: I200c5b00b1a900a4a6d95ed6a409e0409bb2c058
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2019-06-14 18:24:34 +08:00
Caesar Wang
d82f1d3e58 arm64: dts: rockchip: reasonable alllcation of VOP on rk3399 linux
Most users used 4K monitors with HDMI on RK3399/RK3399PRO platform, but no
more than 2K monitors on EDP/DSI panels.

So the reasonable that HDMI connected to VOPB control, and EDP/DSI shound
be connected to VOPL.

Change-Id: Id97efc5d6d534c302aa52ad00e705c093457f41e
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-06-14 18:04:01 +08:00
Sandy Huang
805e544f53 drm/rockchip: vop: disable afbdc before close crtc
afbdc should be closed before vop disable, otherwise will
abfdc will access AXI with error address, this will lead to
appear vop post empty or iommu pagefault error.

Change-Id: Ia811d629d12aa7fff8bb26ead4c97cc84b35e9b6
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-06-14 15:46:06 +08:00