Commit Graph

611219 Commits

Author SHA1 Message Date
Xing Zheng
a0fdf9ce3e ASoC: rk3308_codec: remove the limit of the ADC digital reset
It looks like that we still keep the resetting ADC digital
and avoid the broken noise for loopback at starting.

And, remove adc_path_state which is not used now.

Change-Id: I514692b1bbb4bad1f0ce5413ca5891fd41083549
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-09-04 09:42:38 +08:00
David Wu
4fa7f41dfe pinctrl: rockchip: Add pinctrl support for rk3308b
The main description for rk3308b is as follows:
 - Old iomux multiplexing extension;
 - GRF_SOC_CON5 register add some bits;
 - Newly added GRF_SOC_CON13/15 register.

Change-Id: I94bfcae5387aceae14895f1cafa0bfea51bf8b63
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-09-04 09:23:22 +08:00
Sugar Zhang
924c406896 ALSA: pcm_dmaengine: preprocess vad data for the first round
This patch fixup the lost vad activity frames count in the
first round dma xfer.

Change-Id: I72c1e5a9aeefc4966741b1fbf9c9e4d551cacfab
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-04 09:20:32 +08:00
Sugar Zhang
128120abb0 ASoC: rockchip: vad: fixup 32bit software abs value
Change-Id: Ic520fcb7e3be18ad7eb36fc1cea208f35a95fd02
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-04 09:20:32 +08:00
Sugar Zhang
89f67d6d46 ASoC: rockchip: multi_dais_pcm: obtain the vad data
This patch recaculate the hw pointer to make the vad data
available and submit the residue dma buffer requests in
single xfer mode for the first round, and then cyclic xfer
mode for normal.

Change-Id: I27c1d6e32cfcac74ae53bb151da859cd4325517b
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-04 09:20:32 +08:00
Sugar Zhang
bb3a8f822e ASoC: rockchip: vad: memcpy: add support padding size
This patch add support for memcpy with padding size.
just like extend vad 6ch to 8ch buffer, so the padding
is needed.

Change-Id: Ie9777b2856d556d4934bce6e850dae9b27b078db
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-04 09:20:32 +08:00
Sugar Zhang
83623425bc dmaengine: pl330: add support for interlace single xfer
Change-Id: I953a3858c2cb3c252788bb65c27c99ee737744c9
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-09-04 09:20:32 +08:00
William Wu
c24a103ab6 usb: quirks: add quirk for Kingston DataTraveler 3.0 with broken LPM
Kingston DataTraveler 3.0 sometime would be disconnected
or not be enumerated successfully by xHCI controller when
LPM was enabled.

This patch adds an USB_QUIRK_NO_LPM quirk for this device.

Change-Id: I8ffa8d46ee242ab9665ce70565df7718b20ca87c
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-09-04 09:17:38 +08:00
Wyon Bi
63fcb9a771 drm/panel: simple: fix loader protect
Change-Id: I5b9bb5e35cc74389b6500f85c48dfed911c21181
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2018-09-04 09:16:30 +08:00
Xing Zheng
37a6461623 arm64: dts: rockchip: enable 'rockchip,no-deep-low-power' for rk3308-evb
This patch can help us to fix pop after wake up via VAD,
and  enable 'rockchip,no-deep-low-power' on all of
rk3308-evb, not only amic boards.

Change-Id: I07f4674dd8c7fbd400b3c9b265fbaec6bfb5829e
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-09-04 09:16:13 +08:00
Sandy Huang
4e10742748 drm/rockchip: Fix coding style
Change-Id: I4ae825c374b518a501f986e3f63877216754f824
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-09-03 19:36:53 +08:00
Finley Xiao
592156489e arm64: dts: rockchip: rk3399: Add wide-temperature configure
Change-Id: I5e8cca3de8b671f04d9fdf07f6c566ebb8b7988a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-09-03 17:07:04 +08:00
Finley Xiao
0e582eb60f arm: dts: rockchip: rk3288: Change 400MHz to 420Mhz for gpu
It doesn't support 400MHz, but support 420MHz.

