Commit Graph

613387 Commits

Author SHA1 Message Date
Weixin Zhou
d6cec5366f arm64: dts: rockchip: rk3399pro-evb: fix for headset/wifi/bt
Change-Id: I0a883fb10b7abe8a53be70dcff5e3f0514379fec
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-10-26 15:23:23 +08:00
Jianqun Xu
52630a9ea5 arm64: dts: rockchip: codingstyle for rk3399pro-evb-v10
1. remove duplicated gpu node
2. do not enable uart2
3. reorder for cpu nodes

Change-Id: Ifc11f7b98d4fa3b5cd13464e7454727ac73caebc
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-10-26 15:22:32 +08:00
Jianqun Xu
78aca2546d arm64: dts: rockchip: fix pmic rk809 error configures for rk3399pro-evb-v10
Change-Id: Id6bce34b6908c110b7e686c270deca6a980d1687
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-10-26 15:00:41 +08:00
Zhou Jing
e478e9ceb2 video: rockchip: vcodec: add trans_tbl for vp8e
Change-Id: I17bf31996833e7f649f5c28af6579a59e53d9a49
Signed-off-by: Zhou Jing <tracy.zhou@rock-chips.com>
2018-10-26 14:58:57 +08:00
Elaine Zhang
0305e2d652 arm64: dts: rockchip: rk1808: modify ppll init freq to 100M
Change-Id: I95f4281ad36538dc260fd06010d5e373e0064f89
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-10-26 14:25:38 +08:00
Elaine Zhang
169febe60d clk: rockchip: rk1808: add pll 100M config parameters
PPLL 100M use refdiv =1 fbdiv = 150, postdiv1= 6,
postdiv2=6, vco= 3.6G, is best for pcie.

Change-Id: I40eb1a71c5025a68cab65ec56d2c2a7725d30c63
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-10-26 14:25:38 +08:00
David Wu
574de13fac i2c: rk3x: Fix the smatch warning
This patch fixes the following warning:
drivers/i2c/busses/i2c-rk3x.c:1136 rk3x_i2c_xfer() error: uninitialized symbol 'timeout'.

Fixes: d5635ca05b ("i2c: rk3x: Disable irq after i2c transfer finished")
Change-Id: I7618ae660a62e8e3fc5b7b5d00cff1264bd18663
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-10-26 11:02:12 +08:00
Sugar Zhang
165fb1619b arm64: dts: rockchip: rk1808: set 2ma drive-strength for i2s, pdm
Change-Id: I1ba20c8d996ba596161e6c359db255a8b0ba24d5
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-10-26 10:42:11 +08:00
Jianqun Xu
09bc5b55e9 arm64: dts: rockchip: RK3399Pro use uart2a_xfer for fiq-debugger
Change-Id: I3051e96ec91a9e2563072efab0e27c7f15467384
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-10-26 09:56:33 +08:00
David Wu
fb810f8a5f arm64: dts: rockchip: Change the drive strength of pwm pins to 2ma for rk1808
Change-Id: I3caf418c8edcfdf03ea8c1e042276eb4f6f75816
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-10-26 09:34:34 +08:00
David Wu
aff16aa318 arm64: dts: rockchip: Change the drive strength of i2c pins to 2ma for rk1808
Change-Id: I6dc59e0262b0306b0f3fb1629ef77d02fa831524
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-10-26 09:33:38 +08:00
Xing Zheng
fb862df692 ARM: dts: rockchip: rk3308: enable use_raw_jiffies module param for aloop
Change-Id: I724d2592182e9d14e082d62e87d000d574872964
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-10-25 16:10:56 +08:00
Xing Zheng
ea067b7c52 ARM64: dts: rockchip: rk3308: enable use_raw_jiffies module param for aloop
Change-Id: Icea889846313992df838f33a41e9894827758e65
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-10-25 16:10:56 +08:00
Xing Zheng
abbf433e4c ALSA: aloop: using raw cycles and jiffies
The system tick may be modified by NTP when we connect
with network, then  jiffies have an offset compared to
the local clock, it will cause the irq_pos / delta_play /
delta_capt also be inaccurate.

Therefore, we need a way to get raw jiffies which follows
local raw clocks.

