Commit Graph

615790 Commits

Author SHA1 Message Date
Zeng Tao
9d834b7978 UPSTREAM: usb: dwc3: gadget: Fix the uninitialized link_state when udc starts
Currently the link_state is uninitialized and the default value is 0(U0)
before the first time we start the udc, and after we start the udc then
 stop the udc, the link_state will be undefined.
We may have the following warnings if we start the udc again with
an undefined link_state:

WARNING: CPU: 0 PID: 327 at drivers/usb/dwc3/gadget.c:294 dwc3_send_gadget_ep_cmd+0x304/0x308
dwc3 100e0000.hidwc3_0: wakeup failed --> -22
[...]
Call Trace:
[<c010f270>] (unwind_backtrace) from [<c010b3d8>] (show_stack+0x10/0x14)
[<c010b3d8>] (show_stack) from [<c034a4dc>] (dump_stack+0x84/0x98)
[<c034a4dc>] (dump_stack) from [<c0118000>] (__warn+0xe8/0x100)
[<c0118000>] (__warn) from [<c0118050>](warn_slowpath_fmt+0x38/0x48)
[<c0118050>] (warn_slowpath_fmt) from [<c0442ec0>](dwc3_send_gadget_ep_cmd+0x304/0x308)
[<c0442ec0>] (dwc3_send_gadget_ep_cmd) from [<c0445e68>](dwc3_ep0_start_trans+0x48/0xf4)
[<c0445e68>] (dwc3_ep0_start_trans) from [<c0446750>](dwc3_ep0_out_start+0x64/0x80)
[<c0446750>] (dwc3_ep0_out_start) from [<c04451c0>](__dwc3_gadget_start+0x1e0/0x278)
[<c04451c0>] (__dwc3_gadget_start) from [<c04452e0>](dwc3_gadget_start+0x88/0x10c)
[<c04452e0>] (dwc3_gadget_start) from [<c045ee54>](udc_bind_to_driver+0x88/0xbc)
[<c045ee54>] (udc_bind_to_driver) from [<c045f29c>](usb_gadget_probe_driver+0xf8/0x140)
[<c045f29c>] (usb_gadget_probe_driver) from [<bf005424>](gadget_dev_desc_UDC_store+0xac/0xc4 [libcomposite])
[<bf005424>] (gadget_dev_desc_UDC_store [libcomposite]) from[<c023d8e0>] (configfs_write_file+0xd4/0x160)
[<c023d8e0>] (configfs_write_file) from [<c01d51e8>] (__vfs_write+0x1c/0x114)
[<c01d51e8>] (__vfs_write) from [<c01d5ff4>] (vfs_write+0xa4/0x168)
[<c01d5ff4>] (vfs_write) from [<c01d6d40>] (SyS_write+0x3c/0x90)
[<c01d6d40>] (SyS_write) from [<c0107400>] (ret_fast_syscall+0x0/0x3c)

Change-Id: Ib36cc28674fb34c5ca050681ad0d8b07067b070f
Signed-off-by: Zeng Tao <prime.zeng@hisilicon.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 88b1bb1f3b)
2019-05-27 15:34:01 +08:00
Jon Lin
076167d0b0 drivers: rkflash: fix build error
fix build without nand support.

Change-Id: I9a5a2d63b335c42bcff99853b790796dd35355de
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-05-24 20:57:54 +08:00
Wang Panzhenzhuan
4839d7edd0 dt-bindings: media: i2c: Document add bf3925
Change-Id: I94900c7cb3c06702ac09350373d7868a9b0a6f8f
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-05-24 17:17:27 +08:00
Wyon Bi
f58cc02df9 drm/rockchip: dsi: Increase gen_rd_cmd_busy timeout
When a read command is issued in video mode, gen_rd_cmd_busy
timeout delay needs to be increased to one frame.

Change-Id: Ic8070431c3d365f40da5f4758e578cece231e669
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-05-24 15:35:34 +08:00
Xu Hongfei
6fea8398e4 media: i2c: add nvp6324 sensor driver from NEXTCHIP Inc
Change-Id: I36beefd27bb0a017cd1e741ad1f46c4aaf517075
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
2019-05-24 15:14:48 +08:00
Xu Hongfei
7ee69fa211 media: rockchip: rk-cif: v0.1.1
support the mipi vc multi-channel input in cif driver
for rk1808