Change-Id: Ife31469307912f83919b02b532acde91cc0f19ce
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-09-03 17:03:00 +08:00
Finley Xiao
040687f1f9 arm: dts: rockchip: rk3288: Assign npll to 1250MHz
In order to support 420MHz for gpu and 125MHz, 50MHz for gmac.

Change-Id: I2b0e3edbf08850555c5bd4bc1d063c8923d54bda
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-09-03 17:03:00 +08:00
Wyon Bi
6b20b47257 drm/rockchip: vop: Don't create an instances of struct vop_win for dummy vop_win_data
Change-Id: I49d9d4f0f4dacb39042d9714f2a50af7462341ea
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-31 16:39:41 +08:00
Wyon Bi
1029816774 drm/rockchip: rgb: Remove duplicated code
Change-Id: I92349f76ca7359c359a1c23adc3b50bedc4d56b0
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-08-31 15:58:54 +08:00
Elaine Zhang
a35459a711 ARM64: dts: rockchip: Add pmu\power-domain\qos dts node for rk1808
Change-Id: I8bd286384a8cdc0a7c6c2645afa4fa066a0cd22d
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-31 15:27:41 +08:00
Jianqun Xu
3656c731d6 arm64: dts: rockchip: rk1808 add uart aliases
Change-Id: If058767cf6c50dccb1cd57b07e2ba33f0854f338
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-31 14:25:51 +08:00
Elaine Zhang
5ee5c49741 soc: rockchip: power-domain: add power domain support for rk1808
This driver is modified to support RK1808 SoC.

Change-Id: Id622e126936a242f3dfbab94b0e7c7818b41f9ae
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-31 14:24:44 +08:00
Elaine Zhang
c5a692d3ea dt-bindings: power: add power-domain header for RK1808 SoCs
According to a description from TRM, add all the power domains

Change-Id: Id8c4af687c877e206f8ce08416dcb4e41a78ce46
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-31 14:23:38 +08:00
Elaine Zhang
6971ac4276 dt-bindings: rockchip: add the power domains for rk1808 SoCs
Change-Id: I6da9acfddfae1ecfa66adb1deba46b6de448ef35
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-31 14:20:21 +08:00
Elaine Zhang
8c98270171 clk: rockchip: rk1808: add HCLK_NPU clk ID for npu
Change-Id: Idd409a818cd3e2b122ed30f01f8fdc495a8bc53f
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-31 14:19:49 +08:00
William Wu
1c15193c9f phy: rockchip-inno-usb2: add phy configurations for rk1808
RK1808 SoC has an usb 2.0 comb phy with one otg-port and one
host-port. This patch adds port configurations for them.

Change-Id: Id4d117929ec0e327c8f2cc1a06d4caaa2d584f06
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-08-31 14:14:44 +08:00
William Wu
6870353515 arm64: dts: rockchip: add usb nodes for rk1808
Add usb 2.0 host controller nodes, usb 3.0 otg controller
node, and usb 2.0 phy nodes for rk1808 SoC.

Change-Id: Icb23e3d1b929091b62824bba6f41ffb4ab262f69
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-08-31 14:14:21 +08:00
William Wu
fbdea8dfb9 dt-bindings: phy: rockchip: add support of rk1808 usb
Support rockchip,rk1808-usb2phy-grf for rk1808 board.

Change-Id: I9f3cc8300bf2653689c07734b81bcf7ff9aac4eb
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-08-31 14:13:43 +08:00
William Wu
55ee1bc536 dt-bindings: usb: dwc3: add support of rk1808
Support rockchip,rk1808-dwc3 for rk1808 board.

Change-Id: I68d9233e8cdf4704b54eb1fe2f17baf43ab6caf5
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-08-31 14:13:30 +08:00
David Wu
b78e417d3f pinctrl: rockchip: Add mux range support while setting iomux
When the pin is set as an iomux value that is outside its range,
it should return a failure, otherwise it may be overwritten with
incorrect value.

