Commit Graph

604619 Commits

Author SHA1 Message Date
Binyuan Lan
5815eebd8e ARM: dts: rockchip: rk3126-bnd-d708: add codec
Change-Id: I8f5d73c6241de5e92e0efe641c4c2d2308555029
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2017-11-15 15:51:13 +08:00
Binyuan Lan
37b11e436a ARM: dts: rockchip: add codec for rk312x
Change-Id: I0b521865f195d231c17f05790a5a467623aff033
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2017-11-15 15:50:51 +08:00
Binyuan Lan
eb8bafd40b ARM: rockchip_defconfig: enable CONFIG_SND_SOC_RK312X
Change-Id: I30f11d269f4ce25a12e597455418573899a45756
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2017-11-15 15:50:03 +08:00
Binyuan Lan
7eaf6ded21 ASoC: rockchip: add support for rk312x codec
Change-Id: Idb73b8999ed0fdc790e144ec18ad9a03b431311a
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2017-11-15 15:49:46 +08:00
Tao Huang
df8f6bcc81 pstore/console: ignore log level
When printk to pstore console, we ignore log level. So
/sys/fs/pstore/console-ramoops-0 should keep full kernel log.

Change-Id: I87ea3418741c117523a9e872ae7ace4dac0cd9d3
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2017-11-15 14:48:58 +08:00
Alex Zhao
5eb1607259 ARM64: dts: rockchip: px5: add rtl8723ds bt support
Change-Id: I81c612610a5a5310d5149489045a77180d4ea5ca
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
2017-11-14 19:25:57 +08:00
Alex Zhao
07e3824bd6 net: wireless: rockchip_wlan: update rtl8723cs
update rtl8723cs wifi driver to version v5.2.1.7_25082.20171108_COEX20170626-1a00

Change-Id: Ibe11dcb9b3592dfd7f554c20814b3233da87ff24
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
2017-11-14 19:25:34 +08:00
Alex Zhao
c56fa46c21 net: wireless: rockchip_wlan: update rtl8723ds
update rtl8723ds wifi driver to version v5.2.15.1_25011.20171107_COEX20171025-2020

Change-Id: Ifbf94c2ebc7c7d8e529910d77f6094d0ae4f7907
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
2017-11-14 19:25:24 +08:00
Peng Zhou
5ea7a94a66 arm64: dts: rockchip: rk3368-android: move cif from dtsi to dts
Move cif from rk3368-android.dtsi to rk3368-px5-evb-android.dts.
Redefine pinctrl for isp in rk3368-px5-evb-android.dts.

Change-Id: Ie8cd56cef507482b7d5e974a02f79279f0984aed
Signed-off-by: Peng Zhou <benjo.zhou@rock-chips.com>
2017-11-14 15:33:34 +08:00
Zorro Liu
3702779897 ARM64: dts: rockchip: update sensor config for rk3368-p9 board
Change-Id: I1dd416b6737f4c197c732b11f6d209f9b33871e0
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-14 15:32:25 +08:00
Zorro Liu
7f1ae55f96 driver: input: sensor: gyro: add new and to pass vts
1.add mpu6500 gyro driver
2.mpu6500 and mpu6880 to pass vts

Change-Id: I7a18578847e92c2cacd8d9b545455840b3a7b318
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-14 15:31:54 +08:00
Zorro Liu
49c623158c driver: input: sensor: update mpu6500 and mpu6880 accel driver
rate is not correct in interrupt mode, so just return and we
always use poll mode

Change-Id: I494600852907a8fff6599305195f5b4ccdb0bf7c
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-14 15:31:24 +08:00
Zorro Liu
42d5ef26c7 driver: sensor: add gyro sensor calibration function
Change-Id: Ic1e638631541f84d51c5e2c5bb3813e5a45a3fbe
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-14 15:31:13 +08:00
Peng Zhou
465219ff46 arm: dts: rk3126-bnd-d708.dts: add cif and sensor
Add new file for rk3126-m708-cif-sensor.dtsi

Change-Id: I882084dc84afbc43398fb6eb41eb09a712b645bf
Signed-off-by: Peng Zhou <benjo.zhou@rock-chips.com>
2017-11-14 11:35:22 +08:00
Takashi Iwai
d67947186e UPSTREAM: ALSA: timer: Call notifier in the same spinlock
snd_timer_notify1() is called outside the spinlock and it retakes the
lock after the unlock.  This is rather racy, and it's safer to move
snd_timer_notify() call inside the main spinlock.

The patch also contains a slight refactoring / cleanup of the code.
Now all start/stop/continue/pause look more symmetric and a bit better
readable.