Change-Id: I432c628b30e6f6f23e8515158dcf516e499bf79a
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
2019-05-24 10:48:11 +08:00
Xing Zheng
75249587c7 ASoC: rk3308_codec: increase some delays to be stabe enabling DAC
From the suggest of IP vendor, we need more delays to
adapt to the playing scene in different temperature
environments.

Change-Id: I95abe2bac43de19241092d6e785f28960760dacd
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2019-05-24 09:31:44 +08:00
Xu Hongfei
a9b3e6c878 arm64: dts: rockchip: rk1808: add mipi csi dts config
Change-Id: I79068090de87b0650da44dd0a49029b05e6b2ac5
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
2019-05-23 19:48:59 +08:00
Xu Hongfei
70c49f8428 media: csi2: add mipi csi2 host driver
Change-Id: Iea58562c4f634d809add88b459949091b35b08b5
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
2019-05-23 19:48:41 +08:00
Xu Hongfei
8b78ba5cf4 media: i2c: increase resolution in virt cam driver
Change-Id: I94c4a30f9c4413a64d161ff2e64aa915bca7202e
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
2019-05-23 19:29:50 +08:00
Lin Huang
71a73d5a65 Revert "arm64: rk1808_linux_defconfig: enable ARM_ROCKCHIP_BUS_DEVFREQ"
This reverts commit 22e601b986.

Change-Id: I40cf250ff681ab03d45f0870d6e4f3a0c6aa5787
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-05-23 10:24:29 +08:00
Chuncheng Huang
f4763f3e5b media: i2c: add fp5510
Change-Id: I7a4ebb39e8b8106173cfb6e857718264ecdeaabb
Signed-off-by: Chuncheng Huang <hardy.huang@rock-chips.com>
2019-05-22 18:33:52 +08:00
Weixin Zhou
8a9c7596d9 arm64: dts: rockchip: rk3399pro-evb-lp4-v11: add configs for lpddr4 dmc
1.using sram buffer for pcm buffer
2.enable rockchip,force-iram

Change-Id: I0549b58547422d5ca2cc7b1391f44111d0562343
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2019-05-22 18:24:17 +08:00
XiaoDong Huang
994f361c86 regulator: tps549b22: read voltage-step from device-tree
Change-Id: I4de8a54b8475af073ed51ced0959a4e93590563d
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2019-05-22 15:31:08 +08:00
Wang Panzhenzhuan
86c7569f60 media: i2c: gc2145: fix mipi interface stream error
Change-Id: Iec12e0a5857e051510f7110cd0d796840bde9a9d
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-05-21 17:53:44 +08:00
Bian Jin chen
d1fd776a1d arm64: dts: rockchip: rk3399pro-evb-v10: Separate android firmware
Split DT source files to separate out android firmware for Android Pie & Oreo

Change-Id: I9ab950ec8c5c60b0ae4f74d5734ae4f4b05d6cf4
Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
2019-05-21 14:39:12 +08:00
Felipe Balbi
c274db0024 UPSTREAM: usb: dwc3: gadget: stop processing on HWO set
stop consuming TRBs when we reach one with HWO bit
already set. This will prevent us from prematurely
retiring a TRB.

Change-Id: Id7b82ec62501638d0c6550187f2c29606194b862
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit a0ad85ae86)
2019-05-20 18:10:37 +08:00
William Wu
54bf73cae7 Revert "UPSTREAM: usb: dwc3: gadget: cope with XferNotReady before usb_ep_queue()"
This reverts commit c139ec131a.

This patch needs a series of related patches, if we only pick
this upstream patch, the UVC gadget can't work normally. So
just revert it.

As a side effect, the audio source function doesn't work.
However, the audio source function is a only used for linux
linaro, and we suggest to use UAC1 or UAC2 instead of audio source.

Change-Id: I82a69f122dbf48eda63893405a67d35e6d9cad80
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-05-20 18:10:29 +08:00
Zefa Chen
5c40b14f4f media: i2c: Sensor driver version V0.0X01.0X01
add poweron function

Change-Id: I523ae224988aa115b844c42b086e122b26d61001
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2019-05-17 17:47:56 +08:00
Finley Xiao
5b593bbc06 MALI: midgard: Add private data for governor
This adds support to get simple_ondemand governor data from devicetree.