Change-Id: I9be1790dfd98e430982dad6f03b04532889279a6
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2018-10-25 16:10:56 +08:00
Elaine Zhang
90c8a9abbc clk: rockchip: rk1808: add CLK_IGNORE_UNUSED for aclk_pcie_mst/slv
Change-Id: I6be0c48c68c2793528b3b480ed1afd982701266d
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-10-24 17:51:51 +08:00
Nickey Yang
222e17ad18 arm: dts: rk3288-evb-rk1608: enable route-dsi node
Change-Id: I22c7200cacee1120fe33b3abe7faed3e970f9bed
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-10-24 15:03:38 +08:00
Nickey Yang
6d2f26bbaf ARM: config: rockchip_linux: disable CONFIG_FRAMEBUFFER_CONSOLE
for kernel logo display

Change-Id: I038c2809bc166380c33265f4f458a0c772fac2be
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-10-24 15:03:38 +08:00
Nickey Yang
ab9c1fbeaf arm: dts: rk3288-linux: add display-subsystem
Change-Id: Iffee5ecc16e6eb76ecf0e14df421025e2ed0c3f6
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-10-24 15:03:38 +08:00
Shawn Lin
37e81ba640 r8169: add new device ID support
It's found a new r8169 ethernet card with a device ID of
0x0000 read from its config header which wasn't in the
ID tables of r8169. Add it in order to probe this card.

Change-Id: I27c542a10cc571a6e1a4e7a8af62ce560b8b1fc4
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-10-24 10:34:31 +08:00
Shunqing Chen
84cba32220 drm/rockchip: rk618: fix error pointer of encoder
Change-Id: Ia3b4c422319f712fcd3f2eab54dc7ea43c4c5875
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-10-24 09:22:23 +08:00
William Wu
c04c4fe0c5 arm64: dts: rockchip: add dis-u1u2-quirk for rk3399pro-npu dwc3
Change-Id: I03bab17ad638286980d7c31311ed0399becec8bc
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-10-23 20:45:12 +08:00
William Wu
4dcb0c61a2 arm64: dts: rockchip: add dis-u1u2-quirk for rk1808 dwc3
Change-Id: I61460bccc63e6d8cecabe4f4e6259096f069aa23
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-10-23 20:45:12 +08:00
William Wu
aaa5c055cc usb: dwc3: add dis-u1u2-quirk to reject enter U1 and U2
The DWC3 with Innosilicon USB 3.0 PHY on Rockchip platforms
(e.g. rk3328, rk1808) has problem to exit to U0 state from
U1 or U2 state when DWC3 work as peripheral mode. This patch
adds a quirk to reject transition to U1 and U2 state to
workaround this issue.

Change-Id: Ib5a7a603193df23e4d274681bad155d005238349
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-10-23 20:45:12 +08:00
William Wu
fb49b9e04d dt-bindings: usb: dwc3: add dis-u1u2-quirk
This patch adds a quirk for some special platforms (e.g.
rk1808 platform) which has problem to exit to U0 state
from U1 or U2 state when dwc3 work as peripheral mode.
To workaround this issue, we can add this quirk to reject
transition to U1 and U2 state.