Change-Id: I381d9f5bf6f4bfa7d0512350e6b051bebf513d3e
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-08-31 14:12:25 +08:00
David Wu
ab297f280f pinctrl: rockchip: Fix some style warnings
Change-Id: Ia4ff30113520030e3a1e611f4a74cec4431848ba
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-08-31 14:12:14 +08:00
Hu Kejun
514d0d19f8 media: i2c: gc2145: support switch between 30fps and 20fps preview mode
Change-Id: Iabc8107d814b02e14c665a03df923938208e9465
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2018-08-30 21:46:53 +08:00
Xing Zheng
304e48e978 ASoC: rk3308_codec: disable high pass filter by default
It looks better that handle the hight pass filter (HPF)
on the user space, therefore, disable it by codec.

By the way, add HPF dapm controls if someone need to
enable HPF cut-off.

Change-Id: Id8d5f4f84a8ad9909d6aa35c484e955ab92bffed
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-08-30 17:36:09 +08:00
William Wu
8898da3f4b phy: rockchip-inno-usb2: register 480MHz clk at the end of probe
We find an usb phy 480MHz clk prepare fail issue on PX30/RK3326
platforms with RK819 PMIC. On PX30/RK3326 platforms, we set the
usb480m clk to critical because GPU 480M is from usb480m and the
source clocks should be always on. And the usb phy 480MHz clk is
parent of usb480m clk, so the clk framework will prepare the usb
phy 480MHz clk when register it.

This logic works well if the usb phy probe only once. But if the
usb phy needs to probe twice or more because of some reasons (e.g.
fail to get vbus regulator from RK819), the usb phy 480MHz clk will
be unregistered and registered again, however, the clk framework
doesn't prepare the usb phy 480MHz clk except the first time register
operation. So we move the 480MHz clk register to the end of probe,
and make sure only register it once.

Change-Id: If69378b49035746a7c0107c6a363c4d91dfc15e5
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
2018-08-30 14:50:36 +08:00
Elaine Zhang
22282d70ee clk: rockchip: rk1808: add HCLK_HOST_ARB and PCLK_USB3PHY_PIPE ID for usb
Change-Id: I5cc084d2fc21c5cf4972b5a38ab0ee1ab8b4e377
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-30 12:28:25 +08:00
Xing Zheng
6ac47e547b ASoC: rk3308_codec: Fix the broken loopback sometimes
We need to insert some delay after enabling ADC current
and waiting ADCs are stable for BIST mode mainly.

Change-Id: Ib3cdc6aa36f8674ba8d8defadb47baac72f4745e
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-08-30 12:04:20 +08:00
Xing Zheng
1b7bbc2354 ASoC: rk3308_codec: Fix the dummy loopback
If we playback before capture, the loopback will be
switch to BIST SINE mode by other ADC grps. Let's
fix it.

Change-Id: Ib18a32d87dfed4343edc439bd5c705295eca06f3
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-08-30 11:42:42 +08:00
Xing Zheng
ff897a86fc arm64: dts: rockchip: rk3308-evb: remove the enabled always loopback
Change-Id: I5dcc509e9c06a402adaefe1d9c4288d04c20b5a0
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-08-30 11:37:16 +08:00
Xing Zheng
e985002208 ASoC: rk3308_codec: limit the loopback grp isn't enabled always
Change-Id: I2475b9c2fa3880ee14cf6d7a42d07433cf4fbe32
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-08-30 11:37:04 +08:00
Xing Zheng
649b02aba5 ASoC: rk3308_codec: Fix the incorrect bits for BIST SINE and CUBE
Change-Id: I96655cfc6cb58ece7b04051b33520b7c8417a3d6
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-08-30 11:35:14 +08:00
Xing Zheng
8db32cdbc4 ASoC: rk3308_codec: Fix the incorrect ADC state during shutdown stream
Dues to the broken ADC state, it may miss reset ADC digital
register and bring long time (~80ms) unstable and invalid
data at next recording.