Bug: 37240993
Change-Id: Ib90099f88c8b04928a8cdd2808cd9e16da6d519c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Siqi Lin <siqilin@google.com>
2017-11-14 09:59:54 +08:00
Tao Huang
384b95a76a rockchip/cru.h: rm rk3288_cru_set_soft_reset
Change-Id: I6b52488e8b6b153bf9c6e5ca275b3157cb082e35
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2017-11-13 19:55:15 +08:00
Tao Huang
ae9a5f91a2 rockchip/vcodec: remove references to RK_GRF_VIRT
Change-Id: If16be2cfadad9b06af7f249522456de96ca237e9
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2017-11-13 19:55:15 +08:00
Caesar Wang
bfdc2b5ffd ARM: dts: rk3036: enable watchdog on kylin board
Change-Id: I50e2323742695671dcc99232aedd35618961a42f
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2017-11-13 19:27:32 +08:00
Caesar Wang
cd4bc097fe ARM: dts: rk3036: support the watchdog
Change-Id: I2630993b1b9c5f6d3c4e3405303bfb3ebac07e8b
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2017-11-13 19:27:18 +08:00
Langlang Wang
f53a50d221 arm: rockchip_defconfig: add gsensor mc3230 for 3126c_bnd
Change-Id: I95f82d0d7437cd5a81b8ffd8ec96bf66d7cf1335
Signed-off-by: Langlang Wang <langlang.wang@rock-chips.com>
2017-11-13 19:26:53 +08:00
Wu Liangqing
2c8423fff7 ARM: dts: rockchip: rk3126c-bnd: add panel power contrl
Change-Id: I80d177fe2ab660ef4c3e43832937cbf936ea98c4
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Signed-off-by: Bi Weiyong <bivvy.bi@rock-chips.com>
2017-11-13 19:14:25 +08:00
Yankun Zheng
8d714a3001 ARM: dts: rockchip: rename the rk3229-at-3nod.dts to rk3229-at-gva.dts
Change-Id: I45358c6e2b707bd782b96d9fc4ca5c1ec3c7e1e3
Signed-off-by: Yankun Zheng <zyk@rock-chips.com>
2017-11-13 19:13:43 +08:00
Frank Wang
b33a891690 usb: dwc_otg_310: remove RK_GRF_VIRT references
Use regmap method instead of iomap for dwc_otg_310 driver.

Change-Id: I78e91f99196f7619c84b53a579909925167b145c
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-11-13 19:11:51 +08:00
Frank Wang
98b1208e86 usb: dwc_otg_310: delete legacy cru-soft-rst API
Since the DWC USB2.0 host of Rockchip use dwc2 driver instead of
dwc_otg_310 driver, so delete these legacy hack code which contain
the old cru-soft-rst API directly.

Change-Id: I2990c111481a14084c8aa96a54192b9fe88aa61c
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-11-13 19:11:45 +08:00
Wu Liangqing
d181b0e085 ARM: dts: rockchip: rk3126c-bnd: enabled verify
Change-Id: Ibb77f3beb01dc0f9648706c6542e1f2350cc261f
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2017-11-13 15:46:46 +08:00
Zorro Liu
806fc43f29 driver: input: sensor: client is always null, we should not use it
[    3.427327] [<ffffff8008520c18>] dev_driver_string+0x0/0x34
[    3.432895] [<ffffff800852157c>] _dev_info+0x74/0x94
[    3.437860] [<ffffff8008690988>] sensor_register_slave+0x80/0x8c
[    3.443858] [<ffffff8009052874>] gsensor_mma8452_init+0x24/0x2c
[    3.449776] [<ffffff80080831f0>] do_one_initcall+0x178/0x194
[    3.455437] [<ffffff8009020ddc>] kernel_init_freeable+0x1a4/0x25c
[    3.461531] [<ffffff8008ae9940>] kernel_init+0x10/0xf8
[    3.466666] [<ffffff80080828d0>] ret_from_fork+0x10/0x40

Change-Id: I16e608e82c4da098b6d7b42fa7c3a2dc864724f6
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-13 10:29:47 +08:00
Zorro Liu
19bf7f3d7e ARM: dts: modify sensor config for rk3126-bnd-d708 board
Change-Id: I8d52df728dc79905830490dffd0db16913707646
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-10 20:03:23 +08:00
Zorro Liu
1f82ad94f3 ARM64: dts: rockchip: modify sensor config for rk3368-px5-evb-android board
Change-Id: Ib22e082175316fd4526cf70913e6510974c3c008
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-10 20:03:10 +08:00
Zorro Liu
3b02b908b5 ARM64: dts: rockchip: modify sensor config for rk3368-xikp board
Change-Id: I2f764278d854aa1b1c7e5cd2579e73d8ead1dea6
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-10 20:02:52 +08:00
Zorro Liu
b9561487ed driver: input: sensor: add reprobe function
Change-Id: Ia4e405814851084825505e357fb95d95267fddaf
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-10 20:02:31 +08:00
Zorro Liu
a32d316fcc driver: sensors: improve sensor driver to pass android vts test
1) coding style
2) gsensor calibration by user
3) make sensor rate setting effective