Change-Id: Ica8cde1b28a81d5b7e2c5c8c109a2469311bcd8e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-05-16 18:56:08 +08:00
Cai YiWei
acc37d9094 media: i2c: tc35874x: fix isp overflow
Change-Id: I848158e914af1314bb047203089c5f32d3c64f55
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-05-16 17:43:33 +08:00
Cai YiWei
9d49e86315 arm64: dts: rockchip: fix tc358749 config for rk3399 sapphire excavator linux
Change-Id: Iaf467028470176165384ceb281322ec68568954c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-05-16 17:42:36 +08:00
Wang Panzhenzhuan
9db22a1ea1 media: i2c: fix Makefile ov2680 mistake
Change-Id: I9c6f5eb478f418ebd863aaf5269394849f820af9
Fixes: abcc0b4c71 ("media: i2c: add sensor ov2680")
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-05-16 14:34:12 +08:00
Zhen Chen
beeb3cb580 ARM: dts: rk3288-linux: add 'gpu_power_model' feature with DDK r14 for linux
Change-Id: I93c20908a150be28588141c457fbc937ae85c28a
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-05-15 17:39:10 +08:00
Zhen Chen
eab54f88a5 arm: configs: rockchip_linux_defconfig: add CONFIG_MALI_MIDGARD_FOR_LINUX back
Change-Id: Ifd4eba7c902a763c39ca278573c7be2dd45865e5
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-05-15 17:39:10 +08:00
brian
251948079f ASoC: es8316: setting gpio only when it's available
The spk_ctl_gpio may not available and no need to set, or else
there will be error message.

Change-Id: I54b1775c4d2bd695f7a5373149b14bc2501ce136
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-05-15 10:56:12 +08:00
Zain Wang
3604596d70 arm64: dts: rockchip: rk3328-evb: add drm-logo
Change-Id: Ia94fd5f48ca7371b7a453afff959182b5a30496e
Signed-off-by: Zain Wang <wzz@rock-chips.com>
2019-05-15 08:46:23 +08:00
Hans Yang
2df73d2141 ARM: dts: rockchip: rk3128h: add linux evb board support
Change-Id: I50dae26ac9dbbfc18f161a168ed796ab8d8eb18c
Signed-off-by: Hans Yang <yhx@rock-chips.com>
2019-05-10 20:08:23 +08:00
Hu Kejun
5bc6ffdd39 media: i2c: add poweron function
Change-Id: I36c3509ff20b9869927c7c0083d411041d74f431
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-05-10 20:02:29 +08:00
Hu Kejun
fda2824552 media: rockchip: isp1: add pipeline power management
Change-Id: I0021482560db18ae50c78e91a590c4ae3d729761
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-05-10 20:02:29 +08:00
Hu Kejun
d8a50ba96c media: rockchip: isp1: fix get zero data when start stream again
use the following sequence, we will get zero data.
1. open video device;
2. start stream;
3. stop stream;
4. start stream again, we will get zero data.

Change-Id: I7433f4891f66c2228e840116a5d4632298ab62c4
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-05-10 20:02:29 +08:00
Elaine Zhang
cde51a9363 clk: rockchip: rk1808: Fixed incorrect parameter configuration
fix up the 1G pll vco,
fix up the sdmmc gating bit.

Change-Id: I91ccc7a864e6fd1458e40965b8e5677887b8e055
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-05-10 19:42:26 +08:00
Finley Xiao
c0a30192ee arm64: dts: rockchip: rk3328: Add rockchip,video-4k-freq for cpu
Change-Id: Iec44bbc893fbd41487f109d17f126cba63f5c295
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-05-09 16:35:20 +08:00
Finley Xiao
a292b13717 arm64: dts: rockchip: rk3328: Add system monitor node
Change-Id: Idc372ea7abdeca1ba409b3c0add44985c114ca06
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-05-09 16:34:46 +08:00
Lin Huang
c48522ca13 arm64: dts: rockchip: rk1808-compute: enable dmc
rk1808 compute stick is sensitive with power consumption, so
enable ddr dvfs, and set ddr frequency to 784MHz.