Change-Id: Ibf516c054cab99536a4fa3b5fd82f52810352420
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-08-30 11:35:03 +08:00
Jianqun Xu
c1601b790d arm64: dts: rockchip: add uart nodes for RK1808
RK1808 support 8 uarts, from uart0 to uart7.

Change-Id: I7fb796c4b068bd6f7f6eaaf2bd243ba8775a9449
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-30 09:06:25 +08:00
Jianqun Xu
b33201da02 dt-bindings: fix error reg of uart1 in rk1808-cru.txt
1. fix error reg of uart1
2. add rockchip,rk1808-uart

Change-Id: Id08ea2d98869009e8777690a483b372269b92505
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-30 08:47:04 +08:00
Sugar Zhang
0ed5cc838e ASoC: rockchip: multi_dais: fixup wrong format
This patch fixup wrong format if property missing.

Change-Id: I77a86c97b1526fa11a819ad0f2daca803e22ee7f
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-29 14:22:52 +08:00
Sugar Zhang
108ca254dc ASoC: rockchip: vad: add vad switch
This patch add the vad switch control for on/off vad function.

/ # amixer contents
numid=47,iface=MIXER,name='vad switch'
  ; type=BOOLEAN,access=rw------,values=1
  : values=off

/ # amixer cset numid=47 1
numid=47,iface=MIXER,name='vad switch'
  ; type=BOOLEAN,access=rw------,values=1
  : values=on
/ #
/ # amixer cset numid=47 0
numid=47,iface=MIXER,name='vad switch'
  ; type=BOOLEAN,access=rw------,values=1
  : values=off

Change-Id: Id50c021cc581a8371c680b9d180e56ac6a12cf4e
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-29 14:22:52 +08:00
Sugar Zhang
fdb1de7cdc Revert "ASoC: rockchip: vad: enable vad when system suspend"
This reverts commit 6e1f2fba64.

Change-Id: I08fb911dd2b4abbc188af350dd8ad7e9ebcee795
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-08-29 14:22:52 +08:00
Jeffy Chen
cab1edc0e8 rtc: rtc-rk-timer: Fix time64 to tick convert
There's an u64 to int convert which may cause overflow.

Change-Id: I7feb46e501828666353506c37a1f35db39ff45f7
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2018-08-29 14:18:57 +08:00
Siyong Chen
d96ea9d580 video: rockchip: vpu: add soft reset for rkvdec
rkvdec dev status may wrong after irq, this may cause
next frame dec fail. so must add soft reset after irq

Change-Id: I8649206f353f5c3004b09f1255b50258afff1974
Signed-off-by: Siyong Chen <sayon.chen@rock-chips.com>
2018-08-29 09:38:28 +08:00
Jianqun Xu
33cdb0cb52 arm64: dts: rockchip: rk1808 fix compile error
1. fix gmac error clk
2. fix ";" at the end of gmac pinctrl
3. fix error pinctrl for spim0_csn
4. add pull_none_*ma

Change-Id: I42ef3cc09e616c606b5a09ba50481857d95ad6e8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-29 09:34:51 +08:00
Jianqun Xu
a3b25912fd clk: rockchip: rk1808: modify RGMI to RGMII
Change-Id: I7b846ecf5c9dd73a08de1b0d38de94943c79dcf4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-08-29 09:34:38 +08:00
Finley Xiao
a7f2aa3d0b arm64: dts: rockchip: px30: Add boost config
Change-Id: I2f82059b0b67eaa17aa94fbfc1b318d480228138
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-29 09:16:25 +08:00
Finley Xiao
cf4884abdb clk: rockchip: Add divider for backup pll when boost
Cpu clock rate should be less than or equal to low rate when
change pll rate in boost module.

Change-Id: I53c4e66f06bba1e6a85920df0aaceb80176ab016
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-29 09:16:25 +08:00
Finley Xiao
543172cfe3 clk: rockchip: Add support to get boost configure from devicetree
There are some configuration options for cpu boost, such as low
frequency, higt frequency, boost backup pll, and so on.

Change-Id: I35d65f05bbd5ef2a70e4a2e4637e7b4f9f67dda9
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-08-29 09:16:25 +08:00