Change-Id: I123674ad2fde72b0aa84e6135669ce1f44d5229d
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-10 20:02:11 +08:00
Zorro Liu
506a44f3cf driver: input: sensor: update lis3dh, mc3230, mpu6500, mpu6880 drivers
1.apply sensor rate
2.can pass android vts test

Change-Id: Ib4877fe3696e3724f8f9a2d21873438841e1b97f
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2017-11-10 20:00:20 +08:00
Frank Wang
50802af376 phy: rockchip-inno-usb3: fixed usb3 devices detected failed
We found the usb-phy lost devices detected ability after continuously
disconnect/connect, this patch add usb2-phy reset/deassert as one part
of previous workaround (commit c1ebf31) to fix it.

Change-Id: Ib7112047eb0f5030406389aa9c8ebd599f8118be
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-11-10 19:58:43 +08:00
Feng Mingli
f092c995c3 USB: core: flush pending URBs for unusual USB3 core when disable device
According to xHCI spec v1.1 section 6.4.5 TRB Completion Codes,
the standard XHCI controller provide a TRB Completion Status
'USB Transaction Error' to asserted in the case where the host
did not receive a valid response from the device, it's useful
to handle pending URBs on the endpoint when the USB device is
plugged out.

Unfortunately, some SOCs USB 3.0 modules lose the ability to
assert the 'USB Transaction Error' status when USB 3.0 device
disconnect. This may cause the pending URBs unhandled, even
lead to USB class driver stalled in waiting for URBs complete.

This patch flush pending URBs in usb_disable_device() when
USB 3.0 device disconnect, it will call xhci_urb_dequeue()
-> xhci_queue_stop_endpoint() to cancel pending URBs and
giveback URB status immediately.

Change-Id: If8acac59bc1f2c10a41ee390ccbeb84b2e7743c1
Signed-off-by: Feng Mingli <fml@rock-chips.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-11-10 19:58:22 +08:00
William Wu
fb771ab91a USB: workaround for specified USB3 PHY disconnection det issue
Some special SoCs (e.g. rk322xh) USB3 PHY have problem to detect
disconnection, they lose the ability to detect an absence of Rx
termination specified in USB3 spec Table 6-21, fortunately, the
USB3 PHY can detect port link state change when USB3 device is
unplugged, so we can do soft disconnect according to the PLC.

Change-Id: I2cbd62fddc8a1f9c5a264d705db43fb0cf3e035c
Signed-off-by: William Wu <wulf@rock-chips.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2017-11-10 19:58:15 +08:00
Chris Zhong
01b0c61bc9 HACK: get ramdisk correct size with rk bootloader
RK bootloader does not put a correct size to cmdline, hack the initramfs,
directly return when we get a good initrd.

Change-Id: Ia1199a1c47f1c0789268971c9f2c9b55bf81ca05
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
2017-11-10 17:46:36 +08:00
Chris Zhong
fc0cda6b09 ARM: rockchip_linux_defconfig: enable tps65910
Change-Id: I06a47748573719f46b8964f7e52ed01ae815bd2c
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
2017-11-10 17:46:19 +08:00
Chris Zhong
44b4f19e84 ARM: rockchip_linux_defconfig: enable ARM_ATAG_DTB_COMPAT and ARM_ATAG_DTB_COMPAT
Change-Id: Iec4e1fce0a07bf6f5b179b73d2ff9a3a72becae0
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
2017-11-10 17:45:40 +08:00
Chris Zhong
5f583a525f ARM: rockchip_linux_defconfig: enable rk_nand
Change-Id: If83976c106ee9dde531de33cfd0e5afa247dc522
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
2017-11-10 17:45:21 +08:00
Tao Huang
168084babc video: rockchip: transmitter: remove references to RK_GRF_VIRT
Only affects RK3288, which is not supported on 4.4.

Change-Id: I35a2bd8325a22add75a7ec381cfdac2374d9bc1b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2017-11-10 17:14:27 +08:00
Tao Huang
469fb55313 iommu/rk: remove references to RK_GRF_VIRT
Change-Id: I2061d04ea888d7e22e558d55db56e4137582f2fb
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2017-11-10 17:07:27 +08:00
Mark Yao
d7b8d42d2f drm/rockchip: vop: enable axi outstanding function
On some scenes, win lite area may flush with short width.