Change-Id: Ib08ec090af8fe7b276102ffb818aa9c4c0c8b82e
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-05-08 17:15:41 +08:00
Weixin Zhou
427e3f1c23 arm64: dts: rockchip: rk3399pro-evb-lp4-v11: add for lpddr4 board
Change-Id: Id0119197d65a661f810fabbd637e32f0cef6245a
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2019-05-08 14:41:27 +08:00
Hu Kejun
36090c85ad media: spi: rk1608: update version to v0.1.2
Change-Id: I28afc788b30fcebb991df893ced74684d2a97b3c
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-05-08 10:09:07 +08:00
Cai YiWei
b33c1469f0 media: rockchip: isp1: add dmarx patch
support read 8/16bit bayer raw and yuv422 format
from memory to isp.

Change-Id: I771a1a9c366a6721323815e811668472996a3355
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-05-07 10:26:41 +08:00
Cai YiWei
9e759868d7 media: rockchip: isp1: enable af awb irq
enable AWB AF irq, to send measurement alone.
AEC and HIST need to get together, do it in
frame end.

Change-Id: I7d955eccfd4080865fa4c4f260a1e3c44f9585e1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-05-07 10:04:40 +08:00
Cai YiWei
14c2ab1cc2 media: rockchip: isp1: fix diff isp ver to get frame num
Change-Id: Ibfbd97afd61c199c544698963aa9b1795ec5daf8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-05-07 10:01:17 +08:00
Caesar Wang
c350a364a9 arm64: dts: rockchip: Reorganization of rk3399 Excavator dts for linux
Fix the things that explain as below:

* Fixes the panel displaying is abnormal during booting up.
  As the edp driver of uboot adds the reset with the Initialization,
  The wrong gpio configure will had been abnormal things, and sync the edp
  configure with android.
* Re-tuning the code is more intuitive.
* Remove duplicate code.

Change-Id: I302787ced74c07561655d9f27c81ee6a0afd4d08
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-05-07 09:58:14 +08:00
Caesar Wang
c3c6c4068e arm64: dts: rockchip: move the common things to the rk3399-linux.dtsi
In order to reduce the duplication of code, let's move the common things
to the rk3399-linux.dtsi.

Change-Id: I066d99642190cfcbe1c8d16d05849297176f9e6b
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2019-05-07 09:58:14 +08:00
Ziyuan Xu
c201a3aeb6 arm64: config: make wifi driver as module for px30/rk3326 linux
Change-Id: Iffec136b461140a4066edd93b3d4a652f9f6b178
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2019-05-07 09:55:30 +08:00
Weiwen Chen
c8f542ad44 ARM: dts: rockchip: rk3126c: rename linux dts
Change-Id: I31c3b66ca89c611af6925d4eddb5ad339bbacc43
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
2019-05-06 16:26:14 +08:00
Hu Kejun
7d6c982db6 media: spi: rk1608: load preisp firmware in parallel to write sensor global setting
Change-Id: I13cf8ad712a22592f6af0236f0717c35c611003a
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-05-06 16:18:18 +08:00
Hu Kejun
d1f1930878 media: spi: rk1608: skip write aec ioctl before stream on
Change-Id: I421369296f766446ddbeb87f3d43d3bcb5a0087d
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-05-06 16:18:18 +08:00
Lin Jinhan
ee082ae4f6 crypto: rockchip - add px30 crypto aes/des support
cipher mode list:
  aes:      ecb/cbc/xts
  des/3des: ecb/cbc

Change-Id: I46e8f698a099dd9d4e9a81afb6f3a992dadfd79f
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-05-06 16:12:29 +08:00
Lin Jinhan
3655df1bc6 dt-bindings: crypto: rockchip: add support for px30
Add DT bindings documentation for the px30 crypto drivers.

Change-Id: I15a7ce60cc56c5690d5d2640e78358060f4efa80
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-05-06 16:12:29 +08:00
Lin Jinhan
413dac552c arm64: dts: rockchip: px30 add crypto node
Change-Id: Ib8026ce7dd008d303decd61c41ec26b08b8782b1
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2019-05-06 16:12:29 +08:00
Lin Huang
258acc22f0 arm64: dts: rockchip: add rk1808 toybrick compute-stick board
Change-Id: I8efd2d00437c989711687a83f7b9fb89100d0f66
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-05-06 16:10:28 +08:00