Change-Id: I611b3562800e77079193cd5e96f6fe30bb3ca88a
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-10-23 20:45:12 +08:00
Yi Liu
d1eb7eae18 spi: rockchip: support to set lsb into ROCKCHIP_SPI_CTRLR0
Change-Id: I55421b4685c88fe55c928ac7d102abb7d39e902f
Signed-off-by: Yi Liu <liuyi@rock-chips.com>
2018-10-23 18:03:06 +08:00
Binyuan Lan
d9392291c8 ASoC: rockchip: rk817-codec: fix mic_in_differential as loopback fail issue
Change-Id: I6e69ec61a380f7a0ffc234aafcfdfb8e38654461
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2018-10-23 17:45:06 +08:00
William Wu
15ba079fa3 arm64: dts: rockchip: fix power domain for rk3399pro-npu dwc3
Change-Id: I699ec2589ef73b3d3afbd8c39a79e937b8bdd865
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-10-23 16:49:33 +08:00
William Wu
f561f2cf86 arm64: dts: rockchip: enable power domain for rk1808 dwc3
Change-Id: Ia18a03b3c68b560ee4c5e47a4a82f11b786c8964
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-10-23 16:49:32 +08:00
Yi Liu
9ce38fd918 amd64: dts: rockchip: rk3399pro: add a spidev on spi1 for downloading firmware
Change-Id: Iea69e83e6b49c8d9fa96c2ce36a936af8117a9e9
Signed-off-by: Yi Liu <liuyi@rock-chips.com>
2018-10-23 14:18:16 +08:00
Shixiang Zheng
ef34d50d17 arm64: rk1808_linux_defconfig: add CONFIG_ROCKCHIP_RGA2
Change-Id: Ibc09cb6f8522821f6805708be1e47226d550c70e
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2018-10-23 11:35:12 +08:00
Dingqiang Lin
fa8683a467 drivers: rkflash: Support NOR Flash to init MTD part list by default partition.
Change-Id: I108c6ea704307221a58e3a7cdf4d6dc83b153437
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2018-10-23 10:20:14 +08:00
Zorro Liu
37184f54fe arm64: dts: rockchip: add i2c0 and xin32k for rk3399pro-npu
Change-Id: I5d057e4ce7fed18dde46c0c8bd580623e1803e71
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-10-23 10:02:12 +08:00
Zorro Liu
9839b238e8 arm64: dts: rockchip: rk3399pro-npu: Add clocks for npu
Change-Id: If84a3592c4def1418b3a972bc5d56c33918c35d6
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-10-23 10:02:06 +08:00
Zorro Liu
a65badf152 arm64: rk3399pro_npu_defconfig: enable INNO_COMBPHY
Change-Id: Ief80634a45df982a5c4fbc630c559b2c3e7243df
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-10-23 10:02:01 +08:00
Zorro Liu
8a25b28224 arm64: dts: rockchip: update usb3 configs for rk3399pro-npu
Change-Id: I1700402cb53c77cba9b05c2e541091be96ef146e
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-10-23 10:01:46 +08:00
Leo Wen
25e85dd53d arm64: dts: rockchip: set rootfstype=ext4 for rk3326-evb-lp3-v10-linux
Change-Id: I6ef17624ddf656e12550d2cac958d262e750d63c
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2018-10-23 09:44:39 +08:00
Sugar Zhang
7462892e8f arm64: dts: rockchip: rk1808-evb: correct mclk for rk809 codec
Change-Id: I5d963b095d876da2a7c7aecc35fcf64c8bd588cb
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-10-22 17:48:48 +08:00
Sugar Zhang
0d55c87e7e arm64: dts: rockchip: rk1808-evb-v10: fix aloop card index to 7
This patch fix the aloop card index to 7, and leave the card 0
place for default hw snd card.

Change-Id: I767d3d61b1ecb09b813d7bf81b99298cd30a3969
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-10-22 17:48:48 +08:00
Sugar Zhang
09a517954d ASoC: rockchip: pdm: adjust waterlevel in frame unit
This patch make the waterlevel more reasonable, because the pdm
controller share the single FIFO(128 entries) with each channel.
adjust waterlevel in frame to meet the vad or dma frames request.

Change-Id: I9b5808e55025347d435f47889f39ba34ac07ea1c
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-10-22 17:48:48 +08:00
Sugar Zhang
1d469d53c2 ASoC: rockchip: vad: sort audio buffer data for rk1808
Change-Id: Id367202b6434a6dab07a0185392efc5a1e447990
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-10-22 17:48:48 +08:00
Shunqing Chen
deb8d11046 power: rk818-battery: add POWER_SUPPLY_PROP_CHARGE_FULL for CTS.
Change-Id: Ifc95ea148f105457a5b8fc6e70a0523ded5e1e2c
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
2018-10-22 15:51:04 +08:00
Xinhuang Li
3d98e3f91c arm64: dts: rockchip: rename codec for rk3328 android
fix the vts error like this:
Failed to parse! Parsing error at token LexToken(COMMA,',',1,48) in line 1;
explain:
the vts will parsing the codec'name after android P, the comma is not allow
in the codec'name

Change-Id: I6cb011331368d64417bd9955ba5d3deb84d49b8d
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
2018-10-22 14:41:49 +08:00
William Wu
2ba314cca6 usb: dwc3: rockchip: fix usb reenumerated upon pm resume
On rk3399 platforms, Type-c1 can be simplified to Type-A
port and support USB 3.0 Host only mode. It has a problem
that the dwc3_rockchip_resume() will reset the controller
upon pm resume, and this may cause usb device(e.g. usb 4G
modem) to be reenumerated. This patch sets the flag of
connected to true and avoid to do the reset operation upon
pm resume.