As the Technical Reference Manual description, need enable
axi outstanding function if use IOMMU.

From testing, after setting axi outstanding max number to 30
solve windows flush problem.

Change-Id: Id4ea7b5f5dae334e88cf1fb106c0b7bc6af9b8d0
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-11-10 17:01:07 +08:00
leo.ding
97b490b74e ARM: dts: rk3126-bnd-d708: enable vpu node
Change-Id: I90df995f82b14db7a1c001f9c1b5a6933621a9ce
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2017-11-10 15:33:58 +08:00
leo.ding
c6a435064b ARM: dts: rk312x: add vpu node
312x have vdpu & vepu, vpu1 format

Change-Id: I440bcdba4d229610c99157e9ad73ddf97d4d3a7d
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2017-11-10 15:30:52 +08:00
Alan Stern
3f7d8b7919 UPSTREAM: USB: usbfs: compute urb->actual_length for isochronous
The USB kerneldoc says that the actual_length field "is read in
non-iso completion functions", but the usbfs driver uses it for all
URB types in processcompl().  Since not all of the host controller
drivers set actual_length for isochronous URBs, programs using usbfs
with some host controllers don't work properly.  For example, Minas
reports that a USB camera controlled by libusb doesn't work properly
with a dwc2 controller.

It doesn't seem worthwhile to change the HCDs and the documentation,
since the in-kernel USB class drivers evidently don't rely on
actual_length for isochronous transfers.  The easiest solution is for
usbfs to calculate the actual_length value for itself, by adding up
the lengths of the individual packets in an isochronous transfer.

(cherry picked from git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-next
 commit 2ef47001b3)

Change-Id: Id0f62d26ab8bad746c267366b936790c7ae3aed8
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
Reported-and-tested-by: wlf <wulf@rock-chips.com>
CC: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-10 14:37:07 +08:00
Binyuan Lan
b6999a3a22 rk_headset: fix NULL pointer
Oops:
[    3.155334] Unable to handle kernel NULL pointer dereference at virtual address 00000020
[    3.665572] pgd = c0004000
[    3.668307] [00000020] *pgd=00000000
[    3.671955] Internal error: Oops: 5 [#1] PREEMPT SMP ARM
[    3.677298] Modules linked in:
[    3.680428] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.4.83 #354
[    3.686543] Hardware name: Generic DT based system
[    3.691365] task: ef0b8000 task.stack: ef0a4000
[    3.695948] PC is at _test_and_set_bit+0x24/0x4c
[    3.700612] LR is at queue_delayed_work_on+0x28/0x54

Change-Id: I6d6e20f466c616334d593e7b54330468df44ae7c
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2017-11-10 11:52:56 +08:00
Peng Zhou
53ec11e6a6 arm64: dts: rockchip: rk3368: add dvp pinctrl for isp
Change-Id: Ib28e15684f9bbaee79949fee39117cc84d184afa
Signed-off-by: Peng Zhou <benjo.zhou@rock-chips.com>
2017-11-10 11:16:22 +08:00
David Wu
fd93a13c26 ethernet: stmmac: rockchip: Fix the correct clock for mdc divider
The MDC clock is divider from APB Clock for rockchip's socs, if it
was from mac_clk, the mdc clk range might not be between the frequency
range 1.0 MHz - 2.5 MHz.

Change-Id: I4e4fcb1be239a8d78a39fc1f4e2af5bb87258798
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-11-10 11:15:20 +08:00
Caesar Wang
91dadb9eec ARM: dts: rockchip: fixes the emmc error on rk3036 SoCs
As the emmc is supplyed power by vcc_io, that's 3.3v voltage.
the default 1.8v volatge will cause the emmc error. as the following:

[   17.096082 ] mmcblk1: error -115 sending stop command, original cmd
response 0x900, card status 0xb00
[   17.127022 ] mmcblk1: error -110 transferring data, sector 664720, nr
72, cmd response 0x900, card status 0xb00

Remove the mmc-ddr-1_8v to keep the default the 3.3v voltage.

Change-Id: I9e2539d63fd93e72d9febbb311fbd686c5a11d09
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2017-11-10 11:14:33 +08:00
Zheng Yang
cf82a4f3c2 video: rockchip: hdmi: rk3288: update grf and reset operation
Use regmap_write to access grf register and reset_control_assert
to reset hdmi controller.

Change-Id: I0c61635bbba8885a93361776836e69697d4d231e
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2017-11-09 11:13:56 +08:00