Change-Id: I57f92d0277a19ce1c7b881fe2da6470fd3a70b73
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-10-22 14:08:21 +08:00
David Wu
e283ecf388 arm64: dts: rockchip: Correct the reset time of rtl8211f phy for rk1808-evb
According to the PHY datasheet of rtl8211f, if the reset time
of the PHY is not enough, it will cause the PHY instability,
which has been encountered by other customers, need to take
longer than rtl8211e.

Change-Id: I2786c8b9005a3437d39d6b580d01f03c590848d6
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-10-22 11:29:34 +08:00
Shunqian Zheng
80de9b19d9 devfreq_cooling: inline the of_devfreq_cooling_register_power()
Make of_devfreq_cooling_register_power() as static inline.
This fixes the building error when CONFIG_THERMAL is disabled.

Change-Id: I3d88a3679de279a7ee7eadae7243b9661fdddf75
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-10-22 11:28:10 +08:00
David Wu
d5635ca05b i2c: rk3x: Disable irq after i2c transfer finished
In some case,log like this:

[   12.393926] rk3x-i2c ff150000.i2c: irq in STATE_IDLE, ipd = 0x51
[   12.416592] rk3x-i2c ff150000.i2c: irq in STATE_IDLE, ipd = 0x51

The i2c clock is disabled, so the pending irq clean is not
worked. Disable the interrupt after the i2c jobs were done,
the error log would not happen.

Change-Id: If04a2e2214d675410c67db0f131ee7ef635ddcb4
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-10-22 11:11:08 +08:00
David Wu
9861dcac9c i2c: rk3x: Disable i2c controller after i2c transfer finished
If the slave hold the scl low for a long time, we will send
the stop because the i2c transfer is timeout. Then reset the
slave, the scl will be released to high by slave, the data
hold low, but the controller's state is messy now, need to
diable i2c controller, it is better to reset i2c controller,
it will go back to normal state.

The log like this:

[ 117.444700] rk3x-i2c ff3d0000.i2c: timeout, ipd: 0x93, state: 2
[ 118.466410] rk3x-i2c ff3d0000.i2c: timeout, ipd: 0x00, state: 1
[ 119.486217] rk3x-i2c ff3d0000.i2c: timeout, ipd: 0x00, state: 1

or

[  91.733176] rk3x-i2c ff3d0000.i2c: timeout, ipd: 0x80, state: 1
[ 103.406776] rk3x-i2c ff3d0000.i2c: timeout, ipd: 0x00, state: 2
[ 104.426636] rk3x-i2c ff3d0000.i2c: timeout, ipd: 0x00, state: 2

Change-Id: I53e6e383c849cea22d870f9488c23720e74115df
Signed-off-by: David Wu <david.wu@rock-chips.com>
2018-10-22 11:10:30 +08:00
Elaine Zhang
7393188064 clk: rockchip: rk1808: remove the apll from parents clk for npu
apll is always change,
not allowed apll as npu parent clk.

Change-Id: Ia354b7ac533c2c7537d2d25894f956b855db9bc6
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-10-22 11:09:26 +08:00
Joseph Chen
4202ab5440 regulator: fan53555: add TCS4525 DCDC support
TCS4525 main features:

- 2.7V to 5.5V Input Voltage Range;
- 3MHz Constant Switching Frequency;
- 5A Available Load Current;
- Programmable Output Voltage: 0.6V to 1.4V in 6.25mV Steps;
- PFM/PWM Operation for Optimum Increased Efficiency;

Change-Id: I7d4b8bbf38a5c74174b16ae4cb64d04f903a2902
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-10-22 11:08:20 +08:00
William Wu
f4093c1980 arm64: dts: rockchip: add snps,dis_u3_susphy_quirk for rk1808 dwc3
Add a quirk to avoid USB 3.0 PHY enter suspend mode when
the dwc3 controller suspend conditions are valid, it can
help to fix the dwc3 initialization error issue with the
following log:
dwc3 fd000000.dwc3: failed to enable ep0out

Change-Id: Iedcb9fa6c2c7fe923839362e35267fedb55889a7
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-10-22 11:05:43 +